Updated Norwegian translation.

2003-03-17 Kjartan Maraas <kmaraas@gnome.org> * no.po: Updated Norwegian translation. svn path=/trunk/; revision=20307
author: Kjartan Maraas <kmaraas@gnome.org> 2003-03-17 08:44:35 +0800
committer: Kjartan Maraas <kmaraas@src.gnome.org> 2003-03-17 08:44:35 +0800
commit: 3b3658a2fe71a68b7a00fa8917188c17ee937055 (patch)
tree: 03aef9a021816fc291da775f0975d9f02cbaea73 /po
parent: 94ff918c13a03c65422e8995dd6ec53fdd093fdd (diff)
download: gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar
gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.gz
gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.bz2
gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.lz
gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.xz
gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.zst
gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.zip
3 files changed, 5443 insertions, 4878 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 30704d51ff..f1574211fa 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-17  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* no.po: Updated Norwegian translation.
+
 2003-03-14  Marco Ciampa  <ciampix@libero.it>
 
 	* it.po: Updated italian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a095bb402b..83cf201fb8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -129,7 +129,6 @@ calendar/gui/itip-utils.c
 calendar/gui/main.c
 calendar/gui/print.c
 calendar/gui/tasks-control.c
-calendar/gui/tasks-migrate.c
 calendar/gui/weekday-picker.c
 calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in
 calendar/importers/icalendar-importer.c
diff --git a/po/no.po b/po/no.po
index 0fc6504c69..853b77a11d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,48 +5,52 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.0\n"
-"POT-Creation-Date: 2002-10-28 16:49-0500\n"
-"PO-Revision-Date: 2002-10-26 12:31+0200\n"
+"POT-Creation-Date: 2003-03-17 01:05+0100\n"
+"PO-Revision-Date: 2003-03-17 01:33+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Factory to import LDIF files into Evolution."
 msgstr "Factory for import av LDIF-filer til Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
 msgid "Imports LDIF files into Evolution."
 msgstr "Importerer LDIF-filer til Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:1
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
 msgid "Factory to import VCard files into Evolution."
 msgstr "Factory for import av VCard-filer til Evolution."
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.oaf.in.h:2
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
 msgid "Imports VCard files into Evolution."
 msgstr "Importerer VCard-filer til Evolution."
 
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1310
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Lagre som"
 
 #: addressbook/backend/ebook/e-card-simple.c:61
+#: addressbook/backend/ebook/e-card.c:1324
 #: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: mail/mail-config.glade.h:74 my-evolution/e-summary-table.c:59
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Navn"
 
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1351
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "E-post"
 
 #: addressbook/backend/ebook/e-card-simple.c:63
-#: addressbook/gui/contact-editor/e-contact-editor.c:1756
+#: addressbook/gui/contact-editor/e-contact-editor.c:1773
 msgid "Primary"
 msgstr "Primær"
 
@@ -56,16 +60,17 @@ msgstr "Pri"
 
 #: addressbook/backend/ebook/e-card-simple.c:64
 #: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1741
+#: addressbook/backend/ebook/e-card.c:1413
+#: addressbook/gui/contact-editor/e-contact-editor.c:1758
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant"
 msgstr "Assistent"
 
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
-#: addressbook/gui/contact-editor/contact-editor.glade.h:5
-#: addressbook/gui/contact-editor/e-contact-editor.c:1742
-#: addressbook/gui/contact-editor/e-contact-editor.c:1809
+#: addressbook/gui/contact-editor/contact-editor.glade.h:6
+#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1830
 msgid "Business"
 msgstr "Arbeid"
 
@@ -75,12 +80,12 @@ msgid "Bus"
 msgstr "Buss"
 
 #: addressbook/backend/ebook/e-card-simple.c:66
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1762
 msgid "Callback"
 msgstr "Tilbakering"
 
 #: addressbook/backend/ebook/e-card-simple.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:1747
+#: addressbook/gui/contact-editor/e-contact-editor.c:1764
 msgid "Company"
 msgstr "Firma"
 
@@ -91,12 +96,13 @@ msgstr "Datamaskin"
 #: addressbook/backend/ebook/e-card-simple.c:68
 #: addressbook/backend/ebook/e-card-simple.c:71
 #: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#: addressbook/gui/contact-editor/e-contact-editor.c:1748
-#: addressbook/gui/contact-editor/e-contact-editor.c:1810
+#: addressbook/gui/contact-editor/e-contact-editor.c:1765
+#: addressbook/gui/contact-editor/e-contact-editor.c:1831
 msgid "Home"
 msgstr "Hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Organization"
 msgstr "Organisasjon"
@@ -107,18 +113,18 @@ msgstr "Org"
 
 #: addressbook/backend/ebook/e-card-simple.c:72
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1752
+#: addressbook/gui/contact-editor/e-contact-editor.c:1769
 msgid "Mobile"
 msgstr "Mobil"
 
 #: addressbook/backend/ebook/e-card-simple.c:73
-#: addressbook/gui/contact-editor/e-contact-editor.c:1746
+#: addressbook/gui/contact-editor/e-contact-editor.c:1763
 msgid "Car"
 msgstr "Bil"
 
 #: addressbook/backend/ebook/e-card-simple.c:74
-#: addressbook/gui/contact-editor/contact-editor.glade.h:6
-#: addressbook/gui/contact-editor/e-contact-editor.c:1744
+#: addressbook/gui/contact-editor/contact-editor.glade.h:7
+#: addressbook/gui/contact-editor/e-contact-editor.c:1761
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Fax"
 msgstr "Faks på arbeid"
@@ -128,13 +134,13 @@ msgid "Bus Fax"
 msgstr "Faks i buss"
 
 #: addressbook/backend/ebook/e-card-simple.c:75
-#: addressbook/gui/contact-editor/e-contact-editor.c:1750
+#: addressbook/gui/contact-editor/e-contact-editor.c:1767
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Fax"
 msgstr "Faks hjemme"
 
 #: addressbook/backend/ebook/e-card-simple.c:76
-#: addressbook/gui/contact-editor/e-contact-editor.c:1743
+#: addressbook/gui/contact-editor/e-contact-editor.c:1760
 msgid "Business 2"
 msgstr "Arbeid 2"
 
@@ -143,43 +149,43 @@ msgid "Bus 2"
 msgstr "Buss 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:77
-#: addressbook/gui/contact-editor/e-contact-editor.c:1749
+#: addressbook/gui/contact-editor/e-contact-editor.c:1766
 msgid "Home 2"
 msgstr "Hjemme 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:78
-#: addressbook/gui/contact-editor/e-contact-editor.c:1751
+#: addressbook/gui/contact-editor/e-contact-editor.c:1768
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "ISDN"
 msgstr "ISDN"
 
 #: addressbook/backend/ebook/e-card-simple.c:79
 #: addressbook/backend/ebook/e-card-simple.c:85
-#: addressbook/gui/contact-editor/e-contact-editor.c:1753
-#: addressbook/gui/contact-editor/e-contact-editor.c:1811
+#: addressbook/gui/contact-editor/e-contact-editor.c:1770
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
 msgid "Other"
 msgstr "Andre"
 
 #: addressbook/backend/ebook/e-card-simple.c:80
-#: addressbook/gui/contact-editor/e-contact-editor.c:1754
+#: addressbook/gui/contact-editor/e-contact-editor.c:1771
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Other Fax"
 msgstr "Annen faks"
 
 #: addressbook/backend/ebook/e-card-simple.c:81
-#: addressbook/gui/contact-editor/e-contact-editor.c:1755
+#: addressbook/gui/contact-editor/e-contact-editor.c:1772
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Pager"
 msgstr "Personsøker"
 
 #: addressbook/backend/ebook/e-card-simple.c:82
-#: addressbook/gui/contact-editor/e-contact-editor.c:1757
+#: addressbook/gui/contact-editor/e-contact-editor.c:1774
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Radio"
 msgstr "Radio"
 
 #: addressbook/backend/ebook/e-card-simple.c:83
-#: addressbook/gui/contact-editor/e-contact-editor.c:1758
+#: addressbook/gui/contact-editor/e-contact-editor.c:1775
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
 msgid "Telex"
 msgstr "Teleks"
@@ -190,15 +196,15 @@ msgid "TTY"
 msgstr "TTY"
 
 #: addressbook/backend/ebook/e-card-simple.c:86
-#: addressbook/gui/component/e-address-popup.c:484
-#: addressbook/gui/contact-editor/e-contact-editor.c:1784
+#: addressbook/gui/component/e-address-popup.c:482
+#: addressbook/gui/contact-editor/e-contact-editor.c:1803
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 2"
 msgstr "E-post 2"
 
 #: addressbook/backend/ebook/e-card-simple.c:87
-#: addressbook/gui/component/e-address-popup.c:494
-#: addressbook/gui/contact-editor/e-contact-editor.c:1785
+#: addressbook/gui/component/e-address-popup.c:492
+#: addressbook/gui/contact-editor/e-contact-editor.c:1804
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Email 3"
 msgstr "E-post 3"
@@ -222,6 +228,7 @@ msgid "Dep"
 msgstr "Avd"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1385
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "Kontor"
@@ -231,6 +238,7 @@ msgid "Off"
 msgstr "Av"
 
 #: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1392
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Title"
 msgstr "Tittel"
@@ -245,6 +253,7 @@ msgid "Prof"
 msgstr "Yrke"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1406
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Manager"
 msgstr "Leder"
@@ -258,6 +267,7 @@ msgid "Ass"
 msgstr "Ass"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1420
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Nickname"
 msgstr "Kallenavn"
@@ -267,16 +277,19 @@ msgid "Nick"
 msgstr "Kallenavn"
 
 #: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1427
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Spouse"
 msgstr "Ektefelle"
 
 #: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1468
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Note"
 msgstr "Kommentar"
 
 #: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1447
 msgid "Calendar URI"
 msgstr "Kalender URI"
 
@@ -294,115 +307,210 @@ msgid "FBUrl"
 msgstr "FBUrl"
 
 #: addressbook/backend/ebook/e-card-simple.c:100
+msgid "Default server calendar"
+msgstr "Forvalgt tjener-kalender"
+
+#: addressbook/backend/ebook/e-card-simple.c:100
+msgid "icsCalendar"
+msgstr "icsCalender"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1434
 msgid "Anniversary"
 msgstr "Bryllupsdag"
 
-#: addressbook/backend/ebook/e-card-simple.c:100
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Br.dag"
 
-#: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card-simple.c:102
 msgid "Birth Date"
 msgstr "Fødselsdato"
 
-#: addressbook/backend/ebook/e-card-simple.c:104
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1482
 #: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Categories"
 msgstr "Kategorier"
 
-#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Etternavn"
 
-#: addressbook/backend/ebook/e-card-simple.c:792
+#: addressbook/backend/ebook/e-card-simple.c:335
+msgid "ECard"
+msgstr "ECard"
+
+#: addressbook/backend/ebook/e-card-simple.c:830
 #, c-format
 msgid "%x"
 msgstr "%x"
 
-#: addressbook/backend/ebook/e-card-simple.c:853
+#: addressbook/backend/ebook/e-card-simple.c:891
 #: addressbook/backend/ebook/e-destination.c:706
 msgid "Unnamed List"
 msgstr "Liste uten navn"
 
-#: addressbook/backend/ebook/e-card.c:2683
-msgid "Multiple VCards"
-msgstr "Flere VCard"
+#: addressbook/backend/ebook/e-card.c:1317
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:319
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Fullt navn"
 
-#: addressbook/backend/ebook/e-card.c:2691
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
+#: addressbook/backend/ebook/e-card.c:1330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
+msgid "Address"
+msgstr "Adresse"
+
+#: addressbook/backend/ebook/e-card.c:1337
+msgid "Address Label"
+msgstr "Adresseetikett"
+
+#: addressbook/backend/ebook/e-card.c:1344
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/backend/ebook/e-card.c:1358
+msgid "Birth date"
+msgstr "Fødselsdato"
+
+#: addressbook/backend/ebook/e-card.c:1364
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URL"
+
+#: addressbook/backend/ebook/e-card.c:1378
+msgid "Organizational Unit"
+msgstr "Organisasjonsenhet"
+
+#: addressbook/backend/ebook/e-card.c:1399
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Rolle"
+
+#: addressbook/backend/ebook/e-card.c:1440 mail/mail-format.c:930
+msgid "Mailer"
+msgstr "Postprogram"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-#: addressbook/backend/ebook/load-pine-addressbook.c:22
-#: addressbook/backend/ebook/test-client-list.c:23
-#: addressbook/backend/ebook/test-client.c:34
-#: addressbook/conduit/address-conduit.c:1860
-#: addressbook/gui/component/addressbook-factory.c:50
-#: calendar/conduits/calendar/calendar-conduit.c:1807
-#: calendar/conduits/todo/todo-conduit.c:1385
-#: calendar/gui/alarm-notify/notify-main.c:174 calendar/gui/main.c:67
-#: tools/evolution-addressbook-abuse.c:132
-#: tools/evolution-addressbook-export.c:60
-#: tools/evolution-addressbook-import.c:86
+#: addressbook/backend/ebook/e-card.c:1454
+msgid "Free/Busy URL"
+msgstr "Ledig/opptatt URL"
+
+#: addressbook/backend/ebook/e-card.c:1461
+msgid "ICS Calendar"
+msgstr "ICS-kalender"
+
+#: addressbook/backend/ebook/e-card.c:1475
+msgid "Related Contacts"
+msgstr "Relaterte kontakter"
+
+#: addressbook/backend/ebook/e-card.c:1489
+msgid "Category List"
+msgstr "Kategoriliste"
+
+#: addressbook/backend/ebook/e-card.c:1496
+msgid "Wants HTML"
+msgstr "Vil ha HTML"
+
+#: addressbook/backend/ebook/e-card.c:1503
+msgid "Wants HTML set"
+msgstr "Vil ha HTML satt"
+
+#: addressbook/backend/ebook/e-card.c:1510
+msgid "List"
+msgstr "Liste"
+
+#: addressbook/backend/ebook/e-card.c:1517
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Annen adresse"
+
+#: addressbook/backend/ebook/e-card.c:1524
+msgid "Arbitrary"
+msgstr "Tilfeldig"
+
+#: addressbook/backend/ebook/e-card.c:1531
+msgid "ID"
+msgstr "ID"
+
+#: addressbook/backend/ebook/e-card.c:1538
+msgid "Last Use"
+msgstr "Sist brukt"
+
+#: addressbook/backend/ebook/e-card.c:1549
+msgid "Use Score"
+msgstr "Bruk poeng"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:170
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: addressbook/backend/pas/pas-backend-file.c:364
-#: addressbook/backend/pas/pas-backend-ldap.c:2978
+#: addressbook/backend/pas/pas-backend-file.c:465
+#: addressbook/backend/pas/pas-backend-ldap.c:3046
 msgid "Searching..."
 msgstr "Søker..."
 
-#: addressbook/backend/pas/pas-backend-file.c:366
+#: addressbook/backend/pas/pas-backend-file.c:467
 msgid "Loading..."
 msgstr "Laster..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:687
+#: addressbook/backend/pas/pas-backend-ldap.c:598
+msgid "Using Distinguished Name (DN)"
+msgstr "Bruker distinguished name (DN)"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:602
+msgid "Using Email Address"
+msgstr "Bruker e-post-adresse"
+
+#: addressbook/backend/pas/pas-backend-ldap.c:748
 msgid "Reconnecting to LDAP server..."
 msgstr "Kobler til LDAP-tjener på nytt..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1230
+#: addressbook/backend/pas/pas-backend-ldap.c:1291
 msgid "Adding card to LDAP server..."
 msgstr "Legger til kort på LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1336
+#: addressbook/backend/pas/pas-backend-ldap.c:1402
 msgid "Removing card from LDAP server..."
 msgstr "Fjerner kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:1572
-#: addressbook/backend/pas/pas-backend-ldap.c:1575
+#: addressbook/backend/pas/pas-backend-ldap.c:1638
+#: addressbook/backend/pas/pas-backend-ldap.c:1641
 msgid "Modifying card from LDAP server..."
 msgstr "Endrer kort fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2889
+#: addressbook/backend/pas/pas-backend-ldap.c:2957
 msgid "Receiving LDAP search results..."
 msgstr "Mottar søkeresultater fra LDAP-tjener..."
 
-#: addressbook/backend/pas/pas-backend-ldap.c:2998
+#: addressbook/backend/pas/pas-backend-ldap.c:3066
 msgid "Error performing search"
 msgstr "Feil ved utføring av søk"
 
-#: addressbook/conduit/address-conduit.c:293
+#: addressbook/conduit/address-conduit.c:292
 msgid "Default Sync Address:"
 msgstr "Forvalgt synkroniseringsadresse:"
 
-#: addressbook/conduit/address-conduit.c:536
+#: addressbook/conduit/address-conduit.c:535
 msgid "Cursor could not be loaded\n"
 msgstr "Markøren kunne ikke lokaliseres\n"
 
-#: addressbook/conduit/address-conduit.c:549
+#: addressbook/conduit/address-conduit.c:548
 msgid "EBook not loaded\n"
 msgstr "EBook ikke lastet\n"
 
 #: addressbook/conduit/address-conduit.c:1354
-#: calendar/conduits/calendar/calendar-conduit.c:1278
-#: calendar/conduits/todo/todo-conduit.c:889
+#: calendar/conduits/calendar/calendar-conduit.c:1272
+#: calendar/conduits/todo/todo-conduit.c:882
 msgid "Could not start wombat server"
 msgstr "Kunne ikke starte wombat tjener"
 
 #: addressbook/conduit/address-conduit.c:1355
-#: calendar/conduits/calendar/calendar-conduit.c:1279
-#: calendar/conduits/todo/todo-conduit.c:890
+#: calendar/conduits/calendar/calendar-conduit.c:1273
+#: calendar/conduits/todo/todo-conduit.c:883
 msgid "Could not start wombat"
 msgstr "Kunne ikke starte wombat"
 
@@ -411,169 +519,144 @@ msgstr "Kunne ikke starte wombat"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke lese pilotens adresseapplikasjonsblokk"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:1
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "A Bonobo control for an address popup."
 msgstr "En Bonobo-kontroll for visning av en adresse."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "A Bonobo control for displaying an address."
 msgstr "En Bonobo-kontroll for visning av en adresse."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
 msgid "A sample Bonobo control which displays an addressbook."
 msgstr "Eksempel på Bonobo-kontroll som viser en adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:4
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configuration control for the Evolution Addressbook Storages."
 msgstr "Konfigurasjonskontroll for Evolution adressebok-lager."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure access to LDAP directory servers here"
 msgstr "Konfigurer tilgang til LDAP-katalogtjenere her"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Control that displays an Evolution addressbook minicard."
 msgstr "Kontroll som viser et minikort for Evolutions adressebok."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Directory Servers"
 msgstr "Katalogtjenere"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook minicard viewer"
 msgstr "Evolution adressebok minikort visning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution component for handling contacts."
 msgstr "Evolution komponent for håndtering av kontakter."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:10
-msgid "Factory for the Addressbook Minicard control"
-msgstr "Factory for minikort kontroll for adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:11
-msgid "Factory for the Addressbook's address displayer"
-msgstr "Factory for adressebokens adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:12
-msgid "Factory for the Addressbook's address popup"
-msgstr "Factory for adressebokens adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:13
-msgid "Factory for the configuration controls for the Evolution Addressbook."
-msgstr "Factory for konfigurasjonskontroll for Evolution adressebok."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:14
-msgid "Factory for the sample Addressbook control"
-msgstr "Factory for eksempelkontroll for adressebok"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Factory for the controls exported by the Evolution Addressbook"
+msgstr "Factory for kontroller eksportert av Evolution adressebok"
 
-#: addressbook/gui/component/addressbook-component.c:73
-#: addressbook/gui/component/addressbook-component.c:611
-#: calendar/gui/dialogs/comp-editor-util.c:310
-#: calendar/gui/dialogs/comp-editor-util.c:366
-#: importers/netscape-importer.c:1874 shell/e-local-storage.c:177
-#: shell/e-shortcuts.c:1067
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:605
+#: calendar/gui/dialogs/comp-editor-util.c:309
+#: calendar/gui/dialogs/comp-editor-util.c:365
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1863
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
 msgid "Contacts"
 msgstr "Kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:73
+#: addressbook/gui/component/addressbook-component.c:76
 msgid "Folder containing contact information"
 msgstr "Mappe som inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP Server"
 msgstr "LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-component.c:75
+#: addressbook/gui/component/addressbook-component.c:78
 msgid "LDAP server containing contact information"
 msgstr "LDAP-tjener sømme inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public Contacts"
 msgstr "Offentlige kontakter"
 
-#: addressbook/gui/component/addressbook-component.c:77
+#: addressbook/gui/component/addressbook-component.c:80
 msgid "Public folder containing contact information"
 msgstr "Offentlig mappe som inneholder kontaktinformasjon"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:567
+#: addressbook/gui/component/addressbook-component.c:564
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:568
+#: addressbook/gui/component/addressbook-component.c:565
 msgid "Create a new contact"
 msgstr "Opprett en ny kontakt"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "New Contact List"
 msgstr "Ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-component.c:571
+#: addressbook/gui/component/addressbook-component.c:568
 msgid "Contact _List"
 msgstr "Kontakt_liste"
 
-#: addressbook/gui/component/addressbook-component.c:572
+#: addressbook/gui/component/addressbook-component.c:569
 msgid "Create a new contact list"
 msgstr "Opprett en ny kontaktliste"
 
-#: addressbook/gui/component/addressbook-config.c:197
+#: addressbook/gui/component/addressbook-config.c:206
 msgid "Failed to connect to LDAP server"
 msgstr "Kunne ikke koble til LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:216
+#: addressbook/gui/component/addressbook-config.c:231
 msgid "Failed to authenticate with LDAP server"
 msgstr "Kunne ikke autentisere mot LDAP-tjener"
 
-#: addressbook/gui/component/addressbook-config.c:239
+#: addressbook/gui/component/addressbook-config.c:259
 msgid "Could not perform query on Root DSE"
 msgstr "Kunne ikke utføre spørring på Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:648
+#: addressbook/gui/component/addressbook-config.c:682
 msgid "The server responded with no supported search bases"
 msgstr "Tjeneren svarte ikke med noen støttede basis for søk"
 
-#: addressbook/gui/component/addressbook-config.c:1154
+#: addressbook/gui/component/addressbook-config.c:1191
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Denne tjeneren støtter ikke LDAPv3 schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1176
+#: addressbook/gui/component/addressbook-config.c:1213
 msgid "Error retrieving schema information"
 msgstr "Feil under henting av schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1184
+#: addressbook/gui/component/addressbook-config.c:1221
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1630
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "LDAP er ikke støttet i denne versjonen av Evolution"
-
-#: addressbook/gui/component/addressbook-config.etspec.h:1
+#: addressbook/gui/component/addressbook-config.c:1647
 msgid "Account Name"
 msgstr "Kontonavn"
 
-#: addressbook/gui/component/addressbook-config.etspec.h:2
+#: addressbook/gui/component/addressbook-config.c:1649
 msgid "Server Name"
 msgstr "Legg til skript"
 
-#: addressbook/gui/component/addressbook-factory.c:72
-#: calendar/gui/alarm-notify/notify-main.c:177 calendar/gui/main.c:159
-msgid "Could not initialize gnome-vfs"
-msgstr "Kunne ikke initiere gnome-vfs"
+#: addressbook/gui/component/addressbook-config.c:1686
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "LDAP er ikke støttet i denne versjonen av Evolution"
 
-#: addressbook/gui/component/addressbook-storage.c:168
+#: addressbook/gui/component/addressbook-storage.c:169
 msgid "Other Contacts"
 msgstr "Andre kontakter"
 
-#: addressbook/gui/component/addressbook.c:474
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke åpne adresseboken"
-
-#: addressbook/gui/component/addressbook.c:480
+#: addressbook/gui/component/addressbook.c:512
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
 "path exists and that you have permission to access it."
@@ -581,7 +664,7 @@ msgstr ""
 "Kunne ikke åpne denne adresseboken. Vennligst sjekk at stien\n"
 "eksisterer og at du har rettigheter til å aksessere den."
 
-#: addressbook/gui/component/addressbook.c:490
+#: addressbook/gui/component/addressbook.c:522
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the LDAP server\n"
@@ -591,7 +674,7 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at LDAP-tjeneren\n"
 "ikke kan nås."
 
-#: addressbook/gui/component/addressbook.c:495
+#: addressbook/gui/component/addressbook.c:527
 msgid ""
 "This version of Evolution does not have LDAP support\n"
 "compiled in to it.  If you want to use LDAP in Evolution\n"
@@ -603,7 +686,7 @@ msgstr ""
 "må du kompilere programmet fra kildekoden i CVS etter å\n"
 "ha hentet OpenLDAP fra lenken under.\n"
 
-#: addressbook/gui/component/addressbook.c:504
+#: addressbook/gui/component/addressbook.c:537
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or the server\n"
@@ -613,45 +696,48 @@ msgstr ""
 "at du har skrevet inn en ugyldig URI, eller at tjeneren\n"
 "ikke kan nås."
 
-#. the user clicked cancel in the password dialog
-#: addressbook/gui/component/addressbook.c:582
+#: addressbook/gui/component/addressbook.c:557
+msgid "Unable to open addressbook"
+msgstr "Kunne ikke åpne adresseboken"
+
+#: addressbook/gui/component/addressbook.c:622
 msgid "Accessing LDAP Server anonymously"
 msgstr "Aksesserer LDAP-tjener anonymt"
 
-#: addressbook/gui/component/addressbook.c:625
+#: addressbook/gui/component/addressbook.c:667
 msgid "Failed to authenticate.\n"
 msgstr "Kunne ikke autentisere.\n"
 
-#: addressbook/gui/component/addressbook.c:633
-#: addressbook/gui/component/addressbook.c:636
+#: addressbook/gui/component/addressbook.c:675
+#: addressbook/gui/component/addressbook.c:678
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%sSkriv inn passord for %s (bruker %s)"
 
-#: addressbook/gui/component/addressbook.c:782
+#: addressbook/gui/component/addressbook.c:813
 msgid "Name begins with"
 msgstr "Navn begynner med"
 
-#: addressbook/gui/component/addressbook.c:783
+#: addressbook/gui/component/addressbook.c:814
 msgid "Email begins with"
 msgstr "E-post begynner med"
 
-#: addressbook/gui/component/addressbook.c:784
+#: addressbook/gui/component/addressbook.c:815
 #: calendar/gui/cal-search-bar.c:53
 msgid "Category is"
 msgstr "Kategorien er"
 
 #. We attach subitems below
-#: addressbook/gui/component/addressbook.c:785
+#: addressbook/gui/component/addressbook.c:816
 #: calendar/gui/cal-search-bar.c:49
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
-#: addressbook/gui/component/addressbook.c:786
+#: addressbook/gui/component/addressbook.c:817
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: addressbook/gui/component/addressbook.c:956
+#: addressbook/gui/component/addressbook.c:987
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -659,7 +745,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:962
+#: addressbook/gui/component/addressbook.c:993
 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"
@@ -667,25 +753,25 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:968
+#: addressbook/gui/component/addressbook.c:999
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Bakenden for denne adresseboken forsto ikke denne spørringen."
 
-#: addressbook/gui/component/addressbook.c:971
+#: addressbook/gui/component/addressbook.c:1002
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Bakenden for denne adresseboken nektet å utføre denne spørringen."
 
-#: addressbook/gui/component/addressbook.c:975
+#: addressbook/gui/component/addressbook.c:1006
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
 #. All, unmatched, separator
-#: addressbook/gui/component/addressbook.c:1050
-#: calendar/gui/cal-search-bar.c:382
+#: addressbook/gui/component/addressbook.c:1089
+#: calendar/gui/cal-search-bar.c:352
 msgid "Any Category"
 msgstr "Enhver kategori"
 
-#: addressbook/gui/component/addressbook.c:1132
+#: addressbook/gui/component/addressbook.c:1169
 msgid "The URI that the Folder Browser will display"
 msgstr "URIen som mappeutforskeren vil vise"
 
@@ -698,128 +784,137 @@ msgstr "URIen som mappeutforskeren vil vise"
 msgid "(none)"
 msgstr "(ingen)"
 
-#: addressbook/gui/component/e-address-popup.c:474
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
-#: addressbook/gui/contact-editor/e-contact-editor.c:1783
+#: addressbook/gui/component/e-address-popup.c:472
+#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/e-contact-editor.c:1802
 msgid "Primary Email"
 msgstr "Primær e-post"
 
-#: addressbook/gui/component/e-address-popup.c:587
+#: addressbook/gui/component/e-address-popup.c:608
 msgid "Select an Action"
 msgstr "Velg en handling"
 
-#: addressbook/gui/component/e-address-popup.c:593
+#: addressbook/gui/component/e-address-popup.c:615
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Opprett en ny kontakt «%s»"
 
-#: addressbook/gui/component/e-address-popup.c:605
+#: addressbook/gui/component/e-address-popup.c:630
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Legg til adresse for eksisterende kontakt «%s»"
 
-#: addressbook/gui/component/e-address-popup.c:891
+#: addressbook/gui/component/e-address-popup.c:911
 msgid "Querying Addressbook..."
 msgstr "Kjører spørring i adressebok..."
 
-#: addressbook/gui/component/e-address-popup.c:973
-#: addressbook/gui/component/e-address-widget.c:387
-#: addressbook/gui/component/select-names/e-select-names-popup.c:306
+#: addressbook/gui/component/e-address-popup.c:995
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Rediger kontaktinfo"
 
-#: addressbook/gui/component/e-address-popup.c:1003
-#: addressbook/gui/component/e-address-widget.c:423
-#: addressbook/gui/component/select-names/e-select-names-popup.c:485
+#: addressbook/gui/component/e-address-popup.c:1025
+#: addressbook/gui/component/e-address-widget.c:428
+#: addressbook/gui/component/select-names/e-select-names-popup.c:479
 msgid "Add to Contacts"
 msgstr "Legg til i kontakter"
 
-#: addressbook/gui/component/e-address-popup.c:1046
+#: addressbook/gui/component/e-address-popup.c:1068
 msgid "Merge E-Mail Address"
 msgstr "Flett E-postadresse"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Deaktiver spørringer"
 
-#: addressbook/gui/component/e-address-widget.c:364
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Aktiver spørringer (Farlig!)"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: mail/mail-config.glade.h:1 mail/subscribe-dialog.glade.h:1
+msgid "\n"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:3
 msgid "  S_how Supported Bases "
 msgstr " V_is støttede baser "
 
-#: addressbook/gui/component/ldap-config.glade.h:2
+#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/select-names/select-names.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
+#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/event-page.glade.h:1 mail/mail-config.glade.h:6
+#: mail/subscribe-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+msgid "*"
+msgstr ""
+
+#: addressbook/gui/component/ldap-config.glade.h:5
 msgid "1234"
 msgstr "1234"
 
-#: addressbook/gui/component/ldap-config.glade.h:3
+#: addressbook/gui/component/ldap-config.glade.h:6
 msgid "1:00"
 msgstr "1:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:4
+#: addressbook/gui/component/ldap-config.glade.h:7
 msgid "2:30"
 msgstr "2:30"
 
-#: addressbook/gui/component/ldap-config.glade.h:5
+#: addressbook/gui/component/ldap-config.glade.h:8
 msgid "3268"
 msgstr "3268"
 
-#: addressbook/gui/component/ldap-config.glade.h:6
+#: addressbook/gui/component/ldap-config.glade.h:9
 msgid "380"
 msgstr "380"
 
-#: addressbook/gui/component/ldap-config.glade.h:7
+#: addressbook/gui/component/ldap-config.glade.h:10
 msgid "389"
 msgstr "389"
 
-#: addressbook/gui/component/ldap-config.glade.h:8
+#: addressbook/gui/component/ldap-config.glade.h:11
 msgid "5:00"
 msgstr "5:00"
 
-#: addressbook/gui/component/ldap-config.glade.h:9
+#: addressbook/gui/component/ldap-config.glade.h:12
 msgid "636"
 msgstr "636"
 
-#: addressbook/gui/component/ldap-config.glade.h:10
+#: addressbook/gui/component/ldap-config.glade.h:13
 msgid "666"
 msgstr "666"
 
-#: addressbook/gui/component/ldap-config.glade.h:11
+#: addressbook/gui/component/ldap-config.glade.h:14
 msgid "<- _Remove"
 msgstr "<- Fje_rn"
 
-#: addressbook/gui/component/ldap-config.glade.h:12
+#: addressbook/gui/component/ldap-config.glade.h:15
 msgid "<< Fewer Options"
 msgstr "<< Færre alternativer"
 
-#: addressbook/gui/component/ldap-config.glade.h:13
+#: addressbook/gui/component/ldap-config.glade.h:16
 msgid "Add (or Edit) Attribute Mappings"
 msgstr "Legg til (eller rediger) mapping av attributter"
 
-#: addressbook/gui/component/ldap-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:17
 msgid "Addressbook Sources"
 msgstr "Adressebok-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:58
-#: mail/mail-config.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:62
+#: mail/mail-config.glade.h:16
 msgid "Always"
 msgstr "Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:19
 msgid "Anonymously"
 msgstr "Anonym"
 
-#: addressbook/gui/component/ldap-config.glade.h:17
-msgid "Associated LDAP Attribute"
-msgstr "Assosiert LDAP-attributt"
-
-#: addressbook/gui/component/ldap-config.glade.h:18
-msgid "Attribute"
-msgstr "Attributt"
-
-#: addressbook/gui/component/ldap-config.glade.h:19
+#: addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Congratulations, you are finished setting up this LDAP server. You\n"
 "are now ready to access this directory.\n"
@@ -833,14 +928,10 @@ msgstr ""
 "Vennligst klikk på «Fullfør»-knappen for å lagre innstillingenene du har "
 "oppgitt her."
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Connecting"
 msgstr "Tilkobling"
 
-#: addressbook/gui/component/ldap-config.glade.h:24
-msgid "Corresponding Evolution Attribute"
-msgstr "Korresponderende Evolution-attributt"
-
 #: addressbook/gui/component/ldap-config.glade.h:25
 msgid "DN Customization"
 msgstr "DN-tilpasning"
@@ -858,46 +949,38 @@ msgid "Email Address:"
 msgstr "E-post adresse:"
 
 #: addressbook/gui/component/ldap-config.glade.h:29
-msgid "Evolution Attribute"
-msgstr "Evolution-attributt"
-
-#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Evolution vil bruke DN til å autentisere deg mot tjeneren"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 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:32
+#: addressbook/gui/component/ldap-config.glade.h:31
 msgid "Finished"
 msgstr "Fullført"
 
-#: addressbook/gui/component/ldap-config.glade.h:33
+#: addressbook/gui/component/ldap-config.glade.h:32
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
-msgid "LDAP Attribute"
-msgstr "LDAP-attributt"
-
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "LDAP Configuration Assistant"
 msgstr "Konfigurasjonsassistent for LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Mappings"
 msgstr "Mappinger"
 
-#: addressbook/gui/component/ldap-config.glade.h:37 mail/mail-account-gui.c:60
-#: mail/mail-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:35 mail/mail-account-gui.c:64
+#: mail/mail-config.glade.h:76
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
 "Now, you must specify how you want to connect to the LDAP server. The SSL "
 "(Secure Sockets Layer)\n"
@@ -907,23 +990,23 @@ msgid ""
 "these protocols."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Objectclasses"
 msgstr "Objektklasser"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid "Objectclasses Used in Evolution:"
 msgstr "Objektklasser som brukes i Evolution:"
 
-#: addressbook/gui/component/ldap-config.glade.h:43
+#: addressbook/gui/component/ldap-config.glade.h:41
 msgid "Objectclasses Used on Server:"
 msgstr "Objektklasser som brukes på tjener:"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:45
+#: addressbook/gui/component/ldap-config.glade.h:43
 msgid ""
 "Please select an Evolution attribute and an\n"
 "LDAP attribute to associate with it."
@@ -931,42 +1014,30 @@ msgstr ""
 "Vennligst velg en Evolution-attributt og en\n"
 "LDAP-attributt du vil assosiere med denne."
 
-#: addressbook/gui/component/ldap-config.glade.h:47
-msgid ""
-"Please select and Evolution attribute and an\n"
-"LDAP attribute to associate with it."
-msgstr ""
-"Vennligst velg en Evolution-attributt og en\n"
-"LDAP-attributt du vil assosiere med denne."
-
-#: addressbook/gui/component/ldap-config.glade.h:49
+#: addressbook/gui/component/ldap-config.glade.h:45
 msgid "R_estore Defaults"
 msgstr "Gjenopp_rett forvalg"
 
-#: addressbook/gui/component/ldap-config.glade.h:50
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid "Re_store Defaults"
 msgstr "_Gjenopprett forvalg"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:47
 msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
 #. No time range is set, so don't start a query
-#: addressbook/gui/component/ldap-config.glade.h:52
-#: calendar/gui/calendar-model.c:1994 calendar/gui/e-day-view.c:1710
-#: calendar/gui/e-week-view.c:1240
+#: addressbook/gui/component/ldap-config.glade.h:48
+#: calendar/gui/calendar-model.c:1975 calendar/gui/e-day-view.c:1670
+#: calendar/gui/e-week-view.c:1223
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
-msgid "Select"
-msgstr "Velg"
-
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Selected:"
 msgstr "Valgt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:55
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -976,7 +1047,7 @@ msgstr ""
 "tjener hvis\n"
 "denne støtter SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:57
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -993,7 +1064,7 @@ msgstr ""
 "vil ikke Evolution behøve å bruke SSL/TLS fordi tilkoblingen allerede er "
 "sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:56
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -1006,7 +1077,7 @@ msgstr ""
 "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:64
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "Selecting this option will let you change Evolution's default settings for "
 "LDAP\n"
@@ -1016,17 +1087,7 @@ msgstr ""
 "innstillinger\n"
 "for LDAP-søk, og for oppretting og redigering av kontakter. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
-msgid ""
-"Selecting this option will let you change Evolution's default settings for "
-"LDAP\n"
-"searches, and for creating and editting contacts. "
-msgstr ""
-"Hvis du aktiverer dette alternativet lar det deg endre Evolutions forvalgte "
-"innstillinger\n"
-"for LDAP-søk, og for oppretting og redigering av kontakter. "
-
-#: addressbook/gui/component/ldap-config.glade.h:68
+#: addressbook/gui/component/ldap-config.glade.h:61
 msgid ""
 "Specifying a display name is the last required step in configuring an LDAP "
 "server."
@@ -1034,31 +1095,31 @@ msgstr ""
 "Spesifisering av visningsnavn er det siste steget i konfigurasjon av en LDAP-"
 "tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid "Step 1: Server Information"
 msgstr "Steg 1: Tjenerinformasjon"
 
-#: addressbook/gui/component/ldap-config.glade.h:70
+#: addressbook/gui/component/ldap-config.glade.h:63
 msgid "Step 2: Connecting to Server"
 msgstr "Steg 2: Kobler til tjener"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid "Step 3: Searching the Directory"
 msgstr "Steg 3: Søker i katalogen"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:65
 msgid "Step 4: Display Name"
 msgstr "Steg 4: Vis navn"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:66
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:74
+#: addressbook/gui/component/ldap-config.glade.h:67
 msgid "Supported Search Bases"
 msgstr "Støttede søkebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid ""
 "The first step in configuring an LDAP server is to provide its name, and "
 "your log in\n"
@@ -1070,7 +1131,7 @@ msgstr ""
 "Vennligst spør din systemadministrator hvis du ikke er sikker på hva dette "
 "er."
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid ""
 "The options on this page control how many entries should be included in "
 "your\n"
@@ -1084,7 +1145,7 @@ msgstr ""
 "trenger\n"
 "å endre disse alternativene."
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -1095,21 +1156,22 @@ msgstr ""
 "starte.\n"
 "Hvis du lar denne stå tom vil søk starte ved roten av katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:75
+#, fuzzy
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
 "directory tree. A search scope of \"sub\" will include all entries below "
 "your search base.\n"
 "A search scope of \"one\" will only include the entries one level beneath "
-"your base."
+"your base.\n"
 msgstr ""
 "Søkeområdet definerer hvor dypt du ønsker at søket skal gå ned i "
 "katalogtreet.\n"
 "Et søkeområde som «sub» vil ta med alle oppføringer under din søkebase.\n"
 "Et søkeområde som «one» vil kun ta med oppføringer ett nivå under basen."
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid ""
 "This assistant will help you to access online directory services\n"
 "using LDAP (Lightweight Directory Access Protocol) servers. \n"
@@ -1125,14 +1187,14 @@ msgstr ""
 "om tjeneren. Vennligst kontakt din systemadministrator hvis du trenger\n"
 "hjelp med å finne denne informasjonen."
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:85
 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:92
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -1142,7 +1204,7 @@ msgstr ""
 "dette tallet \n"
 "for høyt vil adresseboken bli treg."
 
-#: addressbook/gui/component/ldap-config.glade.h:94
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid ""
 "This is the method evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
@@ -1151,7 +1213,7 @@ msgstr ""
 "Dette er metoden Evolution bruker for å autentisere deg. Merk at hvis du "
 "setter denne til «e-post-adresse» krever anonym tilgang til din LDAP-tjener."
 
-#: addressbook/gui/component/ldap-config.glade.h:95
+#: addressbook/gui/component/ldap-config.glade.h:89
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -1160,7 +1222,7 @@ msgstr ""
 "Dette er navnet på denne tjeneren som vises i mappelisten i Evolution. \n"
 "Det brukes kun for visning på skjermen."
 
-#: addressbook/gui/component/ldap-config.glade.h:97
+#: addressbook/gui/component/ldap-config.glade.h:91
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -1171,11 +1233,11 @@ msgstr ""
 "liste med standardporter er gitt. Spør din systemadministrator hvilken\n"
 "port du skal bruke."
 
-#: addressbook/gui/component/ldap-config.glade.h:100
+#: addressbook/gui/component/ldap-config.glade.h:94
 msgid "This option controls how long a search will be run."
 msgstr "Dette alternativet kontrollerer hvor lenge et søk vil kjøre."
 
-#: addressbook/gui/component/ldap-config.glade.h:101
+#: addressbook/gui/component/ldap-config.glade.h:95
 msgid ""
 "To add an attribute to the DN, select it from the list and click the \"Add "
 "Attribute\" button.\n"
@@ -1184,68 +1246,68 @@ msgid ""
 "that you add to the directory on the LDAP server. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:104
+#: addressbook/gui/component/ldap-config.glade.h:98
 msgid "U_se SSL/TLS:"
 msgstr "B_ruk SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:105
+#: addressbook/gui/component/ldap-config.glade.h:99
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:106
+#: addressbook/gui/component/ldap-config.glade.h:100
 msgid "Using email address"
 msgstr "Bruker e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:107
-#: mail/mail-account-gui.c:59 mail/mail-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:101
+#: mail/mail-account-gui.c:63 mail/mail-config.glade.h:132
 msgid "Whenever Possible"
 msgstr "Når mulig"
 
-#: addressbook/gui/component/ldap-config.glade.h:108
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: calendar/gui/dialogs/alarm-page.glade.h:8 filter/filter.glade.h:14
+#: addressbook/gui/component/ldap-config.glade.h:102
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: calendar/gui/dialogs/alarm-page.glade.h:9 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:135 shell/glade/e-folder-list.glade.h:1
 msgid "_Add"
 msgstr "_Legg til"
 
-#: addressbook/gui/component/ldap-config.glade.h:109
+#: addressbook/gui/component/ldap-config.glade.h:103
 msgid "_Add ->"
 msgstr "_Legg til ->"
 
-#: addressbook/gui/component/ldap-config.glade.h:110
+#: addressbook/gui/component/ldap-config.glade.h:104
 msgid "_Add Mapping"
 msgstr "_Legg til mapping"
 
-#: addressbook/gui/component/ldap-config.glade.h:111
+#: addressbook/gui/component/ldap-config.glade.h:105
 msgid "_Add to DN"
 msgstr "_Legg til i DN"
 
-#: addressbook/gui/component/ldap-config.glade.h:112
+#: addressbook/gui/component/ldap-config.glade.h:106
 msgid "_Always"
 msgstr "_Alltid"
 
-#: addressbook/gui/component/ldap-config.glade.h:113
+#: addressbook/gui/component/ldap-config.glade.h:107
 msgid "_Delete Mapping"
 msgstr "_Slett mapping"
 
-#: addressbook/gui/component/ldap-config.glade.h:114
+#: addressbook/gui/component/ldap-config.glade.h:108
 msgid "_Display name:"
 msgstr "_Vis navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:115
+#: addressbook/gui/component/ldap-config.glade.h:109
 msgid "_Distinguished Name (DN):"
 msgstr "_Distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:116
+#: addressbook/gui/component/ldap-config.glade.h:110
 msgid "_Don't use SSL/TLS"
 msgstr "_Ikke bruk SSL/TLS"
 
-#: addressbook/gui/component/ldap-config.glade.h:117
+#: addressbook/gui/component/ldap-config.glade.h:111
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:118 filter/filter.glade.h:16
+#: addressbook/gui/component/ldap-config.glade.h:112 filter/filter.glade.h:16
 #: mail/mail-config.glade.h:150 ui/evolution-addressbook.xml.h:33
 #: ui/evolution-calendar.xml.h:28 ui/evolution-mail-list.xml.h:25
 #: ui/evolution-mail-messagedisplay.xml.h:6
@@ -1255,157 +1317,169 @@ msgstr "Grense for ne_dlasting:"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: addressbook/gui/component/ldap-config.glade.h:119
+#: addressbook/gui/component/ldap-config.glade.h:113
 msgid "_Edit Mapping"
 msgstr "R_ediger mapping"
 
-#: addressbook/gui/component/ldap-config.glade.h:120
+#: addressbook/gui/component/ldap-config.glade.h:114
 msgid "_Evolution attribute:"
 msgstr "_Evolution-attributt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:121
+#: addressbook/gui/component/ldap-config.glade.h:115
 msgid "_If necessary "
 msgstr "_Om nødvendig"
 
-#: addressbook/gui/component/ldap-config.glade.h:122
+#: addressbook/gui/component/ldap-config.glade.h:116
 msgid "_LDAP attribute:"
 msgstr "_LDAP-attributt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:123
+#: addressbook/gui/component/ldap-config.glade.h:117
 msgid "_LDAP attributes:"
 msgstr "_LDAP-attributter:"
 
-#: addressbook/gui/component/ldap-config.glade.h:124
+#: addressbook/gui/component/ldap-config.glade.h:118
 msgid "_Log in method:"
 msgstr "Metode for på_logging:"
 
-#: addressbook/gui/component/ldap-config.glade.h:125
+#: addressbook/gui/component/ldap-config.glade.h:119
 msgid "_More Options >>"
 msgstr "_Flere alternativer >>"
 
-#: addressbook/gui/component/ldap-config.glade.h:126
+#: addressbook/gui/component/ldap-config.glade.h:120
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:127
+#: addressbook/gui/component/ldap-config.glade.h:121
 msgid "_Restore Defaults"
 msgstr " Gjenopp_rett forvalg"
 
-#: addressbook/gui/component/ldap-config.glade.h:128
+#: addressbook/gui/component/ldap-config.glade.h:122
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:129
+#: addressbook/gui/component/ldap-config.glade.h:123
 msgid "_Server name:"
 msgstr "_Tjenernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:130
+#: addressbook/gui/component/ldap-config.glade.h:124
 msgid "_Timeout (minutes):"
 msgstr "_Tidsavbrudd (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:131
+#: addressbook/gui/component/ldap-config.glade.h:125
 msgid "account-druid"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:132
+#: addressbook/gui/component/ldap-config.glade.h:126
 msgid "account-editor"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:133
+#: addressbook/gui/component/ldap-config.glade.h:127
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:134
+#: addressbook/gui/component/ldap-config.glade.h:128
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:135
+#: addressbook/gui/component/ldap-config.glade.h:129
 msgid "dn-customization-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:136
+#: addressbook/gui/component/ldap-config.glade.h:130
 msgid "edit_server_window_simple"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:137
+#: addressbook/gui/component/ldap-config.glade.h:131
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:138
+#: addressbook/gui/component/ldap-config.glade.h:132
 msgid "mappings-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:139
+#: addressbook/gui/component/ldap-config.glade.h:133
 msgid "objectclasses-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:140
+#: addressbook/gui/component/ldap-config.glade.h:134
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 msgid "Evolution's addressbook name selection interface."
 msgstr "Evolution adressebok-komponent"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:2
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:2
 msgid "Factory for the Addressbook's name selection interface"
 msgstr "Factory for adressebokens grensesnitt for navnevalg"
 
 #. Fixme: Ditto
-#: addressbook/gui/component/select-names/e-select-names-popup.c:163
-#: addressbook/gui/component/select-names/e-select-names.c:699
-#: composer/e-msg-composer-attachment-bar.c:519 filter/filter-filter.c:462
-#: filter/filter-rule.c:681 my-evolution/e-summary-shown.c:538
-#: shell/e-shortcuts-view.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:162
+#: addressbook/gui/component/select-names/e-select-names.c:680
+#: composer/e-msg-composer-attachment-bar.c:502
+#: my-evolution/e-summary-shown.c:536
 msgid "Remove"
 msgstr "Fjern"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:178
+#: addressbook/gui/component/select-names/e-select-names-popup.c:177
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:202
+#: addressbook/gui/component/select-names/e-select-names-popup.c:201
 msgid "Send HTML Mail?"
 msgstr "Send HTML e-post?"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:405
-msgid "Edit Contact List"
-msgstr "Rediger kontaktliste"
+#: addressbook/gui/component/select-names/e-select-names-popup.c:300
+msgid "View Contact Info"
+msgstr "Vis kontaktinformasjon"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:399
+msgid "View Contact List"
+msgstr "Vis kontaktliste"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:423
+#: addressbook/gui/component/select-names/e-select-names-popup.c:417
 msgid "Unnamed Contact List"
 msgstr "Kontaktliste uten navn"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:440
+#: addressbook/gui/component/select-names/e-select-names-popup.c:434
 #, c-format
 msgid "(%d not shown)"
 msgstr "(%d ikke vist)"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:506
+#: addressbook/gui/component/select-names/e-select-names-popup.c:500
 msgid "Unnamed Contact"
 msgstr "Kontakt uten navn:"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/e-select-names-table-model.c:350
+#: addressbook/gui/component/select-names/e-select-names-text-model.c:104
+msgid "Source"
+msgstr "Kilde"
+
+#: addressbook/gui/component/select-names/e-select-names.c:510
 msgid "Select Contacts from Addressbook"
 msgstr "Velg kontakter fra adresseboken"
 
-#: addressbook/gui/component/select-names/e-select-names.c:564
+#: addressbook/gui/component/select-names/e-select-names.c:570
 msgid "Find contact in"
 msgstr "Finn kontakt i"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: addressbook/gui/component/select-names/select-names.glade.h:2
+msgid "Find"
+msgstr "Finn"
+
+#: addressbook/gui/component/select-names/select-names.glade.h:3
 msgid "Select Names"
 msgstr "Velg navn"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:2
+#: addressbook/gui/component/select-names/select-names.glade.h:4
 msgid "Selected Contacts:"
 msgstr "Valgte kontakter:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:3
+#: addressbook/gui/component/select-names/select-names.glade.h:5
 msgid "Show Contacts"
 msgstr "Vis kontakter"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:4
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 msgid ""
 "Type a name into the entry, or\n"
 "select one from the list below:"
@@ -1413,36 +1487,32 @@ msgstr ""
 "Skriv et navn inn i feltet,\n"
 "eller velg et fra listen under:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/select-names.glade.h:8
 msgid "_Category:"
 msgstr "_Kategori:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: addressbook/gui/component/select-names/select-names.glade.h:9
 msgid "_Folder:"
 msgstr "_Mappe:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:1
+#: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "A_ssistant's name:"
 msgstr "A_ssistentens navn"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:2
+#: addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "Add_ress..."
 msgstr "Ad_resse..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:3
+#: addressbook/gui/contact-editor/contact-editor.glade.h:4
 msgid "Anni_versary:"
 msgstr "Br_yllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:4
+#: addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "Birthda_y:"
 msgstr "F_ødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "C_ontacts..."
-msgstr "K_ontakter..."
-
 #: addressbook/gui/contact-editor/contact-editor.glade.h:8
-#: calendar/gui/dialogs/event-page.glade.h:3
+#: calendar/gui/dialogs/event-page.glade.h:4
 #: calendar/gui/dialogs/task-page.glade.h:1
 msgid "Ca_tegories..."
 msgstr "Kate_gorier..."
@@ -1453,7 +1523,7 @@ msgstr "Samarbeid"
 
 #. Construct the app
 #: addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: addressbook/gui/contact-editor/e-contact-editor.c:1369
+#: addressbook/gui/contact-editor/e-contact-editor.c:1352
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -1462,7 +1532,7 @@ msgid "D_epartment:"
 msgstr "Avd_eling:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: calendar/gui/dialogs/task-editor.c:211
+#: calendar/gui/dialogs/task-editor.c:196
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1504,1139 +1574,1181 @@ msgstr "Organisas_jon:"
 msgid "P_rofession:"
 msgstr "Y_rke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
-msgid "Phone Types"
-msgstr "Telefontyper"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "S_pouse:"
 msgstr "E_ktefelle:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "This is the _mailing address"
 msgstr "Dette er _postadressen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 msgid "Wants to receive _HTML mail"
 msgstr "Vil motta _HTML e-post"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/meeting-page.c:674
-#: calendar/gui/e-calendar-table.c:1006 calendar/gui/e-day-view.c:3766
-#: calendar/gui/e-week-view.c:3563 filter/filter.glade.h:15
-#: mail/folder-browser.c:1756 mail/mail-config.glade.h:148
-#: shell/glade/e-folder-list.glade.h:2 ui/evolution-addressbook.xml.h:32
-#: ui/evolution-calendar.xml.h:27 ui/evolution-mail-message.xml.h:97
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/meeting-page.c:656 calendar/gui/e-calendar-table.c:969
+#: calendar/gui/e-day-view.c:3720 calendar/gui/e-week-view.c:3559
+#: filter/filter.glade.h:15 mail/folder-browser.c:1768
+#: mail/mail-config.glade.h:148 shell/glade/e-folder-list.glade.h:2
+#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:27
+#: ui/evolution-mail-message.xml.h:97 ui/evolution-tasks.xml.h:16
+#: ui/evolution.xml.h:48
 msgid "_Delete"
 msgstr "_Slett"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Job title:"
 msgstr "_Jobbtittel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Manager's Name:"
 msgstr "_Leders navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "_Nickname:"
 msgstr "Kalle_navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Office:"
 msgstr "Kont_or:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Public Calendar URL:"
 msgstr "_Offentlig kalender-URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Web page address:"
 msgstr "_Hjemmeside-adresse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:130
-#: my-evolution/Locations.h:2341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:102
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
+#: addressbook/gui/widgets/e-addressbook-model.c:318
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
+#: addressbook/gui/widgets/e-minicard-label.c:151
+#: addressbook/gui/widgets/e-minicard-view-widget.c:118
+#: addressbook/gui/widgets/e-minicard-view.c:473
+#: addressbook/gui/widgets/e-minicard.c:179
+msgid "Editable"
+msgstr "Redigerbar"
+
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: my-evolution/Locations.h:2340
 msgid "United States"
 msgstr "De forente stater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:131
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:132
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
 #: my-evolution/Locations.h:42
 msgid "Albania"
 msgstr "Albania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:133
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
 #: my-evolution/Locations.h:54
 msgid "Algeria"
 msgstr "Algerie"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:134
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
 msgid "American Samoa"
 msgstr "Amerikansk Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:135
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
 msgid "Andorra"
 msgstr "Andorra"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:136
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
 msgid "Angola"
 msgstr "Angola"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:137
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:138
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:139
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
 msgid "Antigua And Barbuda"
 msgstr "Antigua og Barbuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:140
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
 #: my-evolution/Locations.h:120
 msgid "Argentina"
 msgstr "Argentina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:141
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Armenia"
 msgstr "Armenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:142
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Aruba"
 msgstr "Aruba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:143
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
 #: my-evolution/Locations.h:154
 msgid "Australia"
 msgstr "Australia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:144
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
 #: my-evolution/Locations.h:155
 msgid "Austria"
 msgstr "Østerrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:145
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
 msgid "Azerbaijan"
 msgstr "Aserbajdsjan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:146
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
 #: my-evolution/Locations.h:161
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:147
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
 #: my-evolution/Locations.h:164
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:148
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:149
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
 msgid "Barbados"
 msgstr "Barbados"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:150
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
 msgid "Belarus"
 msgstr "Hviterussland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:151
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
 #: my-evolution/Locations.h:216
 msgid "Belgium"
 msgstr "Belgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:152
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
 #: my-evolution/Locations.h:218
 msgid "Belize"
 msgstr "Belize"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:153
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
 msgid "Benin"
 msgstr "Benin"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:154
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:155
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:156
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
 #: my-evolution/Locations.h:270
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:157
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
 msgid "Bosnia And Herzegowina"
 msgstr "Bosnia-Hercegovina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:158
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
 msgid "Botswana"
 msgstr "Botswana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:159
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
 msgid "Bouvet Island"
 msgstr "Bouvetøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:160
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
 #: my-evolution/Locations.h:294
 msgid "Brazil"
 msgstr "Brasil"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:161
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "British Indian Ocean Territory"
 msgstr "Britisk-Indisk havområde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:162
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:163
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
 #: my-evolution/Locations.h:320
 msgid "Bulgaria"
 msgstr "Bulgaria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:164
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:165
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
 msgid "Burundi"
 msgstr "Burundi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:166
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Cambodia"
 msgstr "Kambodsja"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:167
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:168
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
 #: my-evolution/Locations.h:354
 msgid "Canada"
 msgstr "Canada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:169
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
 msgid "Cape Verde"
 msgstr "Kapp Verde"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:170
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
 #: my-evolution/Locations.h:389
 msgid "Cayman Islands"
 msgstr "Caymanøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:171
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Central African Republic"
 msgstr "Den sentralafrikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:172
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Chad"
 msgstr "Tsjad"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:173
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
 #: my-evolution/Locations.h:438
 msgid "Chile"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "China"
 msgstr "Kina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:175
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
 #: my-evolution/Locations.h:451
 msgid "Christmas Island"
 msgstr "Christmasøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:176
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
 msgid "Cocos (Keeling) Islands"
 msgstr "Kokosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:177
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
 #: my-evolution/Locations.h:483
 msgid "Colombia"
 msgstr "Colombia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:178
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Comoros"
 msgstr "Komorene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:179
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Congo"
 msgstr "Kongo-Brazaville"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Cook Islands"
 msgstr "Cookøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:182
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
 #: my-evolution/Locations.h:517
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cote d'Ivoire"
 msgstr "Elfenbenskysten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:184
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
 #: my-evolution/Locations.h:528
 msgid "Croatia"
 msgstr "Kroatia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
 #: my-evolution/Locations.h:532
 msgid "Cuba"
 msgstr "Kuba"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:186
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
 #: my-evolution/Locations.h:545
 msgid "Cyprus"
 msgstr "Kypros"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:187
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
 #: my-evolution/Locations.h:546
 msgid "Czech Republic"
 msgstr "Tsjekkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
 #: my-evolution/Locations.h:580
 msgid "Denmark"
 msgstr "Danmark"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:189
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:190
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
 msgid "Dominica"
 msgstr "Dominica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:191
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
 #: my-evolution/Locations.h:608
 msgid "Dominican Republic"
 msgstr "Den dominikanske republikk"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:192
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "East Timor"
 msgstr "Øst-Timor"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:193
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
 #: my-evolution/Locations.h:641
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:194
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
 #: my-evolution/Locations.h:650
 msgid "Egypt"
 msgstr "Egypt"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:195
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
 #: my-evolution/Locations.h:666
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:196
+#: 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:197
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:198
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
 #: my-evolution/Locations.h:684
 msgid "Estonia"
 msgstr "Estland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:199
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Ethiopia"
 msgstr "Etiopia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:200
+#: 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:201
+#: 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:202
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Fiji"
 msgstr "Fiji"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:208
 #: my-evolution/Locations.h:716
 msgid "Finland"
 msgstr "Finland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:204
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
 #: my-evolution/Locations.h:766
 msgid "France"
 msgstr "Frankrike"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:205
+#: 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:206
+#: 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:207
+#: 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:208
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "Gabon"
 msgstr "Gabon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:209
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gambia"
 msgstr "Gambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:210
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
 #: my-evolution/Locations.h:811
 msgid "Georgia"
 msgstr "Georgia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:211
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
 #: my-evolution/Locations.h:812
 msgid "Germany"
 msgstr "Tyskland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:212
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
 msgid "Ghana"
 msgstr "Ghana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:213
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
 #: my-evolution/Locations.h:815
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:214
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
 #: my-evolution/Locations.h:846
 msgid "Greece"
 msgstr "Hellas"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:215
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
 msgid "Greenland"
 msgstr "Grønland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:216
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
 msgid "Grenada"
 msgstr "Grenada"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:217
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Guadeloupe"
 msgstr "Guadelope"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:218
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guam"
 msgstr "Guam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:219
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
 #: my-evolution/Locations.h:867
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:220
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
 msgid "Guinea"
 msgstr "Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:221
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
 msgid "Guinea-bissau"
 msgstr "Guinea-bissau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:222
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guyana"
 msgstr "Guyana"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:223
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
 #: my-evolution/Locations.h:888
 msgid "Haiti"
 msgstr "Haiti"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:224
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Heard And McDonald Islands"
 msgstr "Heard og McDonald-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:225
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Holy See"
 msgstr "Vatikanstaten"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:226
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
 #: my-evolution/Locations.h:945
 msgid "Honduras"
 msgstr "Honduras"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:227
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
 #: my-evolution/Locations.h:946
 msgid "Hong Kong"
 msgstr "Hong Kong"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:228
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
 #: my-evolution/Locations.h:966
 msgid "Hungary"
 msgstr "Ungarn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:229
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
 #: my-evolution/Locations.h:978
 msgid "Iceland"
 msgstr "Island"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:230
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
 #: my-evolution/Locations.h:991
 msgid "India"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:231
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:232
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
 #: my-evolution/Locations.h:1007
 msgid "Ireland"
 msgstr "Irland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:233
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
 msgid "Israel"
 msgstr "Israel"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:234
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
 #: my-evolution/Locations.h:1016
 msgid "Italy"
 msgstr "Italia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:235
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
 #: my-evolution/Locations.h:1031
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:236
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
 #: my-evolution/Locations.h:1035
 msgid "Japan"
 msgstr "Japan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:237
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
 #: my-evolution/Locations.h:1046
 msgid "Jordan"
 msgstr "Jordan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:238
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Kazakhstan"
 msgstr "Kasakhstan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:239
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
 msgid "Kenya"
 msgstr "Kenya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:240
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:241
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
 msgid "Korea, Republic Of"
 msgstr "Sør-Korea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:242
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
 #: my-evolution/Locations.h:1146
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:243
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
 msgid "Kyrgyzstan"
 msgstr "Kirgisistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:244
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
 msgid "Laos"
 msgstr "Laos"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:245
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Latvia"
 msgstr "Latvia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:246
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
 #: my-evolution/Locations.h:1197
 msgid "Lebanon"
 msgstr "Libanon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:247
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:248
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
 #: my-evolution/Locations.h:1217
 msgid "Liberia"
 msgstr "Liberia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:249
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:250
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
 #: my-evolution/Locations.h:1233
 msgid "Lithuania"
 msgstr "Litauen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:251
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
 #: my-evolution/Locations.h:1267
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:252
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
 msgid "Macau"
 msgstr "Macao"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:253
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
 msgid "Macedonia"
 msgstr "Makedonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:254
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:255
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Malawi"
 msgstr "Malawi"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:256
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:257
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Maldives"
 msgstr "Maldivene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:258
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Mali"
 msgstr "Mali"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:259
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
 #: my-evolution/Locations.h:1296
 msgid "Malta"
 msgstr "Malta"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:260
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
 msgid "Marshall Islands"
 msgstr "Marshalløyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:261
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
 msgid "Martinique"
 msgstr "Martinique"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:262
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:263
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:264
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:265
-#: my-evolution/Locations.h:1386
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: my-evolution/Locations.h:1385
 msgid "Mexico"
 msgstr "Mexico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:266
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Micronesia"
 msgstr "Mikronesiaføderasjonen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:267
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Moldova, Republic Of"
 msgstr "Moldova"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:268
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Monaco"
 msgstr "Monaco"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:269
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:270
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:271
-#: my-evolution/Locations.h:1469
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: my-evolution/Locations.h:1468
 msgid "Morocco"
 msgstr "Marokko"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:272
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mozambique"
 msgstr "Mosambik"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:273
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:274
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
 msgid "Namibia"
 msgstr "Namibia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:275
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
 msgid "Nauru"
 msgstr "Nauru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:276
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Nepal"
 msgstr "Nepal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:277
-#: my-evolution/Locations.h:1530
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: my-evolution/Locations.h:1529
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:278
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
 msgid "Netherlands Antilles"
 msgstr "De nederlandske antillene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:279
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
 msgid "New Caledonia"
 msgstr "Ny-Caledonia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:280
-#: my-evolution/Locations.h:1559
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
+#: my-evolution/Locations.h:1558
 msgid "New Zealand"
 msgstr "New Zealand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:281
-#: my-evolution/Locations.h:1561
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: my-evolution/Locations.h:1560
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:282
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
 msgid "Niger"
 msgstr "Niger"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:283
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:284
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Niue"
 msgstr "Niue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:285
-#: my-evolution/Locations.h:1573
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: my-evolution/Locations.h:1572
 msgid "Norfolk Island"
 msgstr "Norfolkøya"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:286
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Northern Mariana Islands"
 msgstr "Nord-Marianene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:287
-#: my-evolution/Locations.h:1586
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
+#: my-evolution/Locations.h:1585
 msgid "Norway"
 msgstr "Norge"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:288
-#: my-evolution/Locations.h:1631
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: my-evolution/Locations.h:1630
 msgid "Oman"
 msgstr "Oman"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:289
-#: my-evolution/Locations.h:1672
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
+#: my-evolution/Locations.h:1671
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:290
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Palau"
 msgstr "Palau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:291
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Palestinian Territory"
 msgstr "Palestinsk område"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:292
-#: my-evolution/Locations.h:1682
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: my-evolution/Locations.h:1681
 msgid "Panama"
 msgstr "Panama"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:293
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Papua New Guinea"
 msgstr "Papua Ny-Guinea"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:294
-#: my-evolution/Locations.h:1687
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
+#: my-evolution/Locations.h:1686
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:295
-#: my-evolution/Locations.h:1722
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
+#: my-evolution/Locations.h:1721
 msgid "Peru"
 msgstr "Peru"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:296
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
 msgid "Philippines"
 msgstr "Filippinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:297
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:298
-#: my-evolution/Locations.h:1763
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
+#: my-evolution/Locations.h:1762
 msgid "Poland"
 msgstr "Polen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:299
-#: my-evolution/Locations.h:1790
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: my-evolution/Locations.h:1789
 msgid "Portugal"
 msgstr "Portugal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:300
-#: my-evolution/Locations.h:1823
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: my-evolution/Locations.h:1822
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:301
-#: my-evolution/Locations.h:1835
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: my-evolution/Locations.h:1834
 msgid "Qatar"
 msgstr "Qatar"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:302
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Reunion"
 msgstr "Réunion"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:303
-#: my-evolution/Locations.h:1910
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: my-evolution/Locations.h:1909
 msgid "Romania"
 msgstr "Romania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:304
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
 msgid "Russian Federation"
 msgstr "Russland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:305
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:306
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
 msgid "Saint Kitts And Nevis"
 msgstr "Saint Kitts og Nevis"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:307
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:308
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
 msgid "Saint Vincent And The Grena-dines"
 msgstr "Saint Vincent og Grenadinene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:309
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Samoa"
 msgstr "Samoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:310
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "San Marino"
 msgstr "San Marino"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:311
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
 msgid "Sao Tome And Principe"
 msgstr "São Tomé og Príncipe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:312
-#: my-evolution/Locations.h:2033
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
+#: my-evolution/Locations.h:2032
 msgid "Saudi Arabia"
 msgstr "Saudi-Arabia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:313
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
 msgid "Senegal"
 msgstr "Senegal"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:314
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Seychelles"
 msgstr "Seychellene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:315
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:316
-#: my-evolution/Locations.h:2088
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
+#: my-evolution/Locations.h:2087
 msgid "Singapore"
 msgstr "Singapore"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:317
-#: my-evolution/Locations.h:2101
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: my-evolution/Locations.h:2100
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:318
-#: my-evolution/Locations.h:2102
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:323
+#: my-evolution/Locations.h:2101
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Solomon Islands"
 msgstr "Salomonøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:320
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Somalia"
 msgstr "Somalia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:321
-#: my-evolution/Locations.h:2117
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: my-evolution/Locations.h:2116
 msgid "South Africa"
 msgstr "Sør-Afrika"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:322
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
 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:323
-#: my-evolution/Locations.h:2125
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
+#: my-evolution/Locations.h:2124
 msgid "Spain"
 msgstr "Spania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:324
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:325
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "St. Helena"
 msgstr "St. Helena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
 msgid "St. Pierre And Miquelon"
 msgstr "Saint-Pierre-et-Miquelon"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:327
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
 msgid "Sudan"
 msgstr "Sudan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:328
-#: my-evolution/Locations.h:2174
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
+#: my-evolution/Locations.h:2173
 msgid "Suriname"
 msgstr "Surinam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:329
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Svalbard And Jan Mayen Islands"
 msgstr "Svalbard og Jan Mayen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:330
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:331
-#: my-evolution/Locations.h:2179
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: my-evolution/Locations.h:2178
 msgid "Sweden"
 msgstr "Sverige"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:332
-#: my-evolution/Locations.h:2181
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: my-evolution/Locations.h:2180
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:333
-#: my-evolution/Locations.h:2203
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: my-evolution/Locations.h:2202
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:334
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
 msgid "Tajikistan"
 msgstr "Tadsjikistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:335
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "Tanzania, United Republic Of"
 msgstr "Tanzania"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:336
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Thailand"
 msgstr "Thailand"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:337
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Togo"
 msgstr "Togo"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:338
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:339
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Tonga"
 msgstr "Tonga"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Trinidad And Tobago"
 msgstr "Trinidad og Tobago"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:341
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:342
-#: my-evolution/Locations.h:2319
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
+#: my-evolution/Locations.h:2318
 msgid "Turkey"
 msgstr "Tyrkia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:343
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:344
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Turks And Caicos Islands"
 msgstr "Turks- og Caicosøyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:345
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
 msgid "Uganda"
 msgstr "Uganda"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:347
-#: my-evolution/Locations.h:2332
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: my-evolution/Locations.h:2331
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:348
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
 msgid "United Arab Emirates"
 msgstr "De forente arabiske emirater"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:349
-#: my-evolution/Locations.h:2340
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
+#: my-evolution/Locations.h:2339
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:350
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "United States Minor Outlying Islands"
 msgstr "USA, mindre omliggende øyer"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:351
-#: my-evolution/Locations.h:2346
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: my-evolution/Locations.h:2345
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:352
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:353
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:354
-#: my-evolution/Locations.h:2378
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: my-evolution/Locations.h:2377
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:355
-#: my-evolution/Locations.h:2390
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
+#: my-evolution/Locations.h:2389
 msgid "Viet Nam"
 msgstr "Vietnam"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:356
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Virgin Islands, British"
 msgstr "Jomfruøyene (Storbritannia)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:357
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Virgin Islands, U.S."
 msgstr "Jomfruøyene (USA)"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:358
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
 msgid "Wallis And Futuna Islands"
 msgstr "Wallis- og Futuna-øyene"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:359
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "Western Sahara"
 msgstr "Vest-Sahara"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:360
-#: my-evolution/Locations.h:2510
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:365
+#: my-evolution/Locations.h:2509
 msgid "Yemen"
 msgstr "Jemen"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:361
-#: my-evolution/Locations.h:2522
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:366
+#: my-evolution/Locations.h:2521
 msgid "Yugoslavia"
 msgstr "Jugoslavia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:362
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Zambia"
 msgstr "Zambia"
 
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:363
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:368
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:1
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakten?"
-
-#: addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h:3
-msgid "Delete Contact?"
-msgstr "Slett kontakt?"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:826
+#: addressbook/gui/contact-editor/e-contact-editor.c:159
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
+#: addressbook/gui/widgets/e-addressbook-model.c:304
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
+#: addressbook/gui/widgets/e-addressbook-view.c:180
+#: addressbook/gui/widgets/e-minicard-view-widget.c:104
+#: addressbook/gui/widgets/e-minicard-view.c:459
+msgid "Book"
+msgstr "Bok"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:166
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
+#: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:186
+msgid "Card"
+msgstr "Kort"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:173
+msgid "Is New Card"
+msgstr "Er nytt kort"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:180
+msgid "Writable Fields"
+msgstr "Skrivbare felter"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:194
+msgid "Changed"
+msgstr "Endret"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:845
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:833
+#: addressbook/gui/contact-editor/e-contact-editor.c:853
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1047
+#: addressbook/gui/contact-editor/e-contact-editor.c:1027
 msgid "Save Contact as VCard"
 msgstr "Lagre kontakt som VCard"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1759
+#: addressbook/gui/contact-editor/e-contact-editor.c:1073
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette disse kontaktene?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1076
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette denne kontakten?"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1776
 msgid "TTY/TDD"
 msgstr "TTY/TTD"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2440
+#: addressbook/gui/contact-editor/e-contact-editor.c:2380
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kunne ikke finne widget for felt: «%s»"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:301
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:298
 msgid "Contact Quick-Add"
 msgstr "Hurtigkontakt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:303
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:302
 msgid "Edit Full"
 msgstr "Rediger alt"
 
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:329
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Fullt navn"
-
-#: addressbook/gui/contact-editor/e-contact-quick-add.c:335
+#: addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "E-mail"
 msgstr "E-post"
 
+#: addressbook/gui/contact-editor/e-contact-save-as.c:66
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Feil under lagring av %s: %s"
+
 #. This is a filename. Translators take note.
-#: addressbook/gui/contact-editor/e-contact-save-as.c:107
+#: addressbook/gui/contact-editor/e-contact-save-as.c:103
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:183
+#: addressbook/gui/contact-editor/e-contact-save-as.c:173
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/contact-editor/e-contact-save-as.c:221
+#: addressbook/gui/contact-editor/e-contact-save-as.c:206
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2645,149 +2757,145 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/contact-editor/file-exists.glade.h:1
-msgid "Confirm Overwrite"
-msgstr "Bekreft overskriving"
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:2
-msgid "Don't bother translating this string.  It's not used."
-msgstr ""
-
-#: addressbook/gui/contact-editor/file-exists.glade.h:3
+#: addressbook/gui/contact-editor/e-contact-save-as.c:210
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:1
+#: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:2
+#: addressbook/gui/contact-editor/fulladdr.glade.h:3
 msgid "Check Address"
 msgstr "Sjekk adresse"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:3
+#: addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Countr_y:"
 msgstr "Lan_d:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:4
+#: addressbook/gui/contact-editor/fulladdr.glade.h:5
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: addressbook/gui/contact-editor/fulladdr.glade.h:6
 msgid "_City:"
 msgstr "_By:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: addressbook/gui/contact-editor/fulladdr.glade.h:7
 msgid "_PO Box:"
 msgstr "_Postboks:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_State/Province:"
 msgstr "_Stat/Provins:"
 
-#: addressbook/gui/contact-editor/fulladdr.glade.h:8
+#: addressbook/gui/contact-editor/fulladdr.glade.h:9
 msgid "_ZIP Code:"
 msgstr "_ZIP/Postnummer:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:1
+#: addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Check Full Name"
 msgstr "Sjekk fullt navn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:2
+#: addressbook/gui/contact-editor/fullname.glade.h:3
 msgid "Dr."
 msgstr "Dr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:3
+#: addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "Esq."
 msgstr "Esq."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "I"
 msgstr "I"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:5
+#: addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "II"
 msgstr "II"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:6
+#: addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "III"
 msgstr "III"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:7
+#: addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Jr."
 msgstr "Jr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:8
+#: addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Miss"
 msgstr "Frk"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:9
+#: addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mr."
 msgstr "Hr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:10
+#: addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Mrs."
 msgstr "Fru"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:11
+#: addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Ms."
 msgstr "Frk."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:12
+#: addressbook/gui/contact-editor/fullname.glade.h:13
 msgid "Sr."
 msgstr "Sr."
 
-#: addressbook/gui/contact-editor/fullname.glade.h:13
+#: addressbook/gui/contact-editor/fullname.glade.h:14
 msgid "_First:"
 msgstr "_Fornavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:14
+#: addressbook/gui/contact-editor/fullname.glade.h:15
 msgid "_Last:"
 msgstr "_Etternavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:15
+#: addressbook/gui/contact-editor/fullname.glade.h:16
 msgid "_Middle:"
 msgstr "_Mellomnavn:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:16
+#: addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Suffix:"
 msgstr "_Suffiks:"
 
-#: addressbook/gui/contact-editor/fullname.glade.h:17
+#: addressbook/gui/contact-editor/fullname.glade.h:18
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "List _name:"
 msgstr "Listenavn:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Members"
 msgstr "Medlemmer"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 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/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 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:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:12 filter/filter.glade.h:17
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "contact-list-editor"
 msgstr "kontakt-liste-redigering"
 
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:156
+msgid "Is New List"
+msgstr "Er ny liste"
+
 #. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:238
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:242
 msgid "Contact List Editor"
 msgstr "Kontaktlisteredigering"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:452
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Lagre liste som VCard"
 
@@ -2840,141 +2948,143 @@ msgstr ""
 "Den nye e-post adressen eller navnet for denne kontakten\n"
 "eksisterer allerede i denne mappen. Vil du legge til likevel?"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:145
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:153
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search.c:263
-msgid "Search"
-msgstr "Søk"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:146
+#: addressbook/gui/widgets/e-addressbook-model.c:156
 msgid "No cards"
 msgstr "Ingen kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:149
+#: addressbook/gui/widgets/e-addressbook-model.c:159
 msgid "1 card"
 msgstr "1 kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:152
+#: addressbook/gui/widgets/e-addressbook-model.c:162
 #, c-format
 msgid "%d cards"
 msgstr "%d kort"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:408
+#: addressbook/gui/widgets/e-addressbook-model.c:311
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
+#: addressbook/gui/widgets/e-addressbook-view.c:187
+#: addressbook/gui/widgets/e-minicard-view-widget.c:111
+#: addressbook/gui/widgets/e-minicard-view.c:466
+msgid "Query"
+msgstr "Spør"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:457
 msgid "Error getting book view"
 msgstr "Feil under henting av bokvisning"
 
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
+msgid "Model"
+msgstr "Modell"
+
 #: addressbook/gui/widgets/e-addressbook-table-adapter.c:142
-#: addressbook/gui/widgets/e-addressbook-util.c:91
-#: addressbook/gui/widgets/e-minicard.c:475
+#: addressbook/gui/widgets/e-addressbook-util.c:105
+#: addressbook/gui/widgets/e-minicard.c:515
 msgid "Error modifying card"
 msgstr "Feil ved endring av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:35
-#: shell/evolution-shell-component.c:1141
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1160
 msgid "Success"
 msgstr "Suksess"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:309
 #: camel/providers/imap/camel-imap-command.c:406
-#: camel/providers/pop3/camel-pop3-store.c:518 shell/e-shell.c:2186
-#: shell/e-storage.c:601 shell/evolution-shell-component.c:1180
+#: camel/providers/pop3/camel-pop3-store.c:522 shell/e-shell.c:2104
+#: shell/e-storage.c:602 shell/evolution-shell-component.c:1199
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38 shell/e-storage.c:587
-#: shell/evolution-shell-component.c:1171
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:588
+#: shell/evolution-shell-component.c:1190
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Kort ikke funnet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Kort-ID eksisterer allerede"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
-#: calendar/gui/calendar-model.c:771 calendar/gui/calendar-model.c:1203
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:751 calendar/gui/calendar-model.c:1176
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:494 calendar/gui/print.c:2299
-#: camel/camel-service.c:739 camel/camel-service.c:779
+#: calendar/gui/e-calendar-table.c:469 calendar/gui/print.c:2319
+#: camel/camel-service.c:737 camel/camel-service.c:779
 #: camel/camel-service.c:847 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:436
-#: camel/providers/pop3/camel-pop3-store.c:513
+#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:516
 msgid "Cancelled"
 msgstr "Avbrutt"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr "TLS er ikke tilgjengelig"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 msgid "Addressbook does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:63
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 #: calendar/gui/dialogs/save-comp.c:50
 msgid "Do you want to save changes?"
 msgstr "Vil du lagre endringene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
+#: addressbook/gui/widgets/e-addressbook-util.c:77
+msgid "_Discard"
+msgstr "_Forkast"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Feil under tillegg av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:82
-#: addressbook/gui/widgets/e-addressbook-util.c:292
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Feil ved tillegg av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:91
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Feil ved fjerning av liste"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:101
-#: addressbook/gui/widgets/e-addressbook-util.c:250
-#: addressbook/gui/widgets/e-addressbook-view.c:1588
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Feil ved fjerning av kort"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:208
-msgid "Display Cards?"
-msgstr "Vis kort?"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:209
-msgid "Display Cards"
-msgstr "Vis kort"
-
-#: addressbook/gui/widgets/e-addressbook-util.c:213
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -2983,116 +3093,132 @@ msgstr ""
 "Åpning av %d kort vil medføre at %d nye vinduer vil\n"
 "vises på skjermen. Vil du virkelig vise alle disse kortene?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:348
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:350
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:353
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Flytt kort til"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:355
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopier kort til"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:363
+#: addressbook/gui/widgets/e-addressbook-util.c:517
+msgid "Multiple VCards"
+msgstr "Flere VCard"
+
+#: addressbook/gui/widgets/e-addressbook-util.c:525
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:194
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Type"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
+#: mail/importers/pine-importer.c:591
 msgid "Addressbook"
 msgstr "Adressebok"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:624
-#: addressbook/gui/widgets/e-addressbook-view.c:813
-#: addressbook/gui/widgets/e-addressbook-view.c:1790
+#: addressbook/gui/widgets/e-addressbook-view.c:674
+#: addressbook/gui/widgets/e-addressbook-view.c:884
+#: addressbook/gui/widgets/e-addressbook-view.c:1859
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Lagre som VCard"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:800
+#: addressbook/gui/widgets/e-addressbook-view.c:871
 msgid "New Contact..."
 msgstr "Ny kontakt..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:801
+#: addressbook/gui/widgets/e-addressbook-view.c:872
 msgid "New Contact List..."
 msgstr "Ny kontaktliste..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:804
+#: addressbook/gui/widgets/e-addressbook-view.c:875
 msgid "Go to Folder..."
 msgstr "Gå til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:805
+#: addressbook/gui/widgets/e-addressbook-view.c:876
 msgid "Import..."
 msgstr "Importer..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:807
+#: addressbook/gui/widgets/e-addressbook-view.c:878
 msgid "Search for Contacts..."
 msgstr "Søk etter kontakter..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:808
+#: addressbook/gui/widgets/e-addressbook-view.c:879
 msgid "Addressbook Sources..."
 msgstr "Adressebok-kilder..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:810
+#: addressbook/gui/widgets/e-addressbook-view.c:881
 msgid "Pilot Settings..."
 msgstr "Innstillinger for pilot..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:814
+#: addressbook/gui/widgets/e-addressbook-view.c:885
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Videresend kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:815
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 msgid "Send Message to Contact"
 msgstr "Send melding til kontakt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:816
+#: addressbook/gui/widgets/e-addressbook-view.c:887 calendar/gui/print.c:2454
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
 #: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Skriv ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:818
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 msgid "Print Envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:822
+#: addressbook/gui/widgets/e-addressbook-view.c:893
 msgid "Copy to folder..."
 msgstr "Kopier til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:823
+#: addressbook/gui/widgets/e-addressbook-view.c:894
 msgid "Move to folder..."
 msgstr "Flytt til mappe..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:826
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:827
+#: addressbook/gui/widgets/e-addressbook-view.c:898
 #: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopier"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:828
+#: addressbook/gui/widgets/e-addressbook-view.c:899
 #: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:829 filter/libfilter-i18n.h:11
-#: mail/mail-accounts.c:227 shell/e-shell-folder-commands.c:411
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-comp-editor.xml.h:4
-#: ui/evolution-contact-editor.xml.h:2
+#: addressbook/gui/widgets/e-addressbook-view.c:900 filter/libfilter-i18n.h:10
+#: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
 #: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Slett"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:833
-#: calendar/gui/e-day-view.c:3726 calendar/gui/e-week-view.c:3528
+#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: calendar/gui/e-day-view.c:3680 calendar/gui/e-week-view.c:3524
 msgid "Current View"
 msgstr "Aktiv visning"
 
@@ -3100,7 +3226,7 @@ msgstr "Aktiv visning"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:867
+#: addressbook/gui/widgets/e-addressbook-view.c:938
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3108,11 +3234,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:872
+#: addressbook/gui/widgets/e-addressbook-view.c:943
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1290
+#: addressbook/gui/widgets/e-addressbook-view.c:1339
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3180,20 +3306,55 @@ msgstr "Annen telefon"
 msgid "Primary Phone"
 msgstr "Primær telefon"
 
-#: addressbook/gui/widgets/e-minicard-control.c:185
+#: addressbook/gui/widgets/e-minicard-control.c:204
 #, c-format
 msgid "and %d other cards."
 msgstr "og %d andre kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:187
+#: addressbook/gui/widgets/e-minicard-control.c:206
 msgid "and one other card."
 msgstr "og et annet kort."
 
-#: addressbook/gui/widgets/e-minicard-control.c:316
+#: addressbook/gui/widgets/e-minicard-control.c:318
 msgid "Save in addressbook"
 msgstr "Lagre i adressebok"
 
-#: addressbook/gui/widgets/e-minicard-view.c:140
+#: addressbook/gui/widgets/e-minicard-label.c:102
+#: addressbook/gui/widgets/e-minicard.c:142
+msgid "Width"
+msgstr "Bredde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:109
+#: addressbook/gui/widgets/e-minicard.c:149
+msgid "Height"
+msgstr "Høyde"
+
+#: addressbook/gui/widgets/e-minicard-label.c:116
+#: addressbook/gui/widgets/e-minicard.c:157
+msgid "Has Focus"
+msgstr "Har fokus"
+
+#: addressbook/gui/widgets/e-minicard-label.c:123
+msgid "Field"
+msgstr "Felt"
+
+#: addressbook/gui/widgets/e-minicard-label.c:130
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#: addressbook/gui/widgets/e-minicard-label.c:137
+msgid "Text Model"
+msgstr "Tekstmodell"
+
+#: addressbook/gui/widgets/e-minicard-label.c:144
+msgid "Max field name length"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:125
+msgid "Column Width"
+msgstr "Kolonnebredde"
+
+#: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
 "\n"
@@ -3207,7 +3368,7 @@ msgstr ""
 "\n"
 "Dobbelklikk her for å opprette en ny kontakt."
 
-#: addressbook/gui/widgets/e-minicard-view.c:143
+#: addressbook/gui/widgets/e-minicard-view.c:144
 msgid ""
 "\n"
 "\n"
@@ -3217,21 +3378,37 @@ msgstr ""
 "\n"
 "Ingen oppføringer i denne visningen."
 
-#: addressbook/gui/widgets/gal-view-factory-minicard.c:26
+#: addressbook/gui/widgets/e-minicard-view.c:452
+msgid "Adapter"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard.c:165
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:172
+msgid "Has Cursor"
+msgstr "Har markør"
+
+#: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Kortvisning"
 
-#: addressbook/printing/e-contact-print-envelope.c:215
-#: addressbook/printing/e-contact-print-envelope.c:236
+#: addressbook/gui/widgets/gal-view-factory-treeview.c:25
+msgid "GTK Tree View"
+msgstr "GTK-trevisning"
+
+#: addressbook/printing/e-contact-print-envelope.c:216
+#: addressbook/printing/e-contact-print-envelope.c:237
 msgid "Print envelope"
 msgstr "Skriv ut konvolutt"
 
-#: addressbook/printing/e-contact-print.c:1115
+#: addressbook/printing/e-contact-print.c:1130
 msgid "Print cards"
 msgstr "Skriv ut kort"
 
-#: addressbook/printing/e-contact-print.c:1175
-#: addressbook/printing/e-contact-print.c:1197
+#: addressbook/printing/e-contact-print.c:1195
+#: addressbook/printing/e-contact-print.c:1217
 msgid "Print card"
 msgstr "Skriv ut kort"
 
@@ -3304,7 +3481,6 @@ msgid "Include:"
 msgstr "Inkluder:"
 
 #: addressbook/printing/e-contact-print.glade.h:18
-#: calendar/gui/tasks-control.c:634
 msgid "Landscape"
 msgstr "Landskap"
 
@@ -3324,17 +3500,16 @@ msgstr "Marger"
 msgid "Number of columns:"
 msgstr "Antall kolonner:"
 
-#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:81
+#: addressbook/printing/e-contact-print.glade.h:23 mail/mail-config.glade.h:82
 msgid "Options"
 msgstr "Alternativer"
 
 #: addressbook/printing/e-contact-print.glade.h:24
-#: calendar/gui/tasks-control.c:621
 msgid "Orientation"
 msgstr "Orientering"
 
 #: addressbook/printing/e-contact-print.glade.h:25
-#: my-evolution/Locations.h:1671
+#: my-evolution/Locations.h:1670
 msgid "Page"
 msgstr "Side"
 
@@ -3350,9 +3525,7 @@ msgstr "Papir"
 msgid "Paper source:"
 msgstr "Papirkilde:"
 
-#. Portrait
 #: addressbook/printing/e-contact-print.glade.h:29
-#: calendar/gui/tasks-control.c:627
 msgid "Portrait"
 msgstr "Portrett"
 
@@ -3412,128 +3585,241 @@ msgstr "Skri_fttype..."
 msgid "Untitled appointment"
 msgstr "Avtale uten navn"
 
-#: calendar/cal-util/cal-util.c:500 calendar/cal-util/cal-util.c:522
+#: calendar/cal-util/cal-recur.c:3985 calendar/gui/print.c:478
+msgid "1st"
+msgstr "1"
+
+#: calendar/cal-util/cal-recur.c:3986 calendar/gui/print.c:478
+msgid "2nd"
+msgstr "2"
+
+#: calendar/cal-util/cal-recur.c:3987 calendar/gui/print.c:478
+msgid "3rd"
+msgstr "3"
+
+#: calendar/cal-util/cal-recur.c:3988 calendar/gui/print.c:478
+msgid "4th"
+msgstr "4"
+
+#: calendar/cal-util/cal-recur.c:3989 calendar/gui/print.c:478
+msgid "5th"
+msgstr "5"
+
+#: calendar/cal-util/cal-recur.c:3990 calendar/gui/print.c:479
+msgid "6th"
+msgstr "6"
+
+#: calendar/cal-util/cal-recur.c:3991 calendar/gui/print.c:479
+msgid "7th"
+msgstr "7"
+
+#: calendar/cal-util/cal-recur.c:3992 calendar/gui/print.c:479
+msgid "8th"
+msgstr "8"
+
+#: calendar/cal-util/cal-recur.c:3993 calendar/gui/print.c:479
+msgid "9th"
+msgstr "9"
+
+#: calendar/cal-util/cal-recur.c:3994 calendar/gui/print.c:479
+msgid "10th"
+msgstr "10"
+
+#: calendar/cal-util/cal-recur.c:3995 calendar/gui/print.c:480
+msgid "11th"
+msgstr "11"
+
+#: calendar/cal-util/cal-recur.c:3996 calendar/gui/print.c:480
+msgid "12th"
+msgstr "12"
+
+#: calendar/cal-util/cal-recur.c:3997 calendar/gui/print.c:480
+msgid "13th"
+msgstr "13"
+
+#: calendar/cal-util/cal-recur.c:3998 calendar/gui/print.c:480
+msgid "14th"
+msgstr "14"
+
+#: calendar/cal-util/cal-recur.c:3999 calendar/gui/print.c:480
+msgid "15th"
+msgstr "15"
+
+#: calendar/cal-util/cal-recur.c:4000 calendar/gui/print.c:481
+msgid "16th"
+msgstr "16"
+
+#: calendar/cal-util/cal-recur.c:4001 calendar/gui/print.c:481
+msgid "17th"
+msgstr "17"
+
+#: calendar/cal-util/cal-recur.c:4002 calendar/gui/print.c:481
+msgid "18th"
+msgstr "18"
+
+#: calendar/cal-util/cal-recur.c:4003 calendar/gui/print.c:481
+msgid "19th"
+msgstr "19"
+
+#: calendar/cal-util/cal-recur.c:4004 calendar/gui/print.c:481
+msgid "20th"
+msgstr "20"
+
+#: calendar/cal-util/cal-recur.c:4005 calendar/gui/print.c:482
+msgid "21st"
+msgstr "21"
+
+#: calendar/cal-util/cal-recur.c:4006 calendar/gui/print.c:482
+msgid "22nd"
+msgstr "22"
+
+#: calendar/cal-util/cal-recur.c:4007 calendar/gui/print.c:482
+msgid "23rd"
+msgstr "23"
+
+#: calendar/cal-util/cal-recur.c:4008 calendar/gui/print.c:482
+msgid "24th"
+msgstr "24"
+
+#: calendar/cal-util/cal-recur.c:4009 calendar/gui/print.c:482
+msgid "25th"
+msgstr "25"
+
+#: calendar/cal-util/cal-recur.c:4010 calendar/gui/print.c:483
+msgid "26th"
+msgstr "26"
+
+#: calendar/cal-util/cal-recur.c:4011 calendar/gui/print.c:483
+msgid "27th"
+msgstr "27"
+
+#: calendar/cal-util/cal-recur.c:4012 calendar/gui/print.c:483
+msgid "28th"
+msgstr "28"
+
+#: calendar/cal-util/cal-recur.c:4013 calendar/gui/print.c:483
+msgid "29th"
+msgstr "29"
+
+#: calendar/cal-util/cal-recur.c:4014 calendar/gui/print.c:483
+msgid "30th"
+msgstr "30"
+
+#: calendar/cal-util/cal-recur.c:4015 calendar/gui/print.c:484
+msgid "31st"
+msgstr "31"
+
+#: calendar/cal-util/cal-util.c:523 calendar/cal-util/cal-util.c:545
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:418 mail/message-list.c:748
+#: calendar/gui/e-calendar-table.c:393 mail/message-list.c:752
 msgid "High"
 msgstr "Høy"
 
-#: calendar/cal-util/cal-util.c:502 calendar/cal-util/cal-util.c:524
-#: calendar/gui/calendar-model.c:1721
-#: calendar/gui/dialogs/task-details-page.glade.h:10
-#: calendar/gui/e-calendar-table.c:419 mail/message-list.c:747
+#: calendar/cal-util/cal-util.c:525 calendar/cal-util/cal-util.c:547
+#: calendar/gui/calendar-model.c:1701
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:394 mail/message-list.c:751
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/cal-util/cal-util.c:504 calendar/cal-util/cal-util.c:526
+#: calendar/cal-util/cal-util.c:527 calendar/cal-util/cal-util.c:549
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:420 mail/message-list.c:746
+#: calendar/gui/e-calendar-table.c:395 mail/message-list.c:750
 msgid "Low"
 msgstr "Lav"
 
 #. An empty string is the same as 'None'.
-#: calendar/cal-util/cal-util.c:520
-#: calendar/gui/dialogs/task-details-page.glade.h:14
-#: calendar/gui/e-calendar-table.c:421
+#: calendar/cal-util/cal-util.c:543
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:396
 msgid "Undefined"
 msgstr "Udefinert"
 
-#: calendar/conduits/calendar/calendar-conduit.c:205
+#: calendar/conduits/calendar/calendar-conduit.c:204
 msgid "Split Multi-Day Events:"
 msgstr "Del opp hendelser som går over flere dager:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1225
-#: calendar/conduits/todo/todo-conduit.c:835
+#: calendar/conduits/calendar/calendar-conduit.c:1219
+#: calendar/conduits/todo/todo-conduit.c:828
 msgid "Error while communicating with calendar server"
 msgstr "Feil under kommunikasjon med kalendertjeneren"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1372
-#: calendar/conduits/calendar/calendar-conduit.c:1375
+#: calendar/conduits/calendar/calendar-conduit.c:1370
+#: calendar/conduits/calendar/calendar-conduit.c:1373
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kunne ikke lese pilotens kalender-applikasjonsblokk"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:204
 msgid "Default Priority:"
 msgstr "Forvalgt prioritet:"
 
-#: calendar/conduits/todo/todo-conduit.c:951
-#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:952
+#: calendar/conduits/todo/todo-conduit.c:955
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke lese pilotens applikasjonsblokk for oppgaveliste"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:1
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 msgid "A Bonobo control which displays a task list."
 msgstr "En Bonobo-kontroll som viser en oppgaveliste."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 msgid "A sample Bonobo control which displays an calendar."
 msgstr "Eksempel på Bonobo-kontroll som viser en kalender."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Configuration control for the Evolution Calendar."
 msgstr "Konfigurasjonskontroll for Evolution kalender."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution calendar iTip/iMip viewer"
 msgstr "Evolution kalender iTip/iMip-visning"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution component for handling the calendar."
 msgstr "Evolution komponent for håndtering av kalenderen."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:8
-msgid "Factory for the Evolution Tasks control"
-msgstr "Factory for Evolution oppgavekontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:9
-msgid "Factory for the calendar iTip view control"
-msgstr "Factory for kalenderens iTip visningskontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:10
-msgid "Factory for the sample Calendar control"
-msgstr "Factory for eksempelkontroll for kalender"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Factory for the Evolution Calendar objects"
+msgstr "Factory for Evolutions sammendrag-komponent."
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:11
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Factory to centralize calendar component editor dialogs"
 msgstr "Factory for å sentralisere dialoger for kalender-komponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:12
-msgid "Factory to create a component editor factory"
-msgstr "Factory for å opprette en factory for komponentredigering"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:1
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Alarm notification service"
 msgstr "Alarm-tjeneste"
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:2
 msgid "Factory for the alarm notification service"
 msgstr "Factory for alarm-tjenesten"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Starting:"
 msgstr "Starter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:218
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:216
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:231
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:229
 msgid "invalid time"
 msgstr "ugyldig tid"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:276
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:274
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:371
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:369
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
@@ -3555,11 +3841,17 @@ msgstr "Utsett-tid (minutter)"
 msgid "_Edit appointment"
 msgstr "R_ediger avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:680
+#: calendar/gui/alarm-notify/alarm-queue.c:760
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:741
+#: calendar/gui/alarm-notify/alarm-queue.c:831
+#: calendar/gui/alarm-notify/alarm-queue.c:855
+#: calendar/gui/tasks-control.c:457 widgets/misc/e-messagebox.c:161
+msgid "Warning"
+msgstr "Advarsel"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:835
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3571,13 +3863,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:759
-#: calendar/gui/tasks-control.c:454 mail/mail-callbacks.c:2898
-#: widgets/misc/e-messagebox.c:159
-msgid "Warning"
-msgstr "Advarsel"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:764
+#: calendar/gui/alarm-notify/alarm-queue.c:861
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3594,15 +3880,15 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:778
+#: calendar/gui/alarm-notify/alarm-queue.c:875
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
-#: calendar/gui/alarm-notify/notify-main.c:169 calendar/gui/main.c:62
-msgid "Could not initialize GNOME"
-msgstr "Kunne ikke initiere GNOME"
+#: calendar/gui/alarm-notify/notify-main.c:173
+msgid "Could not initialize gnome-vfs"
+msgstr "Kunne ikke initiere gnome-vfs"
 
-#: calendar/gui/alarm-notify/notify-main.c:184
+#: calendar/gui/alarm-notify/notify-main.c:180
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
@@ -3618,36 +3904,36 @@ msgstr "Beskrivelse inneholder"
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:386 mail/mail-ops.c:1115
+#: calendar/gui/cal-search-bar.c:356 mail/mail-ops.c:1106
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/calendar-commands.c:405
+#: calendar/gui/calendar-commands.c:404
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:408 calendar/gui/e-day-view-top-item.c:288
-#: calendar/gui/e-day-view.c:1436 calendar/gui/e-week-view-main-item.c:333
+#: calendar/gui/calendar-commands.c:407 calendar/gui/e-day-view-top-item.c:266
+#: calendar/gui/e-day-view.c:1388 calendar/gui/e-week-view-main-item.c:312
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/calendar-commands.c:410 calendar/gui/calendar-commands.c:415
-#: calendar/gui/calendar-commands.c:417
+#: calendar/gui/calendar-commands.c:409 calendar/gui/calendar-commands.c:414
+#: calendar/gui/calendar-commands.c:416
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y"
 
-#: calendar/gui/calendar-commands.c:428 calendar/gui/calendar-commands.c:435
-#: calendar/gui/calendar-commands.c:441 calendar/gui/calendar-commands.c:443
+#: calendar/gui/calendar-commands.c:427 calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:440 calendar/gui/calendar-commands.c:442
 msgid "%d %B %Y"
 msgstr "%d %B %Y"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:433
-#: calendar/gui/e-week-view-main-item.c:341 calendar/gui/print.c:1491
+#: calendar/gui/calendar-commands.c:432
+#: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1513
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -3658,67 +3944,155 @@ msgstr ""
 "Kunne ikke opprette kalendervisning. Vennligst sjekk din ORBit og OAF "
 "konfigurasjon."
 
-#: calendar/gui/calendar-model.c:424 calendar/gui/calendar-model.c:983
-#: calendar/gui/e-calendar-table.c:397
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1341
+#: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1862
+#: my-evolution/my-evolution.glade.h:3 shell/e-local-storage.c:177
+#: shell/e-shortcuts.c:1085
+msgid "Calendar"
+msgstr "Kalender"
+
+#: calendar/gui/calendar-component.c:71
+msgid "Folder containing appointments and events"
+msgstr "Mappe som inneholder avtaler og hendelser"
+
+#: calendar/gui/calendar-component.c:75
+msgid "Public Calendar"
+msgstr "Offentlig kalender"
+
+#: calendar/gui/calendar-component.c:76
+msgid "Public folder containing appointments and events"
+msgstr "Offentlig mappe som inneholder avtaler og hendelser"
+
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:735
+#: calendar/gui/print.c:1799 calendar/gui/tasks-control.c:511
+#: calendar/importers/icalendar-importer.c:708
+#: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1864
+#: my-evolution/e-summary-tasks.c:326 my-evolution/e-summary-tasks.c:344
+#: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: calendar/gui/calendar-component.c:81
+msgid "Folder containing to-do items"
+msgstr "Mappe som inneholder oppgaver"
+
+#: calendar/gui/calendar-component.c:85
+msgid "Public Tasks"
+msgstr "Offentlige oppgaver"
+
+#: calendar/gui/calendar-component.c:86
+msgid "Public folder containing to-do items"
+msgstr "Offentlig mappe som inneholder oppgaver"
+
+#: calendar/gui/calendar-component.c:730
+msgid "New appointment"
+msgstr "Ny avtale"
+
+#: calendar/gui/calendar-component.c:730
+msgid "_Appointment"
+msgstr "A_vtale"
+
+#: calendar/gui/calendar-component.c:731
+msgid "Create a new appointment"
+msgstr "Opprett en ny avtale"
+
+#: calendar/gui/calendar-component.c:735
+msgid "New meeting"
+msgstr "Nytt møte"
+
+#: calendar/gui/calendar-component.c:735
+msgid "_Meeting"
+msgstr "Mø_te"
+
+#: calendar/gui/calendar-component.c:736
+msgid "Create a new meeting request"
+msgstr "Dette er en møteforespørsel"
+
+#: calendar/gui/calendar-component.c:740
+msgid "New task"
+msgstr "Ny oppgave"
+
+#: calendar/gui/calendar-component.c:740
+msgid "_Task"
+msgstr "_Oppgave"
+
+#: calendar/gui/calendar-component.c:741
+msgid "Create a new task"
+msgstr "Opprett en ny oppgave"
+
+#: calendar/gui/calendar-component.c:745
+msgid "New All Day Appointment"
+msgstr "Ny avtale for hele dagen"
+
+#: calendar/gui/calendar-component.c:745
+msgid "All _Day Appointment"
+msgstr "Avtale for hele _dagen"
+
+#: calendar/gui/calendar-component.c:746
+msgid "Create a new all-day appointment"
+msgstr "Opprett en ny avtale for hele dagen"
+
+#: calendar/gui/calendar-model.c:404 calendar/gui/calendar-model.c:956
+#: calendar/gui/e-calendar-table.c:372
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:427 calendar/gui/calendar-model.c:985
-#: calendar/gui/e-calendar-table.c:398
+#: calendar/gui/calendar-model.c:407 calendar/gui/calendar-model.c:958
+#: calendar/gui/e-calendar-table.c:373
 msgid "Confidential"
 msgstr "Konfidensiell"
 
-#: calendar/gui/calendar-model.c:430 calendar/gui/e-calendar-table.c:396
+#: calendar/gui/calendar-model.c:410 calendar/gui/e-calendar-table.c:371
 msgid "Public"
 msgstr "Offentlig"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:542
+#: calendar/gui/calendar-model.c:522
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "E"
 msgstr "Ø"
 
-#: calendar/gui/calendar-model.c:544
+#: calendar/gui/calendar-model.c:524
 msgid "W"
 msgstr "V"
 
-#: calendar/gui/calendar-model.c:609 calendar/gui/calendar-model.c:1153
-#: calendar/gui/e-calendar-table.c:470
+#: calendar/gui/calendar-model.c:589 calendar/gui/calendar-model.c:1126
+#: calendar/gui/e-calendar-table.c:445
 msgid "Free"
 msgstr "Ledig"
 
-#: calendar/gui/calendar-model.c:611 calendar/gui/e-calendar-table.c:471
-#: calendar/gui/e-meeting-time-sel.c:438
-#: shell/evolution-shell-component.c:1165
+#: calendar/gui/calendar-model.c:591 calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-meeting-time-sel.c:408
+#: shell/evolution-shell-component.c:1184
 msgid "Busy"
 msgstr "Opptatt"
 
-#: calendar/gui/calendar-model.c:762 calendar/gui/calendar-model.c:1197
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:491 calendar/gui/print.c:2290
+#: calendar/gui/calendar-model.c:742 calendar/gui/calendar-model.c:1170
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:466 calendar/gui/print.c:2310
 msgid "Not Started"
 msgstr "Ikke startet"
 
-#: calendar/gui/calendar-model.c:765 calendar/gui/calendar-model.c:1199
+#: calendar/gui/calendar-model.c:745 calendar/gui/calendar-model.c:1172
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:492 calendar/gui/print.c:2293
+#: calendar/gui/e-calendar-table.c:467 calendar/gui/print.c:2313
 msgid "In Progress"
 msgstr "Under arbeid"
 
-#: calendar/gui/calendar-model.c:768 calendar/gui/calendar-model.c:1201
+#: calendar/gui/calendar-model.c:748 calendar/gui/calendar-model.c:1174
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:493 calendar/gui/e-meeting-model.c:330
-#: calendar/gui/e-meeting-model.c:353 calendar/gui/print.c:2296
+#: calendar/gui/e-calendar-table.c:468 calendar/gui/e-meeting-model.c:304
+#: calendar/gui/e-meeting-model.c:327 calendar/gui/print.c:2316
 msgid "Completed"
 msgstr "Fullført"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1028
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -3729,331 +4103,149 @@ msgstr ""
 "45.436845,125.862501"
 
 #. An empty string is the same as 'None'.
-#: calendar/gui/calendar-model.c:1195 calendar/gui/dialogs/meeting-page.c:309
-#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1967
-#: mail/folder-browser.c:1718 mail/mail-account-gui.c:1230
-#: mail/mail-account-gui.c:1650 mail/mail-accounts.c:453
-#: mail/mail-accounts.c:462 mail/mail-config.glade.h:77
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:204
-#: widgets/misc/e-cell-date-edit.c:250 widgets/misc/e-dateedit.c:452
-#: widgets/misc/e-dateedit.c:1473 widgets/misc/e-dateedit.c:1588
+#: calendar/gui/calendar-model.c:1168 calendar/gui/dialogs/meeting-page.c:286
+#: calendar/gui/dialogs/meeting-page.glade.h:1 composer/e-msg-composer.c:1982
+#: mail/folder-browser.c:1730 mail/mail-account-gui.c:1254
+#: mail/mail-account-gui.c:1686 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:78
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:450
+#: widgets/misc/e-dateedit.c:1484 widgets/misc/e-dateedit.c:1599
 msgid "None"
 msgstr "Ingen"
 
-#: calendar/gui/calendar-model.c:1723
+#: calendar/gui/calendar-model.c:1703
 msgid "Recurring"
 msgstr "Gjeninntreffer"
 
-#: calendar/gui/calendar-model.c:1725
+#: calendar/gui/calendar-model.c:1705
 msgid "Assigned"
 msgstr "Tildelt"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:302
-#: calendar/gui/e-meeting-model.c:312 calendar/gui/e-meeting-model.c:568
-#: calendar/gui/e-meeting-model.c:862
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:276
+#: calendar/gui/e-meeting-model.c:286 calendar/gui/e-meeting-model.c:543
+#: calendar/gui/e-meeting-model.c:837
 msgid "Yes"
 msgstr "Ja"
 
-#: calendar/gui/calendar-model.c:1731 calendar/gui/e-meeting-model.c:314
-#: calendar/gui/e-meeting-model.c:863
+#: calendar/gui/calendar-model.c:1711 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:838
 msgid "No"
 msgstr "Nei"
 
-#: calendar/gui/calendar-view-factory.c:148
+#: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Dagvisning"
 
-#: calendar/gui/calendar-view-factory.c:151
+#: calendar/gui/calendar-view-factory.c:121
 msgid "Work Week View"
 msgstr "Arbeidsukevisning"
 
-#: calendar/gui/calendar-view-factory.c:154
+#: calendar/gui/calendar-view-factory.c:124
 msgid "Week View"
 msgstr "Ukevisning"
 
-#: calendar/gui/calendar-view-factory.c:157
+#: calendar/gui/calendar-view-factory.c:127
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/component-factory.c:71 calendar/gui/gnome-cal.c:1371
-#: importers/netscape-importer.c:1873 my-evolution/my-evolution.glade.h:3
-#: shell/e-local-storage.c:176 shell/e-shortcuts.c:1059
-msgid "Calendar"
-msgstr "Kalender"
-
-#: calendar/gui/component-factory.c:72
-msgid "Folder containing appointments and events"
-msgstr "Mappe som inneholder avtaler og hendelser"
-
-#: calendar/gui/component-factory.c:76
-msgid "Public Calendar"
-msgstr "Offentlig kalender"
-
-#: calendar/gui/component-factory.c:77
-msgid "Public folder containing appointments and events"
-msgstr "Offentlig mappe som inneholder avtaler og hendelser"
-
-#: calendar/gui/component-factory.c:81 calendar/gui/e-tasks.c:722
-#: calendar/gui/print.c:1777 calendar/gui/tasks-control.c:508
-#: calendar/importers/icalendar-importer.c:704
-#: importers/netscape-importer.c:1875 my-evolution/e-summary-tasks.c:327
-#: my-evolution/e-summary-tasks.c:345 shell/e-local-storage.c:182
-#: shell/e-shortcuts.c:1063
-msgid "Tasks"
-msgstr "Oppgaver"
-
-#: calendar/gui/component-factory.c:82
-msgid "Folder containing to-do items"
-msgstr "Mappe som inneholder oppgaver"
-
-#: calendar/gui/component-factory.c:86
-msgid "Public Tasks"
-msgstr "Offentlige oppgaver"
+#: calendar/gui/comp-editor-factory.c:456
+msgid "Error while opening the calendar"
+msgstr "Feil under åpning av kalenderen"
 
-#: calendar/gui/component-factory.c:87
-msgid "Public folder containing to-do items"
-msgstr "Offentlig mappe som inneholder oppgaver"
-
-#: calendar/gui/component-factory.c:750
-msgid "New appointment"
-msgstr "Ny avtale"
-
-#: calendar/gui/component-factory.c:750
-msgid "_Appointment"
-msgstr "A_vtale"
-
-#: calendar/gui/component-factory.c:751
-msgid "Create a new appointment"
-msgstr "Opprett en ny avtale"
-
-#: calendar/gui/component-factory.c:755
-msgid "New meeting"
-msgstr "Nytt møte"
-
-#: calendar/gui/component-factory.c:755
-msgid "_Meeting"
-msgstr "Mø_te"
-
-#: calendar/gui/component-factory.c:756
-msgid "Create a new meeting request"
-msgstr "Dette er en møteforespørsel"
-
-#: calendar/gui/component-factory.c:760
-msgid "New task"
-msgstr "Ny oppgave"
-
-#: calendar/gui/component-factory.c:760
-msgid "_Task"
-msgstr "_Oppgave"
-
-#: calendar/gui/component-factory.c:761
-msgid "Create a new task"
-msgstr "Opprett en ny oppgave"
-
-#: calendar/gui/component-factory.c:765
-msgid "New All Day Appointment"
-msgstr "Ny avtale for hele dagen"
-
-#: calendar/gui/component-factory.c:765
-msgid "All _Day Appointment"
-msgstr "Avtale for hele _dagen"
+#: calendar/gui/comp-editor-factory.c:467
+msgid "Method not supported when opening the calendar"
+msgstr ""
 
-#: calendar/gui/component-factory.c:766
-msgid "Create a new all-day appointment"
-msgstr "Opprett en ny avtale for hele dagen"
+#: calendar/gui/comp-editor-factory.c:473
+msgid "Permission denied to open the calendar"
+msgstr "Tilgang nektet ved åpning av kalender"
 
-#: calendar/gui/control-factory.c:123
+#: calendar/gui/control-factory.c:119
 #, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Kunne ikke åpne mappen i «%s»"
 
-#: calendar/gui/control-factory.c:167
+#: calendar/gui/control-factory.c:163
 msgid "The URI that the calendar will display"
 msgstr "URIen som kalenderen skal vise"
 
-#: calendar/gui/control-factory.c:174
+#: calendar/gui/control-factory.c:170
 msgid "The type of view to show"
 msgstr "Type visning som skal brukes"
 
-#: calendar/gui/dialogs/alarm-options.c:359
+#: calendar/gui/dialogs/alarm-options.c:473
 msgid "Audio Alarm Options"
 msgstr "Alternativer for lyd-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:368
+#: calendar/gui/dialogs/alarm-options.c:482
 msgid "Message Alarm Options"
 msgstr "Alternativer for meldingsalarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:377
-msgid "Mail Alarm Options"
+#: calendar/gui/dialogs/alarm-options.c:491
+#, fuzzy
+msgid "Email Alarm Options"
 msgstr "Alternativer for e-post-alarm"
 
-#: calendar/gui/dialogs/alarm-options.c:386
+#: calendar/gui/dialogs/alarm-options.c:500
 msgid "Program Alarm Options"
 msgstr "Alternativer for program-alarmer"
 
-#: calendar/gui/dialogs/alarm-options.c:395
+#: calendar/gui/dialogs/alarm-options.c:509
 msgid "Unknown Alarm Options"
 msgstr "Alternativer for ukjente alarmer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-options.glade.h:2
 msgid "Alarm Repeat"
 msgstr "Gjentagelse av alarm"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid ""
-"Evolution does not yet support email notification for reminders.  You will "
-"not be able to edit the options for this reminder."
-msgstr ""
-"Evolution støtter ikke e-postmelding for påminnelser ennå. Du vil ikke kunne "
-"redigere alternativene for denne påminnelsen."
-
 #: calendar/gui/dialogs/alarm-options.glade.h:3
 msgid "Message to Display"
 msgstr "Melding som skal vises"
 
 #: calendar/gui/dialogs/alarm-options.glade.h:4
+msgid "Message to Send"
+msgstr "Melding som skal sendes"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:5
 msgid "Play sound:"
 msgstr "Spill lyd:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:5
+#: calendar/gui/dialogs/alarm-options.glade.h:6
 msgid "Repeat the alarm"
 msgstr "Gjenta alarmen"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:6
+#: calendar/gui/dialogs/alarm-options.glade.h:7
 msgid "Run program:"
 msgstr "Kjør program:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:7
+#: calendar/gui/dialogs/alarm-options.glade.h:8
+msgid "Send To:"
+msgstr "Send til:"
+
+#: calendar/gui/dialogs/alarm-options.glade.h:9
 msgid "With these arguments:"
 msgstr "Med disse argumentene:"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:8 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:68
 #: filter/filter.glade.h:20
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
+#: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "extra times every"
 msgstr "ekstra ganger hver"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter-datespec.c:72
+#: calendar/gui/dialogs/alarm-options.glade.h:12 filter/filter-datespec.c:67
 #: filter/filter.glade.h:21
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 filter/filter-datespec.c:71
+#: calendar/gui/dialogs/alarm-options.glade.h:13 filter/filter-datespec.c:66
 #: filter/filter.glade.h:22
 msgid "minutes"
 msgstr "minutter"
 
-#: calendar/gui/dialogs/alarm-page.c:319
-#, c-format
-msgid "%d days"
-msgstr "%d dager"
-
-#: calendar/gui/dialogs/alarm-page.c:322
-msgid "1 day"
-msgstr "1 dag"
-
-#: calendar/gui/dialogs/alarm-page.c:327
-#, c-format
-msgid "%d weeks"
-msgstr "%d uker"
-
-#: calendar/gui/dialogs/alarm-page.c:330
-msgid "1 week"
-msgstr "1 uke"
-
-#: calendar/gui/dialogs/alarm-page.c:335
-#, c-format
-msgid "%d hours"
-msgstr "%d timer"
-
-#: calendar/gui/dialogs/alarm-page.c:338
-msgid "1 hour"
-msgstr "1 time"
-
-#: calendar/gui/dialogs/alarm-page.c:343
-#, c-format
-msgid "%d minutes"
-msgstr "%d minutter"
-
-#: calendar/gui/dialogs/alarm-page.c:346
-msgid "1 minute"
-msgstr "1 minutt"
-
-#: calendar/gui/dialogs/alarm-page.c:351
-#, c-format
-msgid "%d seconds"
-msgstr "%d sekunder"
-
-#: calendar/gui/dialogs/alarm-page.c:354
-msgid "1 second"
-msgstr "1 sekund"
-
-#: calendar/gui/dialogs/alarm-page.c:383
-#: calendar/gui/dialogs/alarm-page.glade.h:4
-msgid "Play a sound"
-msgstr "Spill en lyd"
-
-#: calendar/gui/dialogs/alarm-page.c:387
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-msgid "Display a message"
-msgstr "Vis en melding"
-
-#: calendar/gui/dialogs/alarm-page.c:391
-msgid "Send an email"
-msgstr "Send en melding"
-
-#: calendar/gui/dialogs/alarm-page.c:395
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Run a program"
-msgstr "Kjør et program"
-
-#: calendar/gui/dialogs/alarm-page.c:401
-msgid "Unknown action to be performed"
-msgstr "Ukjent handling som skal utføres"
-
-#: calendar/gui/dialogs/alarm-page.c:413
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s før avtalen starter"
-
-#: calendar/gui/dialogs/alarm-page.c:416
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s etter avtalen har startet"
-
-#: calendar/gui/dialogs/alarm-page.c:421
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s ved avtalens start"
-
-#: calendar/gui/dialogs/alarm-page.c:430
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s før avtalen slutter"
-
-#: calendar/gui/dialogs/alarm-page.c:433
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s etter avtalens slutt"
-
-#: calendar/gui/dialogs/alarm-page.c:438
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s ved avtalens slutt"
-
-#: calendar/gui/dialogs/alarm-page.c:462
-#, c-format
-msgid "%s at %s"
-msgstr "%s ved %s"
-
-#: calendar/gui/dialogs/alarm-page.c:468
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s for en ukjent utløsertype"
-
 #: calendar/gui/dialogs/alarm-page.glade.h:1
 #: calendar/gui/dialogs/recurrence-page.glade.h:2
 msgid "Basics"
@@ -4064,46 +4256,62 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
+msgid "Display a message"
+msgstr "Vis en melding"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
+msgid "Play a sound"
+msgstr "Spill en lyd"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:5
 msgid "Reminders"
 msgstr "Påminnelser"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
+msgid "Run a program"
+msgstr "Kjør et program"
+
 #: calendar/gui/dialogs/alarm-page.glade.h:7
+msgid "Send an Email"
+msgstr "Send en melding"
+
+#: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:834 calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:1050 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Sammendrag:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
+#: calendar/gui/dialogs/alarm-page.glade.h:11
 msgid "_Options..."
 msgstr "Alte_rnativer..."
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-page.glade.h:12
 msgid "after"
 msgstr "etter"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-page.glade.h:13
 msgid "before"
 msgstr "før"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
+#: calendar/gui/dialogs/alarm-page.glade.h:14
 #: calendar/gui/dialogs/recurrence-page.glade.h:14
 msgid "day(s)"
 msgstr "dag(er)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-page.glade.h:15
 msgid "end of appointment"
 msgstr "slutt på avtale"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-page.glade.h:16
 msgid "hour(s)"
 msgstr "time(r)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16 mail/mail-config.glade.h:180
+#: calendar/gui/dialogs/alarm-page.glade.h:17 mail/mail-config.glade.h:180
 msgid "minute(s)"
 msgstr "minutt(er)"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-page.glade.h:18
 msgid "start of appointment"
 msgstr "start på avtale"
 
@@ -4127,7 +4335,7 @@ msgstr "30 minutter"
 msgid "60 minutes"
 msgstr "60 minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6 mail/mail-config.glade.h:14
 msgid "Alerts"
 msgstr "Advarsler"
 
@@ -4152,7 +4360,8 @@ msgid "Days"
 msgstr "Dager"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/recurrence-page.c:1135
+#: calendar/gui/dialogs/recurrence-page.c:1037
+#: calendar/gui/e-itip-control.c:675
 msgid "Friday"
 msgstr "Fredag"
 
@@ -4165,7 +4374,8 @@ msgid "Minutes"
 msgstr "Minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/recurrence-page.c:1131
+#: calendar/gui/dialogs/recurrence-page.c:1033
+#: calendar/gui/e-itip-control.c:671
 msgid "Monday"
 msgstr "Mandag"
 
@@ -4174,7 +4384,8 @@ msgid "S_un"
 msgstr "S_ø."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/dialogs/recurrence-page.c:1136
+#: calendar/gui/dialogs/recurrence-page.c:1038
+#: calendar/gui/e-itip-control.c:676
 msgid "Saturday"
 msgstr "Lørdag"
 
@@ -4187,7 +4398,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "Vis uke_nummer i datonavigasjon"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/recurrence-page.c:1137
+#: calendar/gui/dialogs/recurrence-page.c:1039
+#: calendar/gui/e-itip-control.c:670
 msgid "Sunday"
 msgstr "Søndag"
 
@@ -4204,7 +4416,8 @@ msgid "Task List"
 msgstr "Oppgaveliste"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/recurrence-page.c:1134
+#: calendar/gui/dialogs/recurrence-page.c:1036
+#: calendar/gui/e-itip-control.c:674
 msgid "Thursday"
 msgstr "Torsdag"
 
@@ -4221,7 +4434,8 @@ msgid "Time format:"
 msgstr "Tidformat:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1132
+#: calendar/gui/dialogs/recurrence-page.c:1034
+#: calendar/gui/e-itip-control.c:672
 msgid "Tuesday"
 msgstr "Tirsdag"
 
@@ -4230,7 +4444,8 @@ msgid "W_eek starts:"
 msgstr "Uk_en starter:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/recurrence-page.c:1133
+#: calendar/gui/dialogs/recurrence-page.c:1035
+#: calendar/gui/e-itip-control.c:673
 msgid "Wednesday"
 msgstr "Onsdag"
 
@@ -4312,18 +4527,18 @@ msgstr "_On."
 msgid "before every appointment"
 msgstr "før hver avtale"
 
-#: calendar/gui/dialogs/cancel-comp.c:56
+#: calendar/gui/dialogs/cancel-comp.c:58
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
 "notice?"
 msgstr ""
 "Hendelsen som slettes er et møte. Ønsker du å sende melding om kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:59
+#: calendar/gui/dialogs/cancel-comp.c:61
 msgid "Are you sure you want to cancel and delete this meeting?"
 msgstr "Er du sikker på at du vil avlyse og slette dette møtet?"
 
-#: calendar/gui/dialogs/cancel-comp.c:65
+#: calendar/gui/dialogs/cancel-comp.c:67
 msgid ""
 "The task being deleted is assigned, would you like to send a cancellation "
 "notice?"
@@ -4331,11 +4546,11 @@ msgstr ""
 "Oppgaven som slettes er tildelt. Ønsker du å sende en melding om "
 "kansellering?"
 
-#: calendar/gui/dialogs/cancel-comp.c:68
+#: calendar/gui/dialogs/cancel-comp.c:70
 msgid "Are you sure you want to cancel and delete this task?"
 msgstr "Er du sikker på at du vil avlyse og slette denne oppgaven?"
 
-#: calendar/gui/dialogs/cancel-comp.c:74
+#: calendar/gui/dialogs/cancel-comp.c:76
 msgid ""
 "The journal entry being deleted is published, would you like to send a "
 "cancellation notice?"
@@ -4343,131 +4558,136 @@ msgstr ""
 "Journaloppføringen som slettes er publisert. Vil du sende en melding om "
 "avlysing?"
 
-#: calendar/gui/dialogs/cancel-comp.c:77
+#: calendar/gui/dialogs/cancel-comp.c:79
 msgid "Are you sure you want to cancel and delete this journal entry?"
 msgstr "Er du sikker på at du vil avlyse og slette denne journaloppføringen?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Denne hendelsen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Denne oppgaven er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Denne journaloppføringen er slettet."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, 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:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, 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:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Denne hendelsen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Denne oppgaven er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Denne journaloppføringen er endret."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, 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:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, 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-util.c:188 calendar/gui/print.c:2208
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfeil: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2226
 msgid " to "
 msgstr " til "
 
-#: calendar/gui/dialogs/comp-editor-util.c:192 calendar/gui/print.c:2212
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2230
 msgid " (Completed "
 msgstr " (Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:194 calendar/gui/print.c:2214
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2232
 msgid "Completed "
 msgstr "Fullført "
 
-#: calendar/gui/dialogs/comp-editor-util.c:199 calendar/gui/print.c:2219
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2237
 msgid " (Due "
 msgstr " (Ferdig "
 
-#: calendar/gui/dialogs/comp-editor-util.c:201 calendar/gui/print.c:2221
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2239
 msgid "Due "
 msgstr "Ferdig "
 
-#: calendar/gui/dialogs/comp-editor.c:343
+#: calendar/gui/dialogs/comp-editor.c:329
 msgid "Could not update invalid object"
 msgstr "Kunne ikke oppdatere ugyldig objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:346
+#: calendar/gui/dialogs/comp-editor.c:332
 msgid "Object not found, not updated"
 msgstr "Objekt ikke funnet, ikke oppdatert"
 
-#: calendar/gui/dialogs/comp-editor.c:349
+#: calendar/gui/dialogs/comp-editor.c:335
 msgid "You don't have permissions to update this object"
 msgstr "Du har ikke rettigheter til å oppdatere dette objektet"
 
-#: calendar/gui/dialogs/comp-editor.c:352
+#: calendar/gui/dialogs/comp-editor.c:338
 msgid "Could not update object"
 msgstr "Kunne ikke oppdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:798
+#: calendar/gui/dialogs/comp-editor.c:788
 msgid "Edit Appointment"
 msgstr "Rediger avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:803
+#: calendar/gui/dialogs/comp-editor.c:793
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:806
+#: calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:809
+#: calendar/gui/dialogs/comp-editor.c:799
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:823
+#: calendar/gui/dialogs/comp-editor.c:810
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1221
-#: calendar/gui/e-calendar-table.c:1073 calendar/gui/e-day-view.c:3982
-#: calendar/gui/e-week-view.c:3762 composer/e-msg-composer.c:1151
+#: calendar/gui/dialogs/comp-editor.c:1231
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-day-view.c:3938
+#: calendar/gui/e-week-view.c:3760 composer/e-msg-composer.c:1159
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1322
-#: calendar/gui/dialogs/comp-editor.c:1346
-#: calendar/gui/dialogs/comp-editor.c:1370
-msgid ""
-"Changes made to this item may be discarded if an update arrives via email"
+#: calendar/gui/dialogs/comp-editor.c:1332
+#: calendar/gui/dialogs/comp-editor.c:1356
+#: calendar/gui/dialogs/comp-editor.c:1380
+#, fuzzy
+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 en "
 "oppdatering kommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1397
+#: calendar/gui/dialogs/comp-editor.c:1407
 msgid "Unable to obtain current version!"
 msgstr "Kan ikke hente versjonsdata!"
 
@@ -4525,108 +4745,124 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:217 calendar/gui/print.c:2247
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2265
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:232
-#: calendar/gui/dialogs/event-editor.c:299
-#: calendar/gui/dialogs/event-editor.c:433
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:432
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:237
-#: calendar/gui/dialogs/event-editor.c:302
-#: calendar/gui/dialogs/event-editor.c:436 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:435 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Møte"
 
-#: calendar/gui/dialogs/event-page.glade.h:1
+#: calendar/gui/dialogs/event-page.c:654 calendar/gui/dialogs/task-page.c:554
+msgid "Start date is wrong"
+msgstr "Startdato er feil"
+
+#: calendar/gui/dialogs/event-page.c:664
+msgid "End date is wrong"
+msgstr "Sluttdato er feil"
+
+#: calendar/gui/dialogs/event-page.c:687
+msgid "Start time is wrong"
+msgstr "Tid for start er feil"
+
+#: calendar/gui/dialogs/event-page.c:694
+msgid "End time is wrong"
+msgstr "Tid for slutt er feil"
+
+#: calendar/gui/dialogs/event-page.glade.h:2
 msgid "A_ll day event"
 msgstr "Varer hele _dagen"
 
-#: calendar/gui/dialogs/event-page.glade.h:2
+#: calendar/gui/dialogs/event-page.glade.h:3
 msgid "B_usy"
 msgstr "_Opptatt"
 
-#: calendar/gui/dialogs/event-page.glade.h:4
+#: calendar/gui/dialogs/event-page.glade.h:5
 #: calendar/gui/dialogs/task-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:5
 msgid "Classification"
 msgstr "Klassifisering"
 
-#: calendar/gui/dialogs/event-page.glade.h:5
+#: calendar/gui/dialogs/event-page.glade.h:6
 #: calendar/gui/dialogs/task-page.glade.h:3
 msgid "Con_fidential"
 msgstr "Ko_nfidensiell"
 
-#: calendar/gui/dialogs/event-page.glade.h:6
+#: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:4
 msgid "Date & Time"
 msgstr "Dato & klokke"
 
-#: calendar/gui/dialogs/event-page.glade.h:7
+#: calendar/gui/dialogs/event-page.glade.h:8
 msgid "F_ree"
 msgstr "L_edig"
 
-#: calendar/gui/dialogs/event-page.glade.h:8
+#: calendar/gui/dialogs/event-page.glade.h:9
 msgid "L_ocation:"
 msgstr "_Plassering:"
 
-#: calendar/gui/dialogs/event-page.glade.h:9
+#: calendar/gui/dialogs/event-page.glade.h:10
 #: calendar/gui/dialogs/task-page.glade.h:6
 msgid "Pri_vate"
 msgstr "Pri_vat"
 
-#: calendar/gui/dialogs/event-page.glade.h:10
+#: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:7
 msgid "Pu_blic"
 msgstr "Offen_tlig"
 
-#: calendar/gui/dialogs/event-page.glade.h:11
+#: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Vis tid som"
 
-#: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/dialogs/event-page.glade.h:13
 #: calendar/gui/dialogs/task-page.glade.h:9
 msgid "Su_mmary:"
 msgstr "Sa_mmendrag:"
 
-#: calendar/gui/dialogs/event-page.glade.h:13
+#: calendar/gui/dialogs/event-page.glade.h:14
 #: calendar/gui/dialogs/task-page.glade.h:10
 msgid "_Contacts..."
 msgstr "_Kontakter..."
 
-#: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/event-page.glade.h:15
 msgid "_End time:"
 msgstr "S_lutt-tid:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:16
 msgid "_Start time:"
 msgstr "_Start-tid:"
 
-#: calendar/gui/dialogs/meeting-page.c:414
+#: calendar/gui/dialogs/meeting-page.c:400
 msgid "An organizer is required."
 msgstr "En organisator kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:438
+#: calendar/gui/dialogs/meeting-page.c:424
 msgid "At least one attendee is required."
 msgstr "Minst en deltaker kreves."
 
-#: calendar/gui/dialogs/meeting-page.c:594
+#: calendar/gui/dialogs/meeting-page.c:579
 msgid "That person is already attending the meeting!"
 msgstr "Denne personen er allerede satt opp for dette møtet!"
 
-#: calendar/gui/dialogs/meeting-page.c:669
+#: calendar/gui/dialogs/meeting-page.c:652
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
@@ -4666,30 +4902,18 @@ msgid "Member"
 msgstr "Medlem"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:958
+#: calendar/gui/e-itip-control.c:1176
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Rolle"
-
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
 #: calendar/gui/e-calendar-table.etspec.h:15
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Status"
 
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:18
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-#: shell/glade/e-active-connection-dialog.glade.h:5
-msgid "Type"
-msgstr "Type"
-
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4700,99 +4924,56 @@ msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-meeting-time-sel.c:456
+#: calendar/gui/e-meeting-time-sel.c:426
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
-#: calendar/gui/dialogs/recurrence-page.c:126
-#: calendar/gui/dialogs/recurrence-page.c:146
-#: calendar/gui/dialogs/recurrence-page.c:156
-msgid "st"
-msgstr "ste"
-
-#: calendar/gui/dialogs/recurrence-page.c:127
-#: calendar/gui/dialogs/recurrence-page.c:147
-msgid "nd"
-msgstr "ndre"
-
-#: calendar/gui/dialogs/recurrence-page.c:128
-#: calendar/gui/dialogs/recurrence-page.c:148
-msgid "rd"
-msgstr "dje"
-
-#: calendar/gui/dialogs/recurrence-page.c:129
-#: calendar/gui/dialogs/recurrence-page.c:130
-#: calendar/gui/dialogs/recurrence-page.c:131
-#: calendar/gui/dialogs/recurrence-page.c:132
-#: calendar/gui/dialogs/recurrence-page.c:133
-#: calendar/gui/dialogs/recurrence-page.c:134
-#: calendar/gui/dialogs/recurrence-page.c:135
-#: calendar/gui/dialogs/recurrence-page.c:136
-#: calendar/gui/dialogs/recurrence-page.c:137
-#: calendar/gui/dialogs/recurrence-page.c:138
-#: calendar/gui/dialogs/recurrence-page.c:139
-#: calendar/gui/dialogs/recurrence-page.c:140
-#: calendar/gui/dialogs/recurrence-page.c:141
-#: calendar/gui/dialogs/recurrence-page.c:142
-#: calendar/gui/dialogs/recurrence-page.c:143
-#: calendar/gui/dialogs/recurrence-page.c:144
-#: calendar/gui/dialogs/recurrence-page.c:145
-#: calendar/gui/dialogs/recurrence-page.c:149
-#: calendar/gui/dialogs/recurrence-page.c:150
-#: calendar/gui/dialogs/recurrence-page.c:151
-#: calendar/gui/dialogs/recurrence-page.c:152
-#: calendar/gui/dialogs/recurrence-page.c:153
-#: calendar/gui/dialogs/recurrence-page.c:154
-#: calendar/gui/dialogs/recurrence-page.c:155
-msgid "th"
-msgstr "de"
-
-#: calendar/gui/dialogs/recurrence-page.c:629
+#: calendar/gui/dialogs/recurrence-page.c:532
 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:898
-msgid "Recurrent date is wrong"
-msgstr "Gjenintreffende dato er feil"
+#: calendar/gui/dialogs/recurrence-page.c:806
+msgid "Recurrence date is invalid"
+msgstr "Gjenintreffingsdato er ugyldig"
 
-#: calendar/gui/dialogs/recurrence-page.c:1007
+#: calendar/gui/dialogs/recurrence-page.c:916
 msgid "on"
 msgstr "på"
 
-#: calendar/gui/dialogs/recurrence-page.c:1072
+#: calendar/gui/dialogs/recurrence-page.c:977
 msgid "first"
 msgstr "første"
 
-#: calendar/gui/dialogs/recurrence-page.c:1073 filter/filter-datespec.c:70
+#: calendar/gui/dialogs/recurrence-page.c:978 filter/filter-datespec.c:65
 msgid "second"
 msgstr "sekund"
 
-#: calendar/gui/dialogs/recurrence-page.c:1074
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "third"
 msgstr "tredje"
 
-#: calendar/gui/dialogs/recurrence-page.c:1075
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "fourth"
 msgstr "fjerde"
 
-#: calendar/gui/dialogs/recurrence-page.c:1076
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "last"
 msgstr "siste"
 
-#: calendar/gui/dialogs/recurrence-page.c:1102
+#: calendar/gui/dialogs/recurrence-page.c:1004
 msgid "Other Date"
 msgstr "Annen dato"
 
-#: calendar/gui/dialogs/recurrence-page.c:1130 filter/filter-datespec.c:73
+#: calendar/gui/dialogs/recurrence-page.c:1032 filter/filter-datespec.c:68
 msgid "day"
 msgstr "dag"
 
-#: calendar/gui/dialogs/recurrence-page.c:1270
+#: calendar/gui/dialogs/recurrence-page.c:1169
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/dialogs/recurrence-page.c:1455
+#: calendar/gui/dialogs/recurrence-page.c:1354
 msgid "occurrences"
 msgstr "gjentakelser"
 
@@ -4856,22 +5037,26 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "år"
 
-#: calendar/gui/dialogs/send-comp.c:56
+#: calendar/gui/dialogs/send-comp.c:58
 msgid "The meeting information has been created. Send it?"
 msgstr "Møteinformasjonen er opprettet. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:59
+#: calendar/gui/dialogs/send-comp.c:61
 msgid "The meeting information has changed. Send an updated version?"
 msgstr "Møteinformasjonen er endret. Send en oppdatert versjon?"
 
-#: calendar/gui/dialogs/send-comp.c:66
+#: calendar/gui/dialogs/send-comp.c:68
 msgid "The task assignment information has been created. Send it?"
 msgstr "Informasjon om oppgavetildeling er opprettet. Send den?"
 
-#: calendar/gui/dialogs/send-comp.c:70
+#: calendar/gui/dialogs/send-comp.c:72
 msgid "The task information has changed. Send an updated version?"
 msgstr "Oppgaveinformasjonen er endret. Send en oppdatert versjon?"
 
+#: calendar/gui/dialogs/task-details-page.c:397
+msgid "Completed date is wrong"
+msgstr "Dato for ferdigstilling er feil"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
 #: calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
@@ -4882,42 +5067,41 @@ msgstr "% ferdig"
 msgid "Date Completed:"
 msgstr "Fullført dato:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-meeting-model.c:320 calendar/gui/e-meeting-model.c:343
-#: calendar/gui/e-meeting-model.c:574 calendar/gui/e-meeting-model.c:875
-msgid "Needs Action"
-msgstr "Trenger handling"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
-#: my-evolution/e-summary-preferences.c:860
+#: calendar/gui/dialogs/task-details-page.glade.h:12
+#: my-evolution/e-summary-preferences.c:633
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Prioritet:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:16
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Status:"
 
-#: calendar/gui/dialogs/task-editor.c:206
+#: calendar/gui/dialogs/task-editor.c:189
 msgid "Basic"
 msgstr "Grunnleggende"
 
-#: calendar/gui/dialogs/task-editor.c:216
-#: calendar/gui/dialogs/task-editor.c:261
-#: calendar/gui/dialogs/task-editor.c:386
+#: calendar/gui/dialogs/task-editor.c:203
+#: calendar/gui/dialogs/task-editor.c:251
+#: calendar/gui/dialogs/task-editor.c:385
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:888
+#: calendar/gui/dialogs/task-page.c:527
+#, fuzzy
+msgid "Due date is wrong"
+msgstr "Gjenintreffende dato er feil"
+
+#: calendar/gui/dialogs/task-page.glade.h:5 calendar/gui/e-itip-control.c:1104
 #: calendar/gui/e-itip-control.glade.h:6
-#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:42
+#: composer/e-msg-composer-attachment.glade.h:2 mail/mail-config.glade.h:44
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -4929,131 +5113,224 @@ msgstr "Sta_rt dato:"
 msgid "_Due Date:"
 msgstr "Fer_dig-dato:"
 
-#: calendar/gui/e-calendar-table.c:440
+#: calendar/gui/e-alarm-list.c:393
+#, c-format
+msgid "%d days"
+msgstr "%d dager"
+
+#: calendar/gui/e-alarm-list.c:396
+msgid "1 day"
+msgstr "1 dag"
+
+#: calendar/gui/e-alarm-list.c:401
+#, c-format
+msgid "%d weeks"
+msgstr "%d uker"
+
+#: calendar/gui/e-alarm-list.c:404
+msgid "1 week"
+msgstr "1 uke"
+
+#: calendar/gui/e-alarm-list.c:409
+#, c-format
+msgid "%d hours"
+msgstr "%d timer"
+
+#: calendar/gui/e-alarm-list.c:412
+msgid "1 hour"
+msgstr "1 time"
+
+#: calendar/gui/e-alarm-list.c:417
+#, c-format
+msgid "%d minutes"
+msgstr "%d minutter"
+
+#: calendar/gui/e-alarm-list.c:420
+msgid "1 minute"
+msgstr "1 minutt"
+
+#: calendar/gui/e-alarm-list.c:425
+#, c-format
+msgid "%d seconds"
+msgstr "%d sekunder"
+
+#: calendar/gui/e-alarm-list.c:428
+msgid "1 second"
+msgstr "1 sekund"
+
+#: calendar/gui/e-alarm-list.c:465
+msgid "Send an email"
+msgstr "Send en melding"
+
+#: calendar/gui/e-alarm-list.c:475
+msgid "Unknown action to be performed"
+msgstr "Ukjent handling som skal utføres"
+
+#: calendar/gui/e-alarm-list.c:487
+#, c-format
+msgid "%s %s before the start of the appointment"
+msgstr "%s %s før avtalen starter"
+
+#: calendar/gui/e-alarm-list.c:490
+#, c-format
+msgid "%s %s after the start of the appointment"
+msgstr "%s %s etter avtalen har startet"
+
+#: calendar/gui/e-alarm-list.c:495
+#, c-format
+msgid "%s at the start of the appointment"
+msgstr "%s ved avtalens start"
+
+#: calendar/gui/e-alarm-list.c:504
+#, c-format
+msgid "%s %s before the end of the appointment"
+msgstr "%s %s før avtalen slutter"
+
+#: calendar/gui/e-alarm-list.c:507
+#, c-format
+msgid "%s %s after the end of the appointment"
+msgstr "%s %s etter avtalens slutt"
+
+#: calendar/gui/e-alarm-list.c:512
+#, c-format
+msgid "%s at the end of the appointment"
+msgstr "%s ved avtalens slutt"
+
+#: calendar/gui/e-alarm-list.c:536
+#, c-format
+msgid "%s at %s"
+msgstr "%s ved %s"
+
+#: calendar/gui/e-alarm-list.c:542
+#, c-format
+msgid "%s for an unknown trigger type"
+msgstr "%s for en ukjent utløsertype"
+
+#: calendar/gui/e-calendar-table.c:415
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: calendar/gui/e-calendar-table.c:441
+#: calendar/gui/e-calendar-table.c:416
 #, c-format
 msgid "10%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:442
+#: calendar/gui/e-calendar-table.c:417
 #, c-format
 msgid "20%"
 msgstr "20%"
 
-#: calendar/gui/e-calendar-table.c:443
+#: calendar/gui/e-calendar-table.c:418
 #, c-format
 msgid "30%"
 msgstr "30%"
 
-#: calendar/gui/e-calendar-table.c:444
+#: calendar/gui/e-calendar-table.c:419
 #, c-format
 msgid "40%"
 msgstr "40%"
 
-#: calendar/gui/e-calendar-table.c:445
+#: calendar/gui/e-calendar-table.c:420
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: calendar/gui/e-calendar-table.c:446
+#: calendar/gui/e-calendar-table.c:421
 #, c-format
 msgid "60%"
 msgstr "60%"
 
-#: calendar/gui/e-calendar-table.c:447
+#: calendar/gui/e-calendar-table.c:422
 #, c-format
 msgid "70%"
 msgstr "70%"
 
-#: calendar/gui/e-calendar-table.c:448
+#: calendar/gui/e-calendar-table.c:423
 #, c-format
 msgid "80%"
 msgstr "80%"
 
-#: calendar/gui/e-calendar-table.c:449
+#: calendar/gui/e-calendar-table.c:424
 #, c-format
 msgid "90%"
 msgstr "90%"
 
-#: calendar/gui/e-calendar-table.c:450
+#: calendar/gui/e-calendar-table.c:425
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:753 calendar/gui/e-day-view.c:2865
-#: calendar/gui/e-week-view.c:1917
+#: calendar/gui/e-calendar-table.c:715 calendar/gui/e-day-view.c:2825
+#: calendar/gui/e-week-view.c:1900
 msgid "Deleting selected objects"
 msgstr "Sletter valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:987 calendar/gui/e-day-view.c:3748
-#: calendar/gui/e-week-view.c:3545 mail/folder-browser.c:1729
-#: shell/e-shortcuts-view.c:408 ui/evolution-addressbook.xml.h:36
+#: calendar/gui/e-calendar-table.c:950 calendar/gui/e-day-view.c:3702
+#: calendar/gui/e-week-view.c:3541 mail/folder-browser.c:1741
+#: shell/e-shortcuts-view.c:415 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Åpne"
 
-#: calendar/gui/e-calendar-table.c:988
+#: calendar/gui/e-calendar-table.c:951
 msgid "_Save as..."
 msgstr "_Lagre som..."
 
-#: calendar/gui/e-calendar-table.c:989 calendar/gui/e-day-view.c:3750
-#: calendar/gui/e-week-view.c:3520 calendar/gui/e-week-view.c:3547
+#: calendar/gui/e-calendar-table.c:952 calendar/gui/e-day-view.c:3704
+#: calendar/gui/e-week-view.c:3516 calendar/gui/e-week-view.c:3543
 #: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:30
 #: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
 #: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "S_kriv ut..."
 
-#: calendar/gui/e-calendar-table.c:993 calendar/gui/e-day-view.c:3755
-#: calendar/gui/e-week-view.c:3552 ui/evolution-addressbook.xml.h:1
+#: calendar/gui/e-calendar-table.c:956 calendar/gui/e-day-view.c:3709
+#: calendar/gui/e-week-view.c:3548 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:994 calendar/gui/e-day-view.c:3756
-#: calendar/gui/e-week-view.c:3553 ui/evolution-addressbook.xml.h:30
+#: calendar/gui/e-calendar-table.c:957 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-week-view.c:3549 ui/evolution-addressbook.xml.h:30
 #: ui/evolution-calendar.xml.h:26 ui/evolution-mail-list.xml.h:24
 #: ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-day-view.c:3721
-#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3524
-#: calendar/gui/e-week-view.c:3554 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3675
+#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3520
+#: calendar/gui/e-week-view.c:3550 ui/evolution-addressbook.xml.h:37
 #: ui/evolution-calendar.xml.h:29 ui/evolution-mail-list.xml.h:29
 #: ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Lim inn"
 
-#: calendar/gui/e-calendar-table.c:999
+#: calendar/gui/e-calendar-table.c:962
 msgid "_Assign Task"
 msgstr "Tildel oppg_ave"
 
-#: calendar/gui/e-calendar-table.c:1000
+#: calendar/gui/e-calendar-table.c:963
 msgid "_Forward as iCalendar"
 msgstr "_Videresend som iCalendar"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:964
 msgid "_Mark as Complete"
 msgstr "_Merk som fullført"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:965
 msgid "_Mark Selected Tasks as Complete"
 msgstr "_Merk valgte oppgaver som fullført"
 
-#: calendar/gui/e-calendar-table.c:1007
+#: calendar/gui/e-calendar-table.c:970
 msgid "_Delete Selected Tasks"
 msgstr "Sle_tt valgte oppgaver"
 
-#: calendar/gui/e-calendar-table.c:1277 calendar/gui/e-day-view.c:7585
-#: calendar/gui/e-week-view.c:4240
+#: calendar/gui/e-calendar-table.c:1243 calendar/gui/e-day-view.c:7640
+#: calendar/gui/e-week-view.c:4248
 msgid "Updating objects"
 msgstr "Oppdaterer objekter"
 
-#: calendar/gui/e-calendar-table.c:1360
+#: calendar/gui/e-calendar-table.c:1326
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Klikk for å legge til en oppgave"
@@ -5062,8 +5339,8 @@ msgstr "Klikk for å legge til en oppgave"
 msgid "Alarms"
 msgstr "Alarmer"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1001
-#: camel/camel-filter-driver.c:1096
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Fullført"
 
@@ -5092,8 +5369,8 @@ msgid "Start Date"
 msgstr "Startdato"
 
 #: calendar/gui/e-calendar-table.etspec.h:16
-#: my-evolution/component-factory.c:51 shell/e-shell.c:748
-#: shell/e-shortcuts.c:1051
+#: my-evolution/component-factory.c:56 shell/e-shell.c:767
+#: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Sammendrag"
 
@@ -5101,21 +5378,17 @@ msgstr "Sammendrag"
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-table.etspec.h:19
-msgid "URL"
-msgstr "URL"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
-#: e-util/e-time-utils.c:380
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:166
+#: e-util/e-time-utils.c:379
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d.%m.%Y %H:%M:%S"
+msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
-#: e-util/e-time-utils.c:389
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:161
+#: e-util/e-time-utils.c:388
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d.%m.%Y %H:%M:%S %p"
+msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #: calendar/gui/e-cell-date-edit-text.c:126
 #, c-format
@@ -5128,133 +5401,205 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:518
+#: calendar/gui/e-day-view-time-item.c:531
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutters oppdeling"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:284 calendar/gui/e-day-view.c:1422
-#: calendar/gui/e-week-view-main-item.c:324 calendar/gui/print.c:1507
+#: calendar/gui/e-day-view-top-item.c:262 calendar/gui/e-day-view.c:1374
+#: calendar/gui/e-week-view-main-item.c:303 calendar/gui/print.c:1529
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:292 calendar/gui/e-day-view.c:1449
-#: calendar/gui/e-week-view-main-item.c:347
+#: calendar/gui/e-day-view-top-item.c:270 calendar/gui/e-day-view.c:1401
+#: calendar/gui/e-week-view-main-item.c:326
 msgid "%d %b"
 msgstr "%d %b"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:375
-#: calendar/gui/print.c:791
+#: calendar/gui/e-day-view.c:611 calendar/gui/e-week-view.c:343
+#: calendar/gui/print.c:813
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:378
-#: calendar/gui/print.c:793
+#: calendar/gui/e-day-view.c:614 calendar/gui/e-week-view.c:346
+#: calendar/gui/print.c:815
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:3705
+#: calendar/gui/e-day-view.c:3659
 msgid "New _Appointment"
 msgstr "Ny _avtale"
 
-#: calendar/gui/e-day-view.c:3707 calendar/gui/e-week-view.c:3514
+#: calendar/gui/e-day-view.c:3661 calendar/gui/e-week-view.c:3510
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-day-view.c:3709 calendar/gui/e-week-view.c:3515
+#: calendar/gui/e-day-view.c:3663 calendar/gui/e-week-view.c:3511
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-day-view.c:3711 calendar/gui/e-week-view.c:3516
+#: calendar/gui/e-day-view.c:3665 calendar/gui/e-week-view.c:3512
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-day-view.c:3716 ui/evolution-comp-editor.xml.h:11
+#: calendar/gui/e-day-view.c:3670 ui/evolution-comp-editor.xml.h:11
 msgid "Print..."
 msgstr "Skriv ut..."
 
-#: calendar/gui/e-day-view.c:3728 calendar/gui/e-week-view.c:3530
+#: calendar/gui/e-day-view.c:3682 calendar/gui/e-week-view.c:3526
 #: ui/evolution-calendar.xml.h:10
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-day-view.c:3730 calendar/gui/e-week-view.c:3531
+#: calendar/gui/e-day-view.c:3684 calendar/gui/e-week-view.c:3527
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-day-view.c:3735 calendar/gui/e-week-view.c:3535
+#: calendar/gui/e-day-view.c:3689 calendar/gui/e-week-view.c:3531
 #: ui/evolution-calendar.xml.h:31
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-day-view.c:3740 calendar/gui/e-week-view.c:3539
+#: calendar/gui/e-day-view.c:3694 calendar/gui/e-week-view.c:3535
 #: ui/evolution.xml.h:62
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
-#: calendar/gui/e-day-view.c:3749 calendar/gui/e-week-view.c:3546
-#: mail/folder-browser.c:1731 ui/evolution-mail-message.xml.h:112
+#: calendar/gui/e-day-view.c:3703 calendar/gui/e-week-view.c:3542
+#: mail/folder-browser.c:1743 ui/evolution-mail-message.xml.h:112
 msgid "_Save As..."
 msgstr "Lagre _som..."
 
-#: calendar/gui/e-day-view.c:3761 calendar/gui/e-week-view.c:3558
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3554
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-day-view.c:3762 calendar/gui/e-week-view.c:3559
+#: calendar/gui/e-day-view.c:3716 calendar/gui/e-week-view.c:3555
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-day-view.c:3767 calendar/gui/e-week-view.c:3564
+#: calendar/gui/e-day-view.c:3721 calendar/gui/e-week-view.c:3560
 msgid "Make this Occurrence _Movable"
 msgstr "Gjør denne hendelsen _flyttbar"
 
-#: calendar/gui/e-day-view.c:3768 calendar/gui/e-week-view.c:3565
+#: calendar/gui/e-day-view.c:3722 calendar/gui/e-week-view.c:3561
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-day-view.c:3769 calendar/gui/e-week-view.c:3566
+#: calendar/gui/e-day-view.c:3723 calendar/gui/e-week-view.c:3562
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-itip-control.c:615
+#: calendar/gui/e-itip-control.c:704
+msgid "Yes. (Complex Recurrence)"
+msgstr "Ja (enkel gjeninntreffelse)"
+
+#: calendar/gui/e-itip-control.c:716
+msgid "Every day"
+msgstr "Hver dag"
+
+#: calendar/gui/e-itip-control.c:718
+#, c-format
+msgid "Every %d days"
+msgstr "Hver %d dager"
+
+#: calendar/gui/e-itip-control.c:724
+msgid "Every week"
+msgstr "Hver uke"
+
+#: calendar/gui/e-itip-control.c:726
+#, c-format
+msgid "Every %d weeks"
+msgstr "Hver %d uker"
+
+#: calendar/gui/e-itip-control.c:729
+msgid "Every week on "
+msgstr "Hver uke på "
+
+#: calendar/gui/e-itip-control.c:731
+#, c-format
+msgid "Every %d weeks on "
+msgstr "Hver %d uker på "
+
+#: calendar/gui/e-itip-control.c:739
+msgid " and "
+msgstr " og "
+
+#: calendar/gui/e-itip-control.c:746
+#, c-format
+msgid "The %s day of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:759
+#, c-format
+msgid "The %s %s of "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:764
+msgid "every month"
+msgstr "hver måned"
+
+#: calendar/gui/e-itip-control.c:769
+#, c-format
+msgid "every %d months"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:775
+msgid "Every year"
+msgstr "Hvert år"
+
+#: calendar/gui/e-itip-control.c:777
+#, c-format
+msgid "Every %d years"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:789
+#, c-format
+msgid " a total of %d times"
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:797
+msgid ", ending on "
+msgstr ""
+
+#: calendar/gui/e-itip-control.c:821
 msgid "<b>Starts:</b> "
 msgstr "<b>Starter:</b> "
 
-#: calendar/gui/e-itip-control.c:625
+#: calendar/gui/e-itip-control.c:831
 msgid "<b>Ends:</b> "
 msgstr "<b>Slutter:</b> "
 
-#: calendar/gui/e-itip-control.c:638
+#: calendar/gui/e-itip-control.c:851
 msgid "<b>Completed:</b> "
 msgstr "<b>Fullført:</b> "
 
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:861
 msgid "<b>Due:</b> "
 msgstr "<b>Ferdig:</b> "
 
-#: calendar/gui/e-itip-control.c:685 calendar/gui/e-itip-control.c:735
+#: calendar/gui/e-itip-control.c:898 calendar/gui/e-itip-control.c:951
 msgid "iCalendar Information"
 msgstr "iCalendar-informasjon"
 
 #. Title
-#: calendar/gui/e-itip-control.c:700
+#: calendar/gui/e-itip-control.c:913
 msgid "iCalendar Error"
 msgstr "iCalender-feil"
 
-#: calendar/gui/e-itip-control.c:766 calendar/gui/e-itip-control.c:782
-#: calendar/gui/e-itip-control.c:793 calendar/gui/e-itip-control.c:810
+#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:1009 calendar/gui/e-itip-control.c:1026
 msgid "An unknown person"
 msgstr "En ukjent person"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:817
+#: calendar/gui/e-itip-control.c:1033
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5262,336 +5607,337 @@ msgstr ""
 "<br>Vennligst sjekk følgende informasjon og velg så en handling fra menyen "
 "under."
 
-#: calendar/gui/e-itip-control.c:832
+#: calendar/gui/e-itip-control.c:1048
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:842
+#: calendar/gui/e-itip-control.c:1058
 msgid "Location:"
 msgstr "Plassering:"
 
-#: calendar/gui/e-itip-control.c:856
+#: calendar/gui/e-itip-control.c:1072
 msgid "Status:"
 msgstr "Status:"
 
-#: calendar/gui/e-itip-control.c:861 calendar/gui/e-meeting-model.c:322
-#: calendar/gui/e-meeting-model.c:345 calendar/gui/e-meeting-model.c:876
-#: calendar/gui/itip-utils.c:490
+#: calendar/gui/e-itip-control.c:1077 calendar/gui/e-meeting-model.c:296
+#: calendar/gui/e-meeting-model.c:319 calendar/gui/e-meeting-model.c:851
+#: calendar/gui/itip-utils.c:404
 msgid "Accepted"
 msgstr "Godtatt"
 
-#: calendar/gui/e-itip-control.c:865 calendar/gui/itip-utils.c:493
+#: calendar/gui/e-itip-control.c:1081 calendar/gui/itip-utils.c:407
 msgid "Tentatively Accepted"
 msgstr "Akteptert tentativt"
 
-#: calendar/gui/e-itip-control.c:869 calendar/gui/e-meeting-model.c:324
-#: calendar/gui/e-meeting-model.c:347 calendar/gui/e-meeting-model.c:877
-#: calendar/gui/itip-utils.c:496 calendar/gui/itip-utils.c:522
+#: calendar/gui/e-itip-control.c:1085 calendar/gui/e-meeting-model.c:298
+#: calendar/gui/e-meeting-model.c:321 calendar/gui/e-meeting-model.c:852
+#: calendar/gui/itip-utils.c:410 calendar/gui/itip-utils.c:436
 msgid "Declined"
 msgstr "Avslått"
 
-#: calendar/gui/e-itip-control.c:873 calendar/gui/e-itip-control.c:1079
-#: calendar/gui/e-meeting-model.c:258 calendar/gui/e-meeting-model.c:293
-#: calendar/gui/e-meeting-model.c:358 calendar/gui/e-meeting-model.c:834
-#: calendar/gui/e-meeting-model.c:850 camel/camel-tcp-stream-openssl.c:629
+#: calendar/gui/e-itip-control.c:1089 calendar/gui/e-itip-control.c:1297
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:267
+#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:809
+#: calendar/gui/e-meeting-model.c:825 camel/camel-gpg-context.c:1531
+#: camel/camel-gpg-context.c:1581 camel/camel-tcp-stream-openssl.c:634
 #: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:327
-#: mail/mail-display.c:896 widgets/misc/e-charset-picker.c:58
-#: widgets/misc/e-charset-picker.c:444
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/folder-browser.c:345
+#: mail/mail-display.c:931 widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:510
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: calendar/gui/e-itip-control.c:926 calendar/gui/e-itip-control.c:954
-#: calendar/gui/e-itip-control.c:980 calendar/gui/e-itip-control.c:993
-#: calendar/gui/e-itip-control.c:1006 calendar/gui/e-itip-control.c:1019
+#: calendar/gui/e-itip-control.c:1144 calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1198 calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224 calendar/gui/e-itip-control.c:1237
 msgid "Choose an action:"
 msgstr "Velg en handling:"
 
-#: calendar/gui/e-itip-control.c:927
+#: calendar/gui/e-itip-control.c:1145
 msgid "Update"
 msgstr "Oppdater"
 
-#: calendar/gui/e-itip-control.c:928 calendar/gui/e-itip-control.c:959
-#: calendar/gui/e-itip-control.c:982 calendar/gui/e-itip-control.c:995
-#: calendar/gui/e-itip-control.c:1008 calendar/gui/e-itip-control.c:1021
-#: shell/e-shell.c:2176 widgets/misc/e-cell-date-edit.c:258
+#: calendar/gui/e-itip-control.c:1146 calendar/gui/e-itip-control.c:1177
+#: calendar/gui/e-itip-control.c:1200 calendar/gui/e-itip-control.c:1213
+#: calendar/gui/e-itip-control.c:1226 calendar/gui/e-itip-control.c:1239
+#: shell/e-shell.c:2094 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
-#: calendar/gui/e-itip-control.c:955
+#: calendar/gui/e-itip-control.c:1173
 msgid "Accept"
 msgstr "Godta"
 
-#: calendar/gui/e-itip-control.c:956
+#: calendar/gui/e-itip-control.c:1174
 msgid "Tentatively accept"
 msgstr "Godta tentativt"
 
-#: calendar/gui/e-itip-control.c:957
+#: calendar/gui/e-itip-control.c:1175
 msgid "Decline"
 msgstr "Avslå"
 
-#: calendar/gui/e-itip-control.c:981
+#: calendar/gui/e-itip-control.c:1199
 msgid "Send Free/Busy Information"
 msgstr "Send ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:994
+#: calendar/gui/e-itip-control.c:1212
 msgid "Update respondent status"
 msgstr "Oppdater status for respondent"
 
-#: calendar/gui/e-itip-control.c:1007
+#: calendar/gui/e-itip-control.c:1225
 msgid "Send Latest Information"
 msgstr "Send siste informasjon"
 
-#: calendar/gui/e-itip-control.c:1020 calendar/gui/itip-utils.c:510
-#: shell/evolution-shell-component.c:1143 ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1238 calendar/gui/itip-utils.c:424
+#: shell/evolution-shell-component.c:1162 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: calendar/gui/e-itip-control.c:1101
+#: calendar/gui/e-itip-control.c:1319
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> har publisert møteinformasjon."
 
-#: calendar/gui/e-itip-control.c:1102
+#: calendar/gui/e-itip-control.c:1320
 msgid "Meeting Information"
 msgstr "Møteinformasjon"
 
-#: calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.c:1325
 #, 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:1109
+#: calendar/gui/e-itip-control.c:1327
 #, 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:1110
+#: calendar/gui/e-itip-control.c:1328
 msgid "Meeting Proposal"
 msgstr "Møteforslag"
 
-#: calendar/gui/e-itip-control.c:1114
+#: calendar/gui/e-itip-control.c:1332
 #, 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:1115
+#: calendar/gui/e-itip-control.c:1333
 msgid "Meeting Update"
 msgstr "Møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1119
+#: calendar/gui/e-itip-control.c:1337
 #, 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:1120
+#: calendar/gui/e-itip-control.c:1338
 msgid "Meeting Update Request"
 msgstr "Forespørsel om møteoppdatering"
 
-#: calendar/gui/e-itip-control.c:1127
+#: calendar/gui/e-itip-control.c:1345
 #, 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:1128
+#: calendar/gui/e-itip-control.c:1346
 msgid "Meeting Reply"
 msgstr "Møtesvar"
 
-#: calendar/gui/e-itip-control.c:1135
+#: calendar/gui/e-itip-control.c:1353
 #, 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:1136
+#: calendar/gui/e-itip-control.c:1354
 msgid "Meeting Cancellation"
 msgstr "Møteavlysing"
 
-#: calendar/gui/e-itip-control.c:1143 calendar/gui/e-itip-control.c:1210
-#: calendar/gui/e-itip-control.c:1245
+#: calendar/gui/e-itip-control.c:1361 calendar/gui/e-itip-control.c:1428
+#: calendar/gui/e-itip-control.c:1463
 #, 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:1144
+#: calendar/gui/e-itip-control.c:1362
 msgid "Bad Meeting Message"
 msgstr "Ugyldig møtemelding"
 
-#: calendar/gui/e-itip-control.c:1168
+#: 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:1169
+#: calendar/gui/e-itip-control.c:1387
 msgid "Task Information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/e-itip-control.c:1174
+#: calendar/gui/e-itip-control.c:1392
 #, 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:1176
+#: calendar/gui/e-itip-control.c:1394
 #, 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:1177
+#: calendar/gui/e-itip-control.c:1395
 msgid "Task Proposal"
 msgstr "Forespørsel om oppgave"
 
-#: calendar/gui/e-itip-control.c:1181
+#: calendar/gui/e-itip-control.c:1399
 #, 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:1182
+#: calendar/gui/e-itip-control.c:1400
 msgid "Task Update"
 msgstr "Oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1404
 #, 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:1187
+#: calendar/gui/e-itip-control.c:1405
 msgid "Task Update Request"
 msgstr "Forespørsel om oppgaveoppdatering"
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1412
 #, 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:1195
+#: calendar/gui/e-itip-control.c:1413
 msgid "Task Reply"
 msgstr "Svar på oppgave"
 
-#: calendar/gui/e-itip-control.c:1202
+#: calendar/gui/e-itip-control.c:1420
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b> har avlyst en oppgave."
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1421
 msgid "Task Cancellation"
 msgstr "Avlysning av oppgave"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1429
 msgid "Bad Task Message"
 msgstr "Ugyldig oppgavemelding"
 
-#: calendar/gui/e-itip-control.c:1230
+#: calendar/gui/e-itip-control.c:1448
 #, 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:1231
+#: calendar/gui/e-itip-control.c:1449
 msgid "Free/Busy Information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/e-itip-control.c:1235
+#: calendar/gui/e-itip-control.c:1453
 #, 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:1236
+#: calendar/gui/e-itip-control.c:1454
 msgid "Free/Busy Request"
 msgstr "Ledig/opptatt forespørsel"
 
-#: calendar/gui/e-itip-control.c:1240
+#: calendar/gui/e-itip-control.c:1458
 #, 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:1241
+#: calendar/gui/e-itip-control.c:1459
 msgid "Free/Busy Reply"
 msgstr "Ledig/opptatt svar"
 
-#: calendar/gui/e-itip-control.c:1246
+#: calendar/gui/e-itip-control.c:1464
 msgid "Bad Free/Busy Message"
 msgstr "Ugyldig ledig/opptatt-melding"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1540
 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:1382
+#: calendar/gui/e-itip-control.c:1603
 msgid "The message contains only unsupported requests."
 msgstr "Denne meldingen inneholder forespørsler som ikke er støttet."
 
-#: calendar/gui/e-itip-control.c:1410 calendar/gui/e-itip-control.c:1416
+#: calendar/gui/e-itip-control.c:1634 calendar/gui/e-itip-control.c:1640
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Vedlegget inneholder ikke et gyldig kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1441
+#: calendar/gui/e-itip-control.c:1665
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneholder ingen visbare kalender-vedlegg"
 
-#: calendar/gui/e-itip-control.c:1662 calendar/gui/e-itip-control.c:1754
+#: calendar/gui/e-itip-control.c:1906 calendar/gui/e-itip-control.c:1998
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikke oppdateres\n"
 
-#: calendar/gui/e-itip-control.c:1665 calendar/gui/e-itip-control.c:1757
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "There was an error on the CORBA system\n"
 msgstr "Det oppsto en feil i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1668 calendar/gui/e-itip-control.c:1760
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke finnes\n"
 
-#: calendar/gui/e-itip-control.c:1671
+#: calendar/gui/e-itip-control.c:1915
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheter til å oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1674
+#: calendar/gui/e-itip-control.c:1918
 msgid "Update complete\n"
 msgstr "Oppdatering fullført\n"
 
-#: calendar/gui/e-itip-control.c:1677
+#: calendar/gui/e-itip-control.c:1921
 msgid "Calendar file could not be updated!\n"
 msgstr "Kalenderfilen kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1706 calendar/gui/e-itip-control.c:1772
+#: calendar/gui/e-itip-control.c:1950 calendar/gui/e-itip-control.c:2016
 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:1727
+#: calendar/gui/e-itip-control.c:1971
 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:1739
+#: calendar/gui/e-itip-control.c:1983
 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:1763
+#: calendar/gui/e-itip-control.c:2007
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Du har ikke rettigheter til å oppdatere kalenderen\n"
 
-#: calendar/gui/e-itip-control.c:1766
+#: calendar/gui/e-itip-control.c:2010
 msgid "Attendee status updated\n"
 msgstr "Deltakerstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1769
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakerstatus kunne ikke oppdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1804
+#: calendar/gui/e-itip-control.c:2048
 msgid "Removal Complete"
 msgstr "Fjerning fullført"
 
-#: calendar/gui/e-itip-control.c:1834 calendar/gui/e-itip-control.c:1884
+#: calendar/gui/e-itip-control.c:2078 calendar/gui/e-itip-control.c:2128
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1836 calendar/gui/e-itip-control.c:1888
+#: calendar/gui/e-itip-control.c:2080 calendar/gui/e-itip-control.c:2132
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kunne ikke sendes!\n"
 
-#: calendar/gui/e-itip-control.c:1961
+#: calendar/gui/e-itip-control.c:2205
 msgid "Select Calendar Folder"
 msgstr "Velg kalendermappe"
 
-#: calendar/gui/e-itip-control.c:1968
+#: calendar/gui/e-itip-control.c:2212
 msgid "Select Tasks Folder"
 msgstr "Velg oppgavemappe"
 
@@ -5632,180 +5978,185 @@ msgstr "slutt-dato"
 msgid "date-start"
 msgstr "start-dato"
 
-#: calendar/gui/e-meeting-model.c:84
+#: calendar/gui/e-meeting-model.c:80
 msgid "Chair Persons"
 msgstr "Styremedlemmer"
 
-#: calendar/gui/e-meeting-model.c:85 calendar/gui/e-meeting-model.c:1763
+#: calendar/gui/e-meeting-model.c:81 calendar/gui/e-meeting-model.c:1694
 msgid "Required Participants"
 msgstr "Obligatoriske deltakere"
 
-#: calendar/gui/e-meeting-model.c:86
+#: calendar/gui/e-meeting-model.c:82
 msgid "Optional Participants"
 msgstr "Valgfrie deltakere"
 
-#: calendar/gui/e-meeting-model.c:87
+#: calendar/gui/e-meeting-model.c:83
 msgid "Resources"
 msgstr "Ressurser"
 
-#: calendar/gui/e-meeting-model.c:233 calendar/gui/e-meeting-model.c:250
-#: calendar/gui/e-meeting-model.c:564 calendar/gui/e-meeting-model.c:830
+#: calendar/gui/e-meeting-model.c:207 calendar/gui/e-meeting-model.c:224
+#: calendar/gui/e-meeting-model.c:539 calendar/gui/e-meeting-model.c:805
 msgid "Individual"
 msgstr "Individuell"
 
-#: calendar/gui/e-meeting-model.c:235 calendar/gui/e-meeting-model.c:252
-#: calendar/gui/e-meeting-model.c:831
+#: calendar/gui/e-meeting-model.c:209 calendar/gui/e-meeting-model.c:226
+#: calendar/gui/e-meeting-model.c:806
 msgid "Group"
 msgstr "Gruppe"
 
-#: calendar/gui/e-meeting-model.c:237 calendar/gui/e-meeting-model.c:254
-#: calendar/gui/e-meeting-model.c:832
+#: calendar/gui/e-meeting-model.c:211 calendar/gui/e-meeting-model.c:228
+#: calendar/gui/e-meeting-model.c:807
 msgid "Resource"
 msgstr "Ressurs"
 
-#: calendar/gui/e-meeting-model.c:239 calendar/gui/e-meeting-model.c:256
-#: calendar/gui/e-meeting-model.c:833
+#: calendar/gui/e-meeting-model.c:213 calendar/gui/e-meeting-model.c:230
+#: calendar/gui/e-meeting-model.c:808
 msgid "Room"
 msgstr "Rom"
 
-#: calendar/gui/e-meeting-model.c:268 calendar/gui/e-meeting-model.c:285
-#: calendar/gui/e-meeting-model.c:846
+#: calendar/gui/e-meeting-model.c:242 calendar/gui/e-meeting-model.c:259
+#: calendar/gui/e-meeting-model.c:821
 msgid "Chair"
 msgstr "Styremedlem"
 
-#: calendar/gui/e-meeting-model.c:270 calendar/gui/e-meeting-model.c:287
-#: calendar/gui/e-meeting-model.c:566 calendar/gui/e-meeting-model.c:847
+#: calendar/gui/e-meeting-model.c:244 calendar/gui/e-meeting-model.c:261
+#: calendar/gui/e-meeting-model.c:541 calendar/gui/e-meeting-model.c:822
 msgid "Required Participant"
 msgstr "Obligatorisk deltaker"
 
-#: calendar/gui/e-meeting-model.c:272 calendar/gui/e-meeting-model.c:289
-#: calendar/gui/e-meeting-model.c:848
+#: calendar/gui/e-meeting-model.c:246 calendar/gui/e-meeting-model.c:263
+#: calendar/gui/e-meeting-model.c:823
 msgid "Optional Participant"
 msgstr "Valgfri deltaker"
 
-#: calendar/gui/e-meeting-model.c:274 calendar/gui/e-meeting-model.c:291
-#: calendar/gui/e-meeting-model.c:849
+#: calendar/gui/e-meeting-model.c:248 calendar/gui/e-meeting-model.c:265
+#: calendar/gui/e-meeting-model.c:824
 msgid "Non-Participant"
 msgstr "Ikke-deltaker"
 
-#: calendar/gui/e-meeting-model.c:326 calendar/gui/e-meeting-model.c:349
-#: calendar/gui/e-meeting-model.c:878 calendar/gui/e-meeting-time-sel.c:437
+#: calendar/gui/e-meeting-model.c:294 calendar/gui/e-meeting-model.c:317
+#: calendar/gui/e-meeting-model.c:549 calendar/gui/e-meeting-model.c:850
+msgid "Needs Action"
+msgstr "Trenger handling"
+
+#: calendar/gui/e-meeting-model.c:300 calendar/gui/e-meeting-model.c:323
+#: calendar/gui/e-meeting-model.c:853 calendar/gui/e-meeting-time-sel.c:407
 msgid "Tentative"
 msgstr "Tentativ"
 
-#: calendar/gui/e-meeting-model.c:328 calendar/gui/e-meeting-model.c:351
-#: calendar/gui/e-meeting-model.c:879
+#: calendar/gui/e-meeting-model.c:302 calendar/gui/e-meeting-model.c:325
+#: calendar/gui/e-meeting-model.c:854
 msgid "Delegated"
 msgstr "Delegert"
 
-#: calendar/gui/e-meeting-model.c:332 calendar/gui/e-meeting-model.c:355
+#: calendar/gui/e-meeting-model.c:306 calendar/gui/e-meeting-model.c:329
 msgid "In Process"
 msgstr "Under arbeid"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:475
-#: calendar/gui/e-meeting-time-sel.c:2114
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2077
 msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:479
-#: calendar/gui/e-meeting-time-sel.c:2144 e-util/e-time-utils.c:190
-#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2107 e-util/e-time-utils.c:189
+#: e-util/e-time-utils.c:282 e-util/e-time-utils.c:370
 msgid "%a %m/%d/%Y"
 msgstr "%a %d.%m.%Y"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:483 e-util/e-time-utils.c:225
-#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1597
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:224
+#: e-util/e-time-utils.c:285 widgets/misc/e-dateedit.c:1608
 msgid "%m/%d/%Y"
 msgstr "%d.%m.%Y"
 
-#: calendar/gui/e-meeting-time-sel.c:439
+#: calendar/gui/e-meeting-time-sel.c:409 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute"
 
-#: calendar/gui/e-meeting-time-sel.c:440
+#: calendar/gui/e-meeting-time-sel.c:410
 msgid "No Information"
 msgstr "Ingen informasjon"
 
-#: calendar/gui/e-meeting-time-sel.c:478
+#: calendar/gui/e-meeting-time-sel.c:448
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:495
+#: calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:508
+#: calendar/gui/e-meeting-time-sel.c:482
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:526
+#: calendar/gui/e-meeting-time-sel.c:500
 msgid "_Update Free/Busy"
 msgstr "_Oppdater ledig/opptatt"
 
-#: calendar/gui/e-meeting-time-sel.c:544
+#: calendar/gui/e-meeting-time-sel.c:518
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:561
+#: calendar/gui/e-meeting-time-sel.c:535
 msgid "_Autopick"
 msgstr "_Autovelg"
 
-#: calendar/gui/e-meeting-time-sel.c:575
+#: calendar/gui/e-meeting-time-sel.c:549
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:592
+#: calendar/gui/e-meeting-time-sel.c:568
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:605
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:618
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Required People"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:631
+#: calendar/gui/e-meeting-time-sel.c:607
 msgid "Required People and _One Resource"
 msgstr "Obligatoriske mennesker _og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:654
+#: calendar/gui/e-meeting-time-sel.c:630
 msgid "Meeting _start time:"
 msgstr "Tid for møtets _start:"
 
-#: calendar/gui/e-meeting-time-sel.c:673
+#: calendar/gui/e-meeting-time-sel.c:649
 msgid "Meeting _end time:"
 msgstr "Tid for møtets slutt:"
 
-#: calendar/gui/e-tasks.c:355 calendar/gui/gnome-cal.c:2013
+#: calendar/gui/e-tasks.c:357 calendar/gui/gnome-cal.c:2013
 #: calendar/gui/gnome-cal.c:2024
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:381 calendar/gui/tasks-control.c:196
+#: calendar/gui/e-tasks.c:386 calendar/gui/tasks-control.c:199
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Kunne ikke laste oppgavene i «%s»"
 
-#: calendar/gui/e-tasks.c:393
+#: calendar/gui/e-tasks.c:401
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden som er nødvendig for å laste «%s» er ikke støttet"
 
-#: calendar/gui/e-tasks.c:404 calendar/gui/gnome-cal.c:1552
+#: calendar/gui/e-tasks.c:415 calendar/gui/gnome-cal.c:1531
 #, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Du har ikke rettigheter til å åpne mappen i «%s»"
 
-#: calendar/gui/e-tasks.c:469 calendar/gui/gnome-cal.c:1750
+#: calendar/gui/e-tasks.c:483 calendar/gui/gnome-cal.c:1735
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -5814,39 +6165,38 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:540
+#: calendar/gui/e-tasks.c:554
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:563
+#: calendar/gui/e-tasks.c:577
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:656
+#: calendar/gui/e-tasks.c:672
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-week-view.c:3513
+#: calendar/gui/e-week-view.c:3509
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/gnome-cal.c:1530
+#: calendar/gui/gnome-cal.c:1503
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Kunne ikke åpne mappen i «%s»"
 
-#: calendar/gui/gnome-cal.c:1541
+#: calendar/gui/gnome-cal.c:1517
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "Metoden som er nødvendig for å åpne «%s» er ikke støttet"
 
-#. add the alarms for this client
-#: calendar/gui/gnome-cal.c:1581
+#: calendar/gui/gnome-cal.c:1563
 #, c-format
 msgid "Adding alarms for %s"
 msgstr "Legger til alarmer for %s"
 
-#: calendar/gui/gnome-cal.c:1767
+#: calendar/gui/gnome-cal.c:1755
 #, c-format
 msgid ""
 "The calendar backend for\n"
@@ -5854,7 +6204,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1764
 #, c-format
 msgid ""
 "The task backend for\n"
@@ -5862,7 +6212,7 @@ msgid ""
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1996
+#: calendar/gui/gnome-cal.c:1995
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Åpner kalender på %s"
@@ -5927,315 +6277,172 @@ msgstr "Oktober"
 msgid "September"
 msgstr "September"
 
-#: calendar/gui/itip-utils.c:348 calendar/gui/itip-utils.c:419
+#: calendar/gui/itip-utils.c:262 calendar/gui/itip-utils.c:333
 msgid "An organizer must be set."
 msgstr "En organisator må oppgis."
 
-#: calendar/gui/itip-utils.c:383
+#: calendar/gui/itip-utils.c:297
 msgid "At least one attendee is necessary"
 msgstr "Minst en deltaker kreves"
 
-#: calendar/gui/itip-utils.c:462 calendar/gui/itip-utils.c:571
+#: calendar/gui/itip-utils.c:376 calendar/gui/itip-utils.c:485
 msgid "Event information"
 msgstr "Hendelsesinformasjon"
 
-#: calendar/gui/itip-utils.c:464 calendar/gui/itip-utils.c:573
+#: calendar/gui/itip-utils.c:378 calendar/gui/itip-utils.c:487
 msgid "Task information"
 msgstr "Oppgaveinformasjon"
 
-#: calendar/gui/itip-utils.c:466 calendar/gui/itip-utils.c:575
+#: calendar/gui/itip-utils.c:380 calendar/gui/itip-utils.c:489
 msgid "Journal information"
 msgstr "Journalinformasjon"
 
-#: calendar/gui/itip-utils.c:468 calendar/gui/itip-utils.c:592
+#: calendar/gui/itip-utils.c:382 calendar/gui/itip-utils.c:506
 msgid "Free/Busy information"
 msgstr "Ledig/opptatt-informasjon"
 
-#: calendar/gui/itip-utils.c:470
+#: calendar/gui/itip-utils.c:384
 msgid "Calendar information"
 msgstr "Kalenderinformasjon"
 
-#: calendar/gui/itip-utils.c:506
+#: calendar/gui/itip-utils.c:420
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: calendar/gui/itip-utils.c:514
+#: calendar/gui/itip-utils.c:428
 msgid "Refresh"
 msgstr "Oppdater"
 
-#: calendar/gui/itip-utils.c:518
+#: calendar/gui/itip-utils.c:432
 msgid "Counter-proposal"
 msgstr "Motforslag"
 
-#: calendar/gui/itip-utils.c:586
+#: calendar/gui/itip-utils.c:500
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Ledig/opptatt-informasjon (%s til %s)"
 
-#: calendar/gui/itip-utils.c:598
+#: calendar/gui/itip-utils.c:512
 msgid "iCalendar information"
 msgstr "iCalendar-informasjon"
 
-#: calendar/gui/itip-utils.c:756
+#: calendar/gui/itip-utils.c:660
 msgid "You must be an attendee of the event."
 msgstr "Du må være en deltager i hendelsen."
 
-#: calendar/gui/main.c:70
-msgid "Could not activate Bonobo"
-msgstr "Kunne ikke aktivere Bonobo"
-
-#: calendar/gui/main.c:99
-msgid "Could not create the component editor factory"
-msgstr "Kunne ikke opprette factory for komponentredigering"
-
-#: calendar/gui/print.c:456
-msgid "1st"
-msgstr "1"
-
-#: calendar/gui/print.c:456
-msgid "2nd"
-msgstr "2"
-
-#: calendar/gui/print.c:456
-msgid "3rd"
-msgstr "3"
-
-#: calendar/gui/print.c:456
-msgid "4th"
-msgstr "4"
-
-#: calendar/gui/print.c:456
-msgid "5th"
-msgstr "5"
-
-#: calendar/gui/print.c:457
-msgid "6th"
-msgstr "6"
-
-#: calendar/gui/print.c:457
-msgid "7th"
-msgstr "7"
-
-#: calendar/gui/print.c:457
-msgid "8th"
-msgstr "8"
-
-#: calendar/gui/print.c:457
-msgid "9th"
-msgstr "9"
-
-#: calendar/gui/print.c:457
-msgid "10th"
-msgstr "10"
-
-#: calendar/gui/print.c:458
-msgid "11th"
-msgstr "11"
-
-#: calendar/gui/print.c:458
-msgid "12th"
-msgstr "12"
-
-#: calendar/gui/print.c:458
-msgid "13th"
-msgstr "13"
-
-#: calendar/gui/print.c:458
-msgid "14th"
-msgstr "14"
-
-#: calendar/gui/print.c:458
-msgid "15th"
-msgstr "15"
-
-#: calendar/gui/print.c:459
-msgid "16th"
-msgstr "16"
-
-#: calendar/gui/print.c:459
-msgid "17th"
-msgstr "17"
-
-#: calendar/gui/print.c:459
-msgid "18th"
-msgstr "18"
-
-#: calendar/gui/print.c:459
-msgid "19th"
-msgstr "19"
-
-#: calendar/gui/print.c:459
-msgid "20th"
-msgstr "20"
-
-#: calendar/gui/print.c:460
-msgid "21st"
-msgstr "21"
-
-#: calendar/gui/print.c:460
-msgid "22nd"
-msgstr "22"
-
-#: calendar/gui/print.c:460
-msgid "23rd"
-msgstr "23"
-
-#: calendar/gui/print.c:460
-msgid "24th"
-msgstr "24"
-
-#: calendar/gui/print.c:460
-msgid "25th"
-msgstr "25"
-
-#: calendar/gui/print.c:461
-msgid "26th"
-msgstr "26"
-
-#: calendar/gui/print.c:461
-msgid "27th"
-msgstr "27"
-
-#: calendar/gui/print.c:461
-msgid "28th"
-msgstr "28"
-
-#: calendar/gui/print.c:461
-msgid "29th"
-msgstr "29"
-
-#: calendar/gui/print.c:461
-msgid "30th"
-msgstr "30"
-
-#: calendar/gui/print.c:462
-msgid "31st"
-msgstr "31"
-
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Su"
 msgstr "Sø."
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Mo"
 msgstr "Ma."
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "Tu"
 msgstr "Ti."
 
-#: calendar/gui/print.c:529
+#: calendar/gui/print.c:551
 msgid "We"
 msgstr "On."
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Th"
 msgstr "To."
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Fr"
 msgstr "Fr."
 
-#: calendar/gui/print.c:530
+#: calendar/gui/print.c:552
 msgid "Sa"
 msgstr "Lø."
 
 #. Day
-#: calendar/gui/print.c:1863
+#: calendar/gui/print.c:1885
 msgid "Selected day (%a %b %d %Y)"
-msgstr "Valgt dag (%a %b %d %Y)"
+msgstr "Valgt dag (%a %d %b %Y)"
 
-#: calendar/gui/print.c:1888 calendar/gui/print.c:1892
+#: calendar/gui/print.c:1910 calendar/gui/print.c:1914
 msgid "%a %b %d"
-msgstr "%a %b %d"
+msgstr "%a %d %b"
 
-#: calendar/gui/print.c:1889
+#: calendar/gui/print.c:1911
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1893 calendar/gui/print.c:1895
-#: calendar/gui/print.c:1896
+#: calendar/gui/print.c:1915 calendar/gui/print.c:1917
+#: calendar/gui/print.c:1918
 msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+msgstr "%a %d %b %Y"
 
-#: calendar/gui/print.c:1900
+#: calendar/gui/print.c:1922
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Valgt uke (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1930
 msgid "Selected month (%b %Y)"
 msgstr "Valgt måned (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1937
 msgid "Selected year (%Y)"
 msgstr "Valgt år (%Y)"
 
-#: calendar/gui/print.c:2249
+#: calendar/gui/print.c:2267
 msgid "Task"
 msgstr "Oppgave"
 
-#: calendar/gui/print.c:2306
+#: calendar/gui/print.c:2326
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: calendar/gui/print.c:2324
+#: calendar/gui/print.c:2344
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioritet: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2358
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Prosent fullført: %i"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2370
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: calendar/gui/print.c:2364
+#: calendar/gui/print.c:2384
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorier: %s"
 
-#: calendar/gui/print.c:2375
+#: calendar/gui/print.c:2395
 msgid "Contacts: "
 msgstr "Kontakter: "
 
-#: calendar/gui/print.c:2430
-msgid "Print Calendar"
-msgstr "Skriv ut kalender"
-
-#: calendar/gui/print.c:2521 calendar/gui/print.c:2613
-#: calendar/gui/tasks-control.c:589 mail/mail-callbacks.c:3190
-#: my-evolution/e-summary.c:633
+#: calendar/gui/print.c:2533 calendar/gui/print.c:2619
+#: calendar/gui/tasks-control.c:579 mail/mail-callbacks.c:2939
+#: my-evolution/e-summary.c:618
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
-#: calendar/gui/print.c:2550
+#: calendar/gui/print.c:2567
 msgid "Print Item"
 msgstr "Skriv ut oppføring"
 
-#: calendar/gui/print.c:2631
+#: calendar/gui/print.c:2640
 msgid "Print Setup"
 msgstr "Skriveroppsett"
 
-#: calendar/gui/tasks-control-factory.c:75
-msgid ""
-"Could not create the tasks view.  Please check your ORBit and OAF setup."
-msgstr ""
-"Kunne ikke opprette oppgavevisning. Vennligst sjekk din ORBit og OAF "
-"konfigurasjon."
-
-#: calendar/gui/tasks-control.c:147
+#: calendar/gui/tasks-control.c:150
 msgid "The URI of the tasks folder to display"
 msgstr "URIen til oppgavemappen skal vises"
 
-#: calendar/gui/tasks-control.c:462
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6247,88 +6454,49 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse oppgavene?"
 
-#: calendar/gui/tasks-control.c:469 mail/mail-callbacks.c:2670
-#: mail/mail-callbacks.c:2912
+#: calendar/gui/tasks-control.c:472
 msgid "Do not ask me again."
 msgstr "Ikke spør meg igjen."
 
-#: calendar/gui/tasks-control.c:618
+#: calendar/gui/tasks-control.c:608
 msgid "Print Tasks"
 msgstr "Skriv ut oppgaver"
 
-#: calendar/gui/tasks-migrate.c:105
-msgid ""
-"Evolution has taken the tasks that were in your calendar folder and "
-"automatically migrated them to the new tasks folder."
-msgstr ""
-"Evolution har utført automatisk migrasjon av oppgavene fra din kalendermappe "
-"til den nye oppgaver-mappen."
-
-#: calendar/gui/tasks-migrate.c:108
-msgid ""
-"Evolution has tried to take the tasks that were in your calendar folder and "
-"migrate them to the new tasks folder.\n"
-"Some of the tasks could not be migrated, so this process may be attempted "
-"again in the future."
-msgstr ""
-"Evolution har forsøkt å migrere oppgavene som var i din kalendermappe til "
-"den nye oppgavemappen.\n"
-"Noen av oppgavene kunne ikke migreres, så denne prosessen vil kunne forsøkes "
-"igjen i fremtiden."
-
-#: calendar/gui/tasks-migrate.c:120
-#, c-format
-msgid ""
-"Could not open `%s'; no items from the calendar folder will be migrated to "
-"the tasks folder."
-msgstr ""
-"Kunne ikke åpne «%s»; ingen oppføringer fra kalendermappen vil flyttes til "
-"oppgavemappen."
-
-#: calendar/gui/tasks-migrate.c:133
-#, c-format
-msgid ""
-"The method required to load `%s' is not supported; no items from the "
-"calendar folder will be migrated to the tasks folder."
-msgstr ""
-"Metoden som kreves for å laste «%s» er ikke støttet; ingen oppføringer fra "
-"kalendermappen vil bli migrert til oppgavemappen."
-
-#: calendar/gui/weekday-picker.c:314 calendar/gui/weekday-picker.c:409
+#: calendar/gui/weekday-picker.c:280 calendar/gui/weekday-picker.c:379
 msgid "SMTWTFS"
 msgstr "SMTOTFL"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:1
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:1
 msgid "Factory to import iCalendar files into Evolution"
 msgstr "Factory for import av iCalendar-filer til Evolution."
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:2
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:2
 msgid "Imports iCalendar files into Evolution"
 msgstr "Importerer iCalendar-filer til Evolution"
 
-#: calendar/importers/GNOME_Evolution_Calendar_Importer.oaf.in.h:3
+#: calendar/importers/GNOME_Evolution_Calendar_Importer.server.in.in.h:3
 msgid "Imports vCalendar files into Evolution"
 msgstr "Importerer vCalendar-filer til Evolution"
 
-#: calendar/importers/icalendar-importer.c:168
+#: calendar/importers/icalendar-importer.c:172
 #, c-format
 msgid "Can't get storage list from registry: %s"
 msgstr "Kan ikke hente lagerliste fra registeret: %s"
 
-#: calendar/importers/icalendar-importer.c:180
+#: calendar/importers/icalendar-importer.c:184
 #, c-format
 msgid "Can't call getFolderAtPath on storage: %s"
 msgstr "Kan ikke kalle getFolderAtPath på lager: %s"
 
-#: calendar/importers/icalendar-importer.c:483
+#: calendar/importers/icalendar-importer.c:487
 msgid "Reminder!!"
 msgstr "Påminnelse!!"
 
-#: calendar/importers/icalendar-importer.c:697
+#: calendar/importers/icalendar-importer.c:701
 msgid "Calendar Events"
 msgstr "Hendlelser i kalenderen"
 
-#: calendar/importers/icalendar-importer.c:722
+#: calendar/importers/icalendar-importer.c:726
 msgid ""
 "Evolution has found Gnome Calendar files.\n"
 "Would you like to import them into Evolution?"
@@ -6336,10 +6504,14 @@ msgstr ""
 "Evolution har funnet filer fra GNOME kalender.\n"
 "Vil du importere dem til Evolution?"
 
-#: calendar/importers/icalendar-importer.c:729
+#: calendar/importers/icalendar-importer.c:733
 msgid "Gnome Calendar"
 msgstr "GNOME kalender"
 
+#: calendar/pcs/cal-backend-file.c:310
+msgid "Can't save calendar data: Malformed URI."
+msgstr ""
+
 #: calendar/pcs/query.c:289
 msgid "time-now expects 0 arguments"
 msgstr "tid-nå forventer 0 argumenter"
@@ -7980,27 +8152,35 @@ msgstr "Stillehavet/Wallis"
 msgid "Pacific/Yap"
 msgstr "Stillahavet/Yap"
 
-#: camel/camel-cipher-context.c:170
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Signering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:210
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Verifisering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:254
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Kryptering er ikke støttet av dette cipheret"
 
-#: camel/camel-cipher-context.c:296
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Dekryptering er ikke støttet av dette cipheret"
 
-#: camel/camel-data-cache.c:169
+#: camel/camel-cipher-context.c:342
+msgid "You may not import keys with this cipher"
+msgstr "Du kan ikke importere nøkler med dette cipheret"
+
+#: camel/camel-cipher-context.c:374
+msgid "You may not export keys with this cipher"
+msgstr "Du kan ikke eksportere nøkler med dette cipheret"
+
+#: camel/camel-data-cache.c:137
 msgid "Unable to create cache path"
 msgstr "Kunne ikke opprette sti til buffer"
 
-#: camel/camel-data-cache.c:443
+#: camel/camel-data-cache.c:375
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Kunne ikke fjerne cache-oppføring: %s: %s"
@@ -8040,84 +8220,89 @@ msgstr "Forbereder mappe «%s» på frakobling"
 msgid "You must be working online to complete this operation"
 msgstr "Du må arbeide tilknyttet for å fullføre denne operasjonen"
 
-#: camel/camel-filter-driver.c:768 camel/camel-filter-driver.c:777
+#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:511
+#, c-format
+msgid "Failed to create pipe to '%s': %s"
+msgstr "Klarte ikke å opprette rør til «%s»: %s"
+
+#: camel/camel-filter-driver.c:715 camel/camel-filter-search.c:551
+#, c-format
+msgid "Failed to create create child process '%s': %s"
+msgstr "Feil under oppretting av underprosess «%s»: %s"
+
+#: camel/camel-filter-driver.c:744
+#, fuzzy, c-format
+msgid "Invalid message stream received from %s: %s"
+msgstr "Kan ikke lese hilsen fra %s: %s"
+
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Synkroniserer mapper"
 
-#: camel/camel-filter-driver.c:866 camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Feil under lesing av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:875 camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Feil under kjøring av filter: %s: %s"
 
-#: camel/camel-filter-driver.c:942
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Kunne ikke åpne spool-mappen"
 
-#: camel/camel-filter-driver.c:951
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Kan ikke prosessere spool-mappen"
 
-#: camel/camel-filter-driver.c:966
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "Henter melding %d (%d%%)"
 
-#: camel/camel-filter-driver.c:970
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Kan ikke åpne melding"
 
-#: camel/camel-filter-driver.c:971 camel/camel-filter-driver.c:983
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Feilet på melding %d"
 
-#: camel/camel-filter-driver.c:997 camel/camel-filter-driver.c:1091
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Synkroniserer mappe"
 
-#: camel/camel-filter-driver.c:1058
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "Henter melding %d av %d"
 
-#: camel/camel-filter-driver.c:1073
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: camel/camel-filter-search.c:139
+#: camel/camel-filter-search.c:134
 msgid "Failed to retrieve message"
 msgstr "Feil under henting av melding"
 
-#: camel/camel-filter-search.c:387
+#: camel/camel-filter-search.c:384
 msgid "Invalid arguments to (system-flag)"
 msgstr "Ugyldige argumenter til (system-flag)"
 
-#: camel/camel-filter-search.c:402
+#: camel/camel-filter-search.c:399
 msgid "Invalid arguments to (user-tag)"
 msgstr "Ugyldige argumenter til (user-tag)"
 
-#: camel/camel-filter-search.c:514
-#, c-format
-msgid "Failed to create pipe to '%s': %s"
-msgstr "Klarte ikke å opprette rør til «%s»: %s"
-
-#: camel/camel-filter-search.c:550
-#, c-format
-msgid "Failed to create create child process '%s': %s"
-msgstr "Feil under oppretting av underprosess «%s»: %s"
-
-#: camel/camel-filter-search.c:656 camel/camel-filter-search.c:664
+#: camel/camel-filter-search.c:657 camel/camel-filter-search.c:665
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under lagring av filtersøk: %s: %s"
 
-#: camel/camel-folder-search.c:343
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8126,7 +8311,7 @@ msgstr ""
 "Kan ikke tolke uttrykket: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:353
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8135,11 +8320,11 @@ msgstr ""
 "Feil under kjøring av søkeuttrykket %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:570 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utfører spørring på ukjent header: %s"
@@ -8167,7 +8352,7 @@ msgstr "Flytter meldinger"
 msgid "Copying messages"
 msgstr "Kopierer meldinger"
 
-#: camel/camel-gpg-context.c:697
+#: camel/camel-gpg-context.c:724
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8178,15 +8363,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:711
+#: camel/camel-gpg-context.c:738
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:761
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: camel/camel-gpg-context.c:742
+#: camel/camel-gpg-context.c:769
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8195,33 +8380,33 @@ msgstr ""
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: camel/camel-gpg-context.c:753 camel/camel-gpg-context.c:1206
-#: camel/camel-gpg-context.c:1313 camel/camel-gpg-context.c:1388
-#: camel/camel-gpg-context.c:1445 mail/mail-send-recv.c:540
+#: camel/camel-gpg-context.c:780 camel/camel-gpg-context.c:1246
+#: camel/camel-gpg-context.c:1353 camel/camel-gpg-context.c:1428
+#: camel/camel-gpg-context.c:1485 mail/mail-send-recv.c:565
 msgid "Cancelled."
 msgstr "Avbrutt"
 
-#: camel/camel-gpg-context.c:771
+#: camel/camel-gpg-context.c:798
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved åpning av hemmelig nøkkel: 3 ugyldige passord oppgitt."
 
-#: camel/camel-gpg-context.c:777
+#: camel/camel-gpg-context.c:804
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:787
+#: camel/camel-gpg-context.c:814
 msgid "No data provided"
 msgstr "Ingen data gitt"
 
-#: camel/camel-gpg-context.c:830
+#: camel/camel-gpg-context.c:857
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1082
-#, c-format
+#: camel/camel-gpg-context.c:1122
+#, fuzzy, c-format
 msgid ""
-"Failed to GPG %s message: %s\n"
+"Failed to GPG %s: %s\n"
 "\n"
 "%.*s"
 msgstr ""
@@ -8229,23 +8414,24 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1088
+#: camel/camel-gpg-context.c:1128
 #, c-format
-msgid "Failed to GPG %s message: %s\n"
-msgstr "Feil ved GPG-%s av melding %s\n"
+msgid "Failed to GPG %s: %s\n"
+msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1197
+#: camel/camel-gpg-context.c:1237 camel/camel-gpg-context.c:1530
+#: camel/camel-gpg-context.c:1580
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Feil ved kjøring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1227 camel/camel-gpg-context.c:1305
-#: camel/camel-gpg-context.c:1379 camel/camel-gpg-context.c:1409
-#: camel/camel-gpg-context.c:1436 camel/camel-gpg-context.c:1466
+#: camel/camel-gpg-context.c:1267 camel/camel-gpg-context.c:1345
+#: camel/camel-gpg-context.c:1419 camel/camel-gpg-context.c:1449
+#: camel/camel-gpg-context.c:1476 camel/camel-gpg-context.c:1506
 msgid "Failed to execute gpg."
 msgstr "Feil ved kjøring av gpg."
 
-#: camel/camel-gpg-context.c:1290
+#: camel/camel-gpg-context.c:1330
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
@@ -8272,23 +8458,22 @@ msgstr "Kunne ikke låse «%s»: protokollfeil med låshjelper"
 msgid "Could not lock '%s'"
 msgstr "Kunne ikke låse «%s»"
 
-#. well, this is really only a programatic error
-#: camel/camel-lock.c:93 camel/camel-lock.c:112
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Kunne ikke opprette låsfil for %s: %s"
 
-#: camel/camel-lock.c:152
+#: camel/camel-lock.c:154
 #, c-format
 msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr "Tidsavbrudd under venting på låsfil for %s. Prøv igjen senere."
 
-#: camel/camel-lock.c:206
+#: camel/camel-lock.c:209
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Feil under låsing ved bruk av fcntl(2): %s"
 
-#: camel/camel-lock.c:268
+#: camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Feil under låsing ved bruk av flock(2): %s"
@@ -8298,51 +8483,51 @@ msgstr "Feil under låsing ved bruk av flock(2): %s"
 msgid "Could not check mail file %s: %s"
 msgstr "Kunne ikke sjekke e-post fil %s: %s"
 
-#: camel/camel-movemail.c:121
+#: camel/camel-movemail.c:120
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Kunne ikke åpne postfil %s: %s"
 
-#: camel/camel-movemail.c:129
+#: camel/camel-movemail.c:128
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Kunne ikke åpne midlertidig postfil %s: %s"
 
-#: camel/camel-movemail.c:158
+#: camel/camel-movemail.c:157
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Kunne ikke lagre post i midlertidig fil %s: %s"
 
-#: camel/camel-movemail.c:188
+#: camel/camel-movemail.c:187
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Kunne ikke opprette rør: %s"
 
-#: camel/camel-movemail.c:200
+#: camel/camel-movemail.c:199
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Kunne ikke kjøre fork: %s"
 
-#: camel/camel-movemail.c:238
+#: camel/camel-movemail.c:237
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-programmet feilet: %s"
 
-#: camel/camel-movemail.c:239
+#: camel/camel-movemail.c:238
 msgid "(Unknown error)"
 msgstr "(Ukjent feil)"
 
-#: camel/camel-movemail.c:262
+#: camel/camel-movemail.c:261
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Feil under lesing av postfil: %s"
 
-#: camel/camel-movemail.c:273
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Feil under skriving av midlertidig fil: %s"
 
-#: camel/camel-movemail.c:466 camel/camel-movemail.c:533
+#: camel/camel-movemail.c:465 camel/camel-movemail.c:532
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Feil under kopiering midlertidig meldingsfil: %s"
@@ -8359,25 +8544,25 @@ msgstr "Klarte ikke å dekryptere MIME-del: ugyldig struktur"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Klarte ikke å dekryptere MIME-del: tolkefeil"
 
-#: camel/camel-multipart-signed.c:624
+#: camel/camel-multipart-signed.c:628
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-multipart-signed.c:678
+#: camel/camel-multipart-signed.c:682
 msgid "parse error"
 msgstr "lesefeil"
 
-#: camel/camel-provider.c:131
+#: camel/camel-provider.c:132
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Kunne ikke laste %s: Modullasting er ikke støttet på dette systemet."
 
-#: camel/camel-provider.c:140
+#: camel/camel-provider.c:141
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Kunne ikke laste %s: %s"
 
-#: camel/camel-provider.c:148
+#: camel/camel-provider.c:149
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Kunne ikke laste %s: Ingen initieringskode i modulen."
@@ -8433,11 +8618,11 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av CRAM-MD5-passord, hvis "
 "tjeneren støtter det."
 
-#: camel/camel-sasl-digest-md5.c:43
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:45
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8445,41 +8630,113 @@ msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av DIGEST-MD5-passord, hvis "
 "tjeneren støtter det."
 
-#: camel/camel-sasl-digest-md5.c:810
+#: camel/camel-sasl-digest-md5.c:813
 msgid "Server challenge too long (>2048 octets)\n"
 msgstr "Spørring fra tjener for lang (>2048 oktetter)\n"
 
-#: camel/camel-sasl-digest-md5.c:819
+#: camel/camel-sasl-digest-md5.c:822
 msgid "Server challenge invalid\n"
 msgstr "Ugyldig spørring fra tjener\n"
 
-#: camel/camel-sasl-digest-md5.c:825
+#: camel/camel-sasl-digest-md5.c:828
 msgid "Server challenge contained invalid \"Quality of Protection\" token\n"
 msgstr ""
 "Spørring fra tjener inneholdt ugyldig tegn for «Kvalitet på beskyttelse»\n"
 
-#: camel/camel-sasl-digest-md5.c:847
+#: camel/camel-sasl-digest-md5.c:850
 msgid "Server response did not contain authorization data\n"
 msgstr "Svar fra tjener inneholdt ikke autorisasjonsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:865
+#: camel/camel-sasl-digest-md5.c:868
 msgid "Server response contained incomplete authorization data\n"
 msgstr "Svar fra tjener inneholdt ufullstendige autorisasjonsdata\n"
 
-#: camel/camel-sasl-digest-md5.c:875
+#: camel/camel-sasl-digest-md5.c:878
 msgid "Server response does not match\n"
 msgstr "Svar fra tjener er ikke likt\n"
 
-#: camel/camel-sasl-kerberos4.c:40
+#: camel/camel-sasl-gssapi.c:40
+msgid "GSSAPI"
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:42
+#, fuzzy
+msgid "This option will connect to the server using Kerberos 5 authentication."
+msgstr ""
+"Dette alternativet kobler til tjeneren med bruk av Kerberos 4-autentisering."
+
+#: camel/camel-sasl-gssapi.c:133
+msgid ""
+"The specified mechanism is not supported by the provided credential, or is "
+"unrecognized by the implementation."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:138
+msgid "The provided target_name parameter was ill-formed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:141
+msgid ""
+"The provided target_name parameter contained an invalid or unsupported type "
+"of name."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:145
+msgid ""
+"The input_token contains different channel bindings to those specified via "
+"the input_chan_bindings parameter."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:150
+msgid ""
+"The input_token contains an invalid signature, or a signature that could not "
+"be verified."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:154
+msgid ""
+"The supplied credentials were not valid for context initiation, or the "
+"credential handle did not reference any credentials."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:159
+msgid ""
+"Indicates that the supplied context handle did not refer to a valid context."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:163
+msgid "Indicates that consistency checks performed on the input_token failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:167
+msgid "The consistency checks performed on the credential failed."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:170
+msgid "The referenced credentials have expired."
+msgstr ""
+
+#: camel/camel-sasl-gssapi.c:177 camel/camel-sasl-gssapi.c:222
+#: camel/camel-sasl-gssapi.c:257 camel/camel-sasl-gssapi.c:273
+#: camel/camel-sasl-kerberos4.c:219
+#: camel/providers/imap/camel-imap-store.c:1052
+msgid "Bad authentication response from server."
+msgstr "Ugyldig svar på autentisering fra tjener."
+
+#: camel/camel-sasl-gssapi.c:281
+msgid "Unsupported security layer."
+msgstr "Ustøttet sikkerhetslag."
+
+#: camel/camel-sasl-kerberos4.c:41
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/camel-sasl-kerberos4.c:42
+#: camel/camel-sasl-kerberos4.c:43
 msgid "This option will connect to the server using Kerberos 4 authentication."
 msgstr ""
 "Dette alternativet kobler til tjeneren med bruk av Kerberos 4-autentisering."
 
-#: camel/camel-sasl-kerberos4.c:161
+#: camel/camel-sasl-kerberos4.c:162
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -8488,11 +8745,6 @@ msgstr ""
 "Fant ikke Kerberos-tegn:\n"
 "%s"
 
-#: camel/camel-sasl-kerberos4.c:218
-#: camel/providers/imap/camel-imap-store.c:1059
-msgid "Bad authentication response from server."
-msgstr "Ugyldig svar på autentisering fra tjener."
-
 #: camel/camel-sasl-login.c:32
 msgid "Login"
 msgstr "Login"
@@ -8542,7 +8794,7 @@ msgstr "POP før SMTP autentisering via en ukjent transport"
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP før SMTP autentisering via ikke-pop kilde"
 
-#: camel/camel-search-private.c:113
+#: camel/camel-search-private.c:114
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Kompilering av regulært uttrykk feilet: %s: %s"
@@ -8562,12 +8814,12 @@ msgstr "URL «%s» må inneholde et vertsnavn"
 msgid "URL '%s' needs a path component"
 msgstr "URL «%s» må inneholde en sti"
 
-#: camel/camel-service.c:743
+#: camel/camel-service.c:741
 #, c-format
 msgid "Resolving: %s"
 msgstr "Finner: «%s»"
 
-#: camel/camel-service.c:774 camel/camel-service.c:885
+#: camel/camel-service.c:773 camel/camel-service.c:885
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Feil i navneoppslag: %s"
@@ -8602,12 +8854,12 @@ msgstr "E-post-tilbyder for virtuelle mapper"
 msgid "For reading mail as a query of another set of folders"
 msgstr "For lesing av e-post som en spørring på et annet sett med mapper"
 
-#: camel/camel-session.c:351 camel/camel-session.c:419
+#: camel/camel-session.c:354 camel/camel-session.c:422
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ingen tilbyder tilgjengelig for protokoll «%s»"
 
-#: camel/camel-session.c:545
+#: camel/camel-session.c:548
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -8616,172 +8868,172 @@ msgstr ""
 "Kan ikke opprette katalog %s:\n"
 "%s"
 
-#: camel/camel-smime-context.c:173
+#: camel/camel-smime-context.c:171
 #, c-format
 msgid "Please enter your password for %s"
 msgstr "Vennligst skriv inn ditt passord for %s"
 
-#: camel/camel-smime-context.c:203
+#: camel/camel-smime-context.c:201
 msgid "Please indicate the nickname of a certificate to sign with."
 msgstr "Vennligst oppgi kallenavnet for et sertifikat du vil signere med."
 
-#: camel/camel-smime-context.c:209
+#: camel/camel-smime-context.c:207
 #, c-format
 msgid "The signature certificate for \"%s\" does not exist."
 msgstr "Signatursertifikatet for «%s» eksisterer ikke."
 
-#: camel/camel-smime-context.c:249
+#: camel/camel-smime-context.c:247
 #, c-format
 msgid "The encryption certificate for \"%s\" does not exist."
 msgstr "Krypteringssertifikatet for «%s» eksisterer ikke."
 
-#: camel/camel-smime-context.c:419 camel/camel-smime-context.c:430
-#: camel/camel-smime-context.c:536 camel/camel-smime-context.c:546
+#: camel/camel-smime-context.c:417 camel/camel-smime-context.c:428
+#: camel/camel-smime-context.c:534 camel/camel-smime-context.c:544
 #, c-format
 msgid "Failed to find certificate for \"%s\"."
 msgstr "Kunne ikke finne sertifikat for «%s»."
 
-#: camel/camel-smime-context.c:556
+#: camel/camel-smime-context.c:554
 msgid "Failed to find a common bulk algorithm."
 msgstr "Kunne ikke finne en vanlig bulk-algoritme."
 
-#: camel/camel-smime-context.c:810
+#: camel/camel-smime-context.c:808
 msgid "Failed to decode message."
 msgstr "Feil under dekoding av melding."
 
-#: camel/camel-smime-context.c:855
+#: camel/camel-smime-context.c:853
 msgid "Failed to verify certificates."
 msgstr "Feil under verifisering av sertifikater."
 
-#: camel/camel-store.c:244
+#: camel/camel-store.c:214
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Kan ikke finne mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:306
+#: camel/camel-store.c:268
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-tcp-stream-openssl.c:566
+#: camel/camel-tcp-stream-openssl.c:571
 msgid "Unable to get issuer's certificate"
 msgstr "Kan ikke finne utsteders sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr "Kan ikke hente liste over sertifikater som er trukket tilbake"
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:575
 msgid "Unable to decrypt certificate signature"
 msgstr "Kan ikke dekryptere sertifikatets signatur"
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 "Kan ikke dekryptere signaturen for listen over sertifikater som er trukket "
 "tilbake"
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr "Kan ikke dekode utsteders offentlige nøkkel"
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:581
 msgid "Certificate signature failure"
 msgstr "Feil med sertifikatsignatur"
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 "Feil ved signaturen til listen over sertifikater som er trukket tilbake"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr "Sertifikatet er ikke gyldig ennå"
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:587
 msgid "Certificate has expired"
 msgstr "Sertifikatet har gått ut"
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr "CRL er ikke gyldig ennå"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr "CRL har gått ut"
 
-#: camel/camel-tcp-stream-openssl.c:591
+#: camel/camel-tcp-stream-openssl.c:596
 msgid "Error in CRL"
 msgstr "Feil i CRL"
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:598
 msgid "Out of memory"
 msgstr "Ikke mer minne"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr "Selv-signert sertifikat med null-dybde"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr "Selv-signert sertifikat i kjeden"
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr "Kan ikke finne utsteders sertifikat lokalt"
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Feil under verifisering av sertifikater."
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr "Sertifikatkjeden er for lang"
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:610
 msgid "Certificate Revoked"
 msgstr "Sertifikat trukket tilbake"
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr "Ugyldig sertifikatmyndighet (CA)"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr "Stiens lengde oversteget"
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:616
 msgid "Invalid purpose"
 msgstr "Ugyldig hensikt"
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:618
 msgid "Certificate untrusted"
 msgstr "Ikke-betrodd sertifikat"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:620
 msgid "Certificate rejected"
 msgstr "Sertifikat avslått"
 
-#: camel/camel-tcp-stream-openssl.c:618
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr "Uoverenstemmelse mellom emne/utsteder"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr "Uoverenstemmelse mellom AKID/SKID"
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr "Uoverenstemmelse mellom AKID/utsteder serienummer"
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr "Bruk av nøkkel støtter ikke sertifikatsignering"
 
-#: camel/camel-tcp-stream-openssl.c:627
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr "Feil i applikasjonsverifikasjon"
 
-#: camel/camel-tcp-stream-openssl.c:694 camel/camel-tcp-stream-ssl.c:680
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:811
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -8794,15 +9046,15 @@ msgstr ""
 "Fingeravtrykk      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
 msgid "GOOD"
 msgstr "GODTATT"
 
-#: camel/camel-tcp-stream-openssl.c:700 camel/camel-tcp-stream-ssl.c:686
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:817
 msgid "BAD"
 msgstr "UGYLDIG"
 
-#: camel/camel-tcp-stream-openssl.c:702
+#: camel/camel-tcp-stream-openssl.c:707
 #, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -8822,7 +9074,7 @@ msgstr ""
 "Vil du akseptere likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:690
+#: camel/camel-tcp-stream-ssl.c:821
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -8837,7 +9089,7 @@ msgstr ""
 "\n"
 "Vil du akseptere?"
 
-#: camel/camel-tcp-stream-ssl.c:734
+#: camel/camel-tcp-stream-ssl.c:865
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -8846,7 +9098,7 @@ msgstr ""
 "Sertifikatproblem: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:786
+#: camel/camel-tcp-stream-ssl.c:917
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -8855,7 +9107,7 @@ msgstr ""
 "Ugyldig sertifikatdomene: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:804
+#: camel/camel-tcp-stream-ssl.c:935
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -8864,7 +9116,7 @@ msgstr ""
 "Sertifikatet har gått ut: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:821
+#: camel/camel-tcp-stream-ssl.c:952
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -8873,7 +9125,7 @@ msgstr ""
 "Listen over sertifikater som er trukket tilbake er gått ut: %s\n"
 "Utsteder: %s"
 
-#: camel/camel-url.c:288
+#: camel/camel-url.c:289
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL «%s»"
@@ -8888,39 +9140,39 @@ msgstr "Feil ved lagring av «%s»: %s"
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:816 camel/camel-vee-folder.c:822
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
-#: camel/camel-vee-store.c:296
+#: camel/camel-vee-store.c:262
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:319
+#: camel/camel-vee-store.c:281
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:332
+#: camel/camel-vee-store.c:294
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-vee-store.c:340
+#: camel/camel-vee-store.c:302
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Kan ikke endre navn på mappe: %s: Ingen slik mappe"
 
 #: camel/providers/imap/camel-imap-command.c:224
 #: camel/providers/imap/camel-imap-command.c:263
-#: camel/providers/imap/camel-imap-command.c:451
-#: camel/providers/imap/camel-imap-store.c:2611
+#: camel/providers/imap/camel-imap-command.c:452
+#: camel/providers/imap/camel-imap-store.c:2642
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:308
-#: camel/providers/imap/camel-imap-store.c:2614
+#: camel/providers/imap/camel-imap-store.c:2645
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -8945,52 +9197,52 @@ msgstr "Uventet svar fra IMAP-tjener: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-kommando feilet: %s"
 
-#: camel/providers/imap/camel-imap-command.c:460
+#: camel/providers/imap/camel-imap-command.c:462
 msgid "Server response ended too soon."
 msgstr "Svar fra tjener ble avsluttet for tidlig."
 
-#: camel/providers/imap/camel-imap-command.c:652
+#: camel/providers/imap/camel-imap-command.c:654
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Svar fra IMAP-tjener inneholdt ikke %s-informasjon"
 
-#: camel/providers/imap/camel-imap-command.c:688
+#: camel/providers/imap/camel-imap-command.c:690
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Uventet svar «OK» fra IMAP-tjener: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:221
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:240
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:306
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:548
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1872
+#: camel/providers/imap/camel-imap-folder.c:1873
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:218
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -8999,24 +9251,24 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1908
+#: camel/providers/imap/camel-imap-folder.c:1910
 #: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-mbox-folder.c:347
+#: camel/providers/local/camel-mbox-folder.c:351
 #: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/imap/camel-imap-folder.c:1931
-#: camel/providers/imap/camel-imap-folder.c:2527
+#: camel/providers/imap/camel-imap-folder.c:1933
+#: camel/providers/imap/camel-imap-folder.c:2529
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2191
-#: camel/providers/imap/camel-imap-folder.c:2261
+#: camel/providers/imap/camel-imap-folder.c:2193
+#: camel/providers/imap/camel-imap-folder.c:2263
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2565
+#: camel/providers/imap/camel-imap-folder.c:2567
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -9046,7 +9298,7 @@ msgstr "Ser etter nye meldinger"
 msgid "Check for new messages in all folders"
 msgstr "Se etter nye meldinger i alle mapper"
 
-#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1058
+#: camel/providers/imap/camel-imap-provider.c:48 shell/e-shell-view.c:1185
 msgid "Folders"
 msgstr "Mapper"
 
@@ -9076,7 +9328,7 @@ msgstr "For lesing og lagring av e-post på IMAP-tjenere."
 
 #: camel/providers/imap/camel-imap-provider.c:80
 #: camel/providers/nntp/camel-nntp-store.c:267
-#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:85
+#: camel/providers/pop3/camel-pop3-provider.c:69 mail/mail-config.glade.h:86
 msgid "Password"
 msgstr "Passord"
 
@@ -9096,58 +9348,57 @@ msgstr "IMAP-tjener %s"
 msgid "IMAP service for %s on %s"
 msgstr "IMAP-tjeneste for %s på %s"
 
-#: camel/providers/imap/camel-imap-store.c:584
+#: camel/providers/imap/camel-imap-store.c:587
 #: camel/providers/nntp/camel-nntp-store.c:130
 #: camel/providers/nntp/camel-nntp-store.c:148
-#: camel/providers/pop3/camel-pop3-store.c:180
+#: camel/providers/pop3/camel-pop3-store.c:183
 msgid "Connection cancelled"
 msgstr "Tilkobling avbrutt"
 
-#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/imap/camel-imap-store.c:590
 #: camel/providers/nntp/camel-nntp-store.c:133
-#: camel/providers/smtp/camel-smtp-transport.c:272
+#: camel/providers/smtp/camel-smtp-transport.c:275
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Kunne ikke koble til %s (port %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:646
-#: camel/providers/imap/camel-imap-store.c:677
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
 
-#: camel/providers/imap/camel-imap-store.c:647
-#: camel/providers/pop3/camel-pop3-store.c:213
+#: camel/providers/imap/camel-imap-store.c:650
+#: camel/providers/pop3/camel-pop3-store.c:216
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS-utvidelse er ikke støttet."
 
-#: camel/providers/imap/camel-imap-store.c:678
-#: camel/providers/pop3/camel-pop3-store.c:254
+#: camel/providers/imap/camel-imap-store.c:681
+#: camel/providers/pop3/camel-pop3-store.c:257
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: camel/providers/imap/camel-imap-store.c:1082
+#: camel/providers/imap/camel-imap-store.c:1075
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP-tjener %s støtter ikke etterspurt autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1092
-#: camel/providers/smtp/camel-smtp-transport.c:482
+#: camel/providers/imap/camel-imap-store.c:1085
+#: camel/providers/smtp/camel-smtp-transport.c:485
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ingen støtte for autentiseringstype %s"
 
-#: camel/providers/imap/camel-imap-store.c:1116
+#: camel/providers/imap/camel-imap-store.c:1108
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVennligst skriv inn IMAP-passord for %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1131
-#: camel/providers/smtp/camel-smtp-transport.c:523
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:1160
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9158,24 +9409,24 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1462
-#: camel/providers/imap/camel-imap-store.c:1604
+#: camel/providers/imap/camel-imap-store.c:1496
+#: camel/providers/imap/camel-imap-store.c:1638
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1805
+#: camel/providers/imap/camel-imap-store.c:1839
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
-#: camel/providers/imap/camel-imap-store.c:1817
+#: camel/providers/imap/camel-imap-store.c:1851
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1853
+#: camel/providers/imap/camel-imap-store.c:1887
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
@@ -9252,8 +9503,8 @@ msgstr ""
 "Kan også  brukes til å lagre et tre av mapper i Elm, Pine eller Mutt-stil."
 
 #: camel/providers/local/camel-local-store.c:139
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-spool-store.c:112
+#: camel/providers/local/camel-local-store.c:228
+#: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
@@ -9265,36 +9516,36 @@ msgstr "Lagerrot %s er ikke en vanlig katalog"
 
 #: camel/providers/local/camel-local-store.c:155
 #: camel/providers/local/camel-local-store.c:171
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:306 mail/mail-local.c:909
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:905
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:363
+#: camel/providers/local/camel-local-store.c:365
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:384
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Kunne ikke slette sammendragsfil for mappe «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:394
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Kunne ikke slette indeksfil for mappe «%s»: %s"
@@ -9304,7 +9555,7 @@ msgstr "Kunne ikke slette indeksfil for mappe «%s»: %s"
 msgid "Could not save summary: %s: %s"
 msgstr "Kunne ikke lagre sammendrag: %s: %s"
 
-#: camel/providers/local/camel-local-summary.c:454
+#: camel/providers/local/camel-local-summary.c:457
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Kunne ikke legge til melding i sammendraget: ukjent grunn"
 
@@ -9317,14 +9568,14 @@ msgstr "Operasjon for å legge til melding i maildir avbrutt"
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:234
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Ugyldig meldingsinnhold"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mh-store.c:202
-#: camel/providers/local/camel-spool-store.c:160
+#: camel/providers/local/camel-spool-store.c:164
 #, c-format
 msgid ""
 "Could not open folder `%s':\n"
@@ -9336,14 +9587,14 @@ msgstr ""
 #: camel/providers/local/camel-maildir-store.c:110
 #: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
-#: camel/providers/local/camel-spool-store.c:164
+#: camel/providers/local/camel-spool-store.c:168
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen «%s» eksisterer ikke."
 
 #: camel/providers/local/camel-maildir-store.c:117
 #: camel/providers/local/camel-mh-store.c:216
-#: camel/providers/local/camel-spool-store.c:168
+#: camel/providers/local/camel-spool-store.c:173
 #, c-format
 msgid ""
 "Could not create folder `%s':\n"
@@ -9358,68 +9609,68 @@ msgid "`%s' is not a maildir directory."
 msgstr "«%s» er ikke en maildir katalog."
 
 #: camel/providers/local/camel-maildir-store.c:167
-#: camel/providers/local/camel-maildir-store.c:204
+#: camel/providers/local/camel-maildir-store.c:205
 #: camel/providers/local/camel-mh-store.c:252
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Kunne ikke slette mappe «%s»: %s"
 
-#: camel/providers/local/camel-maildir-store.c:168
+#: camel/providers/local/camel-maildir-store.c:169
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
 #: camel/providers/local/camel-maildir-store.c:335
-#: camel/providers/local/camel-spool-store.c:282
-#: camel/providers/local/camel-spool-store.c:312
+#: camel/providers/local/camel-spool-store.c:287
+#: camel/providers/local/camel-spool-store.c:317
 #, c-format
 msgid "Could not scan folder `%s': %s"
 msgstr "Kunne ikke søke i mappe «%s»: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:416
-#: camel/providers/local/camel-maildir-summary.c:545
+#: camel/providers/local/camel-maildir-summary.c:417
+#: camel/providers/local/camel-maildir-summary.c:548
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Kan ikke åpne maildir katalogsti: %s: %s"
 
-#: camel/providers/local/camel-maildir-summary.c:539
+#: camel/providers/local/camel-maildir-summary.c:541
 msgid "Checking folder consistency"
 msgstr "Sjekker om mappen er konsistent"
 
-#: camel/providers/local/camel-maildir-summary.c:640
+#: camel/providers/local/camel-maildir-summary.c:644
 msgid "Checking for new messages"
 msgstr "Ser etter nye meldinger"
 
-#: camel/providers/local/camel-maildir-summary.c:729
-#: camel/providers/local/camel-mbox-summary.c:345
-#: camel/providers/local/camel-mbox-summary.c:583
-#: camel/providers/local/camel-mbox-summary.c:673
-#: camel/providers/local/camel-spool-summary.c:145
+#: camel/providers/local/camel-maildir-summary.c:733
+#: camel/providers/local/camel-mbox-summary.c:337
+#: camel/providers/local/camel-mbox-summary.c:580
+#: camel/providers/local/camel-mbox-summary.c:671
+#: camel/providers/local/camel-spool-summary.c:137
 msgid "Storing folder"
 msgstr "Lagrer mappe"
 
-#: camel/providers/local/camel-mbox-folder.c:158
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Kan ikke opprette mappelås på: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:215
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Kan ikke åpne postboks: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:274
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Operasjon for å legge til e-post avbrutt"
 
-#: camel/providers/local/camel-mbox-folder.c:277
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:365
-#: camel/providers/local/camel-mbox-folder.c:396
-#: camel/providers/local/camel-mbox-folder.c:404
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9428,11 +9679,11 @@ msgstr ""
 "Kan ikke hente melding: %s fra mappe %s\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:397
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Mappen ser ut til å ha blitt korrupt og kan ikke repareres."
 
-#: camel/providers/local/camel-mbox-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Oppbygging av melding feilet: Korrupt postboks?"
 
@@ -9475,70 +9726,70 @@ msgstr ""
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen «%s» er ikke tom. Ikke slettet."
 
-#: camel/providers/local/camel-mbox-summary.c:350
+#: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Kunne ikke åpne mappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:398
+#: camel/providers/local/camel-mbox-summary.c:391
 #, c-format
 msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr "Fatal feil i lesing av postboksen nær posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-mbox-summary.c:453
+#: camel/providers/local/camel-mbox-summary.c:447
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Kan ikke sjekke mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:588
-#: camel/providers/local/camel-mbox-summary.c:678
-#: camel/providers/local/camel-spool-summary.c:150
+#: camel/providers/local/camel-mbox-summary.c:585
+#: camel/providers/local/camel-mbox-summary.c:676
+#: camel/providers/local/camel-spool-summary.c:142
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Kunne ikke åpne fil %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:600
-#: camel/providers/local/camel-spool-summary.c:169
+#: camel/providers/local/camel-mbox-summary.c:597
+#: camel/providers/local/camel-spool-summary.c:162
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke åpne midlertidig postboks: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:612
-#: camel/providers/local/camel-mbox-summary.c:774
+#: camel/providers/local/camel-mbox-summary.c:610
+#: camel/providers/local/camel-mbox-summary.c:772
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:621
+#: camel/providers/local/camel-mbox-summary.c:619
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:632
+#: camel/providers/local/camel-mbox-summary.c:630
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn på mappe: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:716
-#: camel/providers/local/camel-mbox-summary.c:724
+#: camel/providers/local/camel-mbox-summary.c:714
+#: camel/providers/local/camel-mbox-summary.c:722
 #: camel/providers/local/camel-mbox-summary.c:913
 #: camel/providers/local/camel-mbox-summary.c:921
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
-#: camel/providers/local/camel-mbox-summary.c:848
-#: camel/providers/local/camel-spool-summary.c:332
+#: camel/providers/local/camel-mbox-summary.c:847
+#: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:883
+#: camel/providers/local/camel-mbox-summary.c:882
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Kunne ikke lagre mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:976
-#: camel/providers/local/camel-mbox-summary.c:1001
+#: camel/providers/local/camel-mbox-summary.c:1002
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
@@ -9562,67 +9813,67 @@ msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "«%s» er ikke en katalog."
 
-#: camel/providers/local/camel-mh-summary.c:243
+#: camel/providers/local/camel-mh-summary.c:244
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Kan ikke åpne MH-katalogsti: %s: %s"
 
-#: camel/providers/local/camel-spool-store.c:118
+#: camel/providers/local/camel-spool-store.c:122
 #, c-format
 msgid "Spool `%s' cannot be opened: %s"
 msgstr "Spool «%s» kan ikke åpnes: %s"
 
-#: camel/providers/local/camel-spool-store.c:130
+#: camel/providers/local/camel-spool-store.c:134
 #, c-format
 msgid "Spool `%s' is not a regular file or directory"
 msgstr "Spool «%s» er ikke en vanlig fil eller katalog"
 
-#: camel/providers/local/camel-spool-store.c:150
+#: camel/providers/local/camel-spool-store.c:154
 #, c-format
 msgid "Folder `%s/%s' does not exist."
 msgstr "Mappen «%s/%s» eksisterer ikke."
 
-#: camel/providers/local/camel-spool-store.c:176
+#: camel/providers/local/camel-spool-store.c:181
 #, c-format
 msgid "`%s' is not a mailbox file."
 msgstr "«%s» er ikke en postboks-fil."
 
-#: camel/providers/local/camel-spool-store.c:193
+#: camel/providers/local/camel-spool-store.c:198
 msgid "Store does not support an INBOX"
 msgstr "Lager støtter ikke en INNBOKS"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool mail file %s"
 msgstr "Spool e-post-fil %s"
 
-#: camel/providers/local/camel-spool-store.c:205
+#: camel/providers/local/camel-spool-store.c:210
 #, c-format
 msgid "Spool folder tree %s"
 msgstr "Tre av spool-mapper %s"
 
-#: camel/providers/local/camel-spool-store.c:213
+#: camel/providers/local/camel-spool-store.c:218
 msgid "Spool folders cannot be renamed"
 msgstr "Spool-mapper kan ikke være gis nytt navn"
 
-#: camel/providers/local/camel-spool-store.c:221
+#: camel/providers/local/camel-spool-store.c:226
 msgid "Spool folders cannot be deleted"
 msgstr "Spoolmapper kan ikke være slettes"
 
-#: camel/providers/local/camel-spool-summary.c:181
-#: camel/providers/local/camel-spool-summary.c:190
-#: camel/providers/local/camel-spool-summary.c:199
+#: camel/providers/local/camel-spool-summary.c:175
+#: camel/providers/local/camel-spool-summary.c:185
+#: camel/providers/local/camel-spool-summary.c:195
 #, c-format
 msgid "Could not sync temporary folder %s: %s"
 msgstr "Kunne ikke synkronisere midlertidig mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:214
+#: camel/providers/local/camel-spool-summary.c:211
 #, c-format
 msgid "Could not sync spool folder %s: %s"
 msgstr "Kunne ikke synkronisere spool-mappe %s: %s"
 
-#: camel/providers/local/camel-spool-summary.c:244
-#: camel/providers/local/camel-spool-summary.c:262
+#: camel/providers/local/camel-spool-summary.c:242
+#: camel/providers/local/camel-spool-summary.c:261
 #: camel/providers/local/camel-spool-summary.c:274
 #, c-format
 msgid ""
@@ -9705,42 +9956,42 @@ msgid "Retrieving POP summary"
 msgstr "Henter POP-sammendrag"
 
 #: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:427
-#: camel/providers/pop3/camel-pop3-folder.c:486
-#: camel/providers/pop3/camel-pop3-folder.c:503
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
 msgid "User cancelled"
 msgstr "Bruker avbrøt"
 
-#: camel/providers/pop3/camel-pop3-folder.c:264
+#: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Kan ikke hente POP-sammendrag: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:306
+#: camel/providers/pop3/camel-pop3-folder.c:308
 msgid "Expunging deleted messages"
 msgstr "Fjerner slettede meldinger"
 
-#: camel/providers/pop3/camel-pop3-folder.c:401
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ingen melding med uid %s"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:408
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-melding %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:429
-#: camel/providers/pop3/camel-pop3-folder.c:488
-#: camel/providers/pop3/camel-pop3-folder.c:495
-#: camel/providers/pop3/camel-pop3-folder.c:505
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:495
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -9757,7 +10008,7 @@ msgstr "Behold meldinger på tjeneren"
 msgid "Delete after %s day(s)"
 msgstr "Slett etter %s dag(er)"
 
-#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:84
+#: camel/providers/pop3/camel-pop3-provider.c:52 mail/mail-config.glade.h:85
 msgid "POP"
 msgstr "POP"
 
@@ -9784,25 +10035,25 @@ msgstr ""
 "passord via APOP-protokollen. Dette vil kanskje ikke virke for alle brukere "
 "selv på tjenere som hevder å støtte det."
 
-#: camel/providers/pop3/camel-pop3-store.c:183
+#: camel/providers/pop3/camel-pop3-store.c:186
 #, c-format
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Kunne ikke koble til POP-tjener %s (port %d): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:212
-#: camel/providers/pop3/camel-pop3-store.c:241
-#: camel/providers/pop3/camel-pop3-store.c:253
+#: camel/providers/pop3/camel-pop3-store.c:215
+#: camel/providers/pop3/camel-pop3-store.c:244
+#: camel/providers/pop3/camel-pop3-store.c:256
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til POP-tjener %s i sikker modus: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:351
+#: camel/providers/pop3/camel-pop3-store.c:354
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Kunne ikke koble til POP-tjener %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:392
-#: camel/providers/pop3/camel-pop3-store.c:502
+#: camel/providers/pop3/camel-pop3-store.c:395
+#: camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -9811,28 +10062,28 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s: Ingen støtte for forespurt "
 "autentiseringsmekanisme."
 
-#: camel/providers/pop3/camel-pop3-store.c:408
+#: camel/providers/pop3/camel-pop3-store.c:411
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL «%s»-login feilet for POP-tjener %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:420
+#: camel/providers/pop3/camel-pop3-store.c:423
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Kan ikke logge inn til POP-tjener %s: SASL-protokollfeil"
 
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: camel/providers/pop3/camel-pop3-store.c:442
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Kunne ikke autentisere mot POP-tjener %s: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:462
+#: camel/providers/pop3/camel-pop3-store.c:464
 #, c-format
 msgid "%sPlease enter the POP password for %s@%s"
 msgstr "%sVennligst oppgi POP-passord for %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:516
-#: camel/providers/pop3/camel-pop3-store.c:522
+#: camel/providers/pop3/camel-pop3-store.c:519
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -9841,13 +10092,13 @@ msgstr ""
 "Kunne ikke koble til POP-tjener %s.\n"
 "Feil ved oversending av passord: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:614
+#: camel/providers/pop3/camel-pop3-store.c:623
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ingen slik mappe «%s»."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-#: mail/mail-config.glade.h:109
+#: mail/mail-config.glade.h:110
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -9859,49 +10110,49 @@ msgstr ""
 "For levering av e-post ved å videresende den til «sendmail»-programmet på "
 "det lokale systemet."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:108
+#: camel/providers/sendmail/camel-sendmail-transport.c:113
 msgid "Could not parse recipient list"
 msgstr "Kunne ikke tolke mottakerliste"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:120
+#: camel/providers/sendmail/camel-sendmail-transport.c:144
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Kunne ikke opprette rør til sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:137
+#: camel/providers/sendmail/camel-sendmail-transport.c:165
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Kunne ikke kjøre fork på sendmail: %s: melding ikke sendt"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:164
+#: camel/providers/sendmail/camel-sendmail-transport.c:205
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Kunne ikke sende meldingen: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:186
+#: camel/providers/sendmail/camel-sendmail-transport.c:233
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail avsluttet med signal %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:193
+#: camel/providers/sendmail/camel-sendmail-transport.c:240
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Kunne ikke kjøre %s: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:198
+#: camel/providers/sendmail/camel-sendmail-transport.c:245
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail avsluttet med status %d: melding ikke sendt."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:212
+#: camel/providers/sendmail/camel-sendmail-transport.c:259
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:214
+#: camel/providers/sendmail/camel-sendmail-transport.c:261
 msgid "Mail delivery via the sendmail program"
 msgstr "Levering av e-post via sendmail programmet"
 
-#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:101
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:102
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -10009,40 +10260,40 @@ msgstr "Midlertidig autentiseringsfeil"
 msgid "Authentication required"
 msgstr "Autentisering kreves"
 
-#: camel/providers/smtp/camel-smtp-transport.c:295
+#: camel/providers/smtp/camel-smtp-transport.c:298
 msgid "Welcome response error"
 msgstr "Feil i velkommen-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:339
-#: camel/providers/smtp/camel-smtp-transport.c:378
+#: camel/providers/smtp/camel-smtp-transport.c:342
+#: camel/providers/smtp/camel-smtp-transport.c:381
 #, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr "Kunne ikke koble til SMTP-tjener %s i sikker modus: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:340
+#: camel/providers/smtp/camel-smtp-transport.c:343
 msgid "server does not appear to support SSL"
 msgstr "tjeneren ser ikke ut til å støtte SSL"
 
-#: camel/providers/smtp/camel-smtp-transport.c:354
+#: camel/providers/smtp/camel-smtp-transport.c:357
 #, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "Tidsavbrudd for STARTTLS-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:369
+#: camel/providers/smtp/camel-smtp-transport.c:372
 msgid "STARTTLS response error"
 msgstr "Feil i STARTTLS-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:472
+#: camel/providers/smtp/camel-smtp-transport.c:475
 #, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr "SMTP-tjener %s støtter ikke etterspurt autentiseringstype %s."
 
-#: camel/providers/smtp/camel-smtp-transport.c:510
+#: camel/providers/smtp/camel-smtp-transport.c:513
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sVennligst skriv inn SMTP-passord for %s@%s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:531
+#: camel/providers/smtp/camel-smtp-transport.c:532
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10053,82 +10304,82 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:664
+#: camel/providers/smtp/camel-smtp-transport.c:665
 #, c-format
 msgid "SMTP server %s"
 msgstr "SMTP-tjener %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:667
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP e-postlevering via %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:684
+#: camel/providers/smtp/camel-smtp-transport.c:685
 msgid "Cannot send message: sender address not valid."
 msgstr "Kan ikke sende melding: senderadresse ikke gyldig."
 
-#: camel/providers/smtp/camel-smtp-transport.c:689 mail/mail-ops.c:622
+#: camel/providers/smtp/camel-smtp-transport.c:690 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Sender melding"
 
-#: camel/providers/smtp/camel-smtp-transport.c:703
+#: camel/providers/smtp/camel-smtp-transport.c:705
 msgid "Cannot send message: no recipients defined."
 msgstr "Kan ikke sende melding: ingen mottakere definert."
 
-#: camel/providers/smtp/camel-smtp-transport.c:713
+#: camel/providers/smtp/camel-smtp-transport.c:714
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Kan ikke sende melding: en eller flere ugyldige mottakere"
 
-#: camel/providers/smtp/camel-smtp-transport.c:881
+#: camel/providers/smtp/camel-smtp-transport.c:882
 msgid "SMTP Greeting"
 msgstr "SMTP-velkomst"
 
-#: camel/providers/smtp/camel-smtp-transport.c:927
+#: camel/providers/smtp/camel-smtp-transport.c:928
 #, c-format
 msgid "HELO request timed out: %s"
 msgstr "Tidsavbrudd for HELO-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:949
+#: camel/providers/smtp/camel-smtp-transport.c:950
 msgid "HELO response error"
 msgstr "Feil i HELO-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1015
+#: camel/providers/smtp/camel-smtp-transport.c:1016
 msgid "SMTP Authentication"
 msgstr "SMTP-autentisering"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1021
+#: camel/providers/smtp/camel-smtp-transport.c:1022
 msgid "Error creating SASL authentication object."
 msgstr "Feil under oppretting av SASL-autentiseringsobjekt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1038
-#: camel/providers/smtp/camel-smtp-transport.c:1050
+#: camel/providers/smtp/camel-smtp-transport.c:1039
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "Tidsavbrudd for AUTH-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1059
+#: camel/providers/smtp/camel-smtp-transport.c:1060
 msgid "AUTH request failed."
 msgstr "AUTH-forespørsel feilet."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1120
+#: camel/providers/smtp/camel-smtp-transport.c:1121
 msgid "Bad authentication response from server.\n"
 msgstr "Ugyldig svar på autentisering fra tjener.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1145
+#: camel/providers/smtp/camel-smtp-transport.c:1146
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for «MAIL FROM»-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1165
+#: camel/providers/smtp/camel-smtp-transport.c:1166
 msgid "MAIL FROM response error"
 msgstr "Feil i «MAIL FROM»-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1189
+#: camel/providers/smtp/camel-smtp-transport.c:1190
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "Tidsavbrudd for «RCPT TO»-forespørsel: %s: melding ikke sendt"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1211
+#: camel/providers/smtp/camel-smtp-transport.c:1212
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> feilet"
@@ -10145,74 +10396,74 @@ msgstr "Tidsavbrudd for DATA-forespørsel: %s: melding ikke sendt."
 msgid "DATA response error"
 msgstr "Feil i DATA-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1313
-#: camel/providers/smtp/camel-smtp-transport.c:1336
+#: camel/providers/smtp/camel-smtp-transport.c:1314
+#: camel/providers/smtp/camel-smtp-transport.c:1337
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "Tidsavbrudd for DATA-send: meldingsterminering: %s: melding ikke sendt."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1356
+#: camel/providers/smtp/camel-smtp-transport.c:1357
 msgid "DATA termination response error"
 msgstr "Feil i DATA-termineringssvar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1379
+#: camel/providers/smtp/camel-smtp-transport.c:1380
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "Tidsavbrudd for RSET-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1399
+#: camel/providers/smtp/camel-smtp-transport.c:1400
 msgid "RSET response error"
 msgstr "Feil i RSET-svar"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1422
+#: camel/providers/smtp/camel-smtp-transport.c:1423
 #, c-format
 msgid "QUIT request timed out: %s"
 msgstr "Tidsavbrudd for QUIT-forespørsel: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1442
+#: camel/providers/smtp/camel-smtp-transport.c:1443
 msgid "QUIT response error"
 msgstr "Feil i QUIT-svar"
 
-#: composer/e-msg-composer-attachment-bar.c:107
+#: composer/e-msg-composer-attachment-bar.c:102
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-#: composer/e-msg-composer-attachment-bar.c:110
+#: composer/e-msg-composer-attachment-bar.c:105
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-#: composer/e-msg-composer-attachment-bar.c:113
+#: composer/e-msg-composer-attachment-bar.c:108
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:371 mail/mail-display.c:222
+#: composer/e-msg-composer-attachment-bar.c:365 mail/mail-display.c:223
 msgid "attachment"
 msgstr "vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:520
+#: composer/e-msg-composer-attachment-bar.c:503
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern valgte oppføringer fra vedleggslisten"
 
-#: composer/e-msg-composer-attachment-bar.c:551
+#: composer/e-msg-composer-attachment-bar.c:533
 msgid "Add attachment..."
 msgstr "Legg til vedlegg..."
 
-#: composer/e-msg-composer-attachment-bar.c:552
+#: composer/e-msg-composer-attachment-bar.c:534
 msgid "Attach a file to the message"
 msgstr "Legg en fil ved meldingen"
 
-#: composer/e-msg-composer-attachment.c:169
-#: composer/e-msg-composer-attachment.c:185
+#: composer/e-msg-composer-attachment.c:168
+#: composer/e-msg-composer-attachment.c:184
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "Kan ikke legge ved fil: %s: %s"
 
-#: composer/e-msg-composer-attachment.c:177
+#: composer/e-msg-composer-attachment.c:176
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "Kan ikke legge ved fil %s: ikke en vanlig fil"
@@ -10230,11 +10481,15 @@ msgid "MIME type:"
 msgstr "MIME-type:"
 
 #: composer/e-msg-composer-attachment.glade.h:5
-#: composer/e-msg-composer-select-file.c:163
+#: composer/e-msg-composer-select-file.c:66
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning av vedlegg"
 
-#: composer/e-msg-composer-hdrs.c:365
+#: composer/e-msg-composer-hdrs.c:289
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:479
 msgid "Click here for the address book"
 msgstr "Klikk her for å få opp adresseboken"
 
@@ -10245,45 +10500,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:400
+#: composer/e-msg-composer-hdrs.c:511
 msgid "Reply-To:"
 msgstr "Svar-til:"
 
 #.
 #. * From
 #.
-#: composer/e-msg-composer-hdrs.c:411
+#: composer/e-msg-composer-hdrs.c:522
 msgid "From:"
 msgstr "Fra:"
 
 #.
 #. * Subject
 #.
-#: composer/e-msg-composer-hdrs.c:417
+#: composer/e-msg-composer-hdrs.c:528
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:431
+#: composer/e-msg-composer-hdrs.c:542
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:432
+#: composer/e-msg-composer-hdrs.c:543
 msgid "Enter the recipients of the message"
 msgstr "Skriv inn mottakerene for meldingen"
 
-#: composer/e-msg-composer-hdrs.c:435
+#: composer/e-msg-composer-hdrs.c:546
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:436
+#: composer/e-msg-composer-hdrs.c:547
 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:439
+#: composer/e-msg-composer-hdrs.c:550
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:440
+#: composer/e-msg-composer-hdrs.c:551
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -10294,24 +10549,24 @@ msgstr ""
 #.
 #. * Post-To
 #.
-#: composer/e-msg-composer-hdrs.c:447
+#: composer/e-msg-composer-hdrs.c:558
 msgid "Post To:"
 msgstr "Post til:"
 
-#: composer/e-msg-composer-hdrs.c:449
+#: composer/e-msg-composer-hdrs.c:560
 msgid "Posting destination"
 msgstr "Destinasjon for post"
 
-#: composer/e-msg-composer-select-file.c:275
-#: ui/evolution-message-composer.xml.h:2
-msgid "Attach a file"
-msgstr "Legg ved en fil"
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+msgid "Attach file(s)"
+msgstr "Legg ved fil(er)"
 
-#: composer/e-msg-composer.c:514
+#: composer/e-msg-composer.c:530
 msgid "Could not create a PGP signature context"
 msgstr "Kunne ikke opprette PGP signaturkontekst"
 
-#: composer/e-msg-composer.c:787
+#: composer/e-msg-composer.c:809
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10320,34 +10575,30 @@ msgstr ""
 "Feil under lesing av fil %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1160
-msgid "Warning!"
-msgstr "Advarsel!"
-
-#: composer/e-msg-composer.c:1164
+#: composer/e-msg-composer.c:1172
 msgid "File exists, overwrite?"
 msgstr "Filen eksisterer, overskriv?"
 
-#: composer/e-msg-composer.c:1187
+#: composer/e-msg-composer.c:1190
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:1207
+#: composer/e-msg-composer.c:1213
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:1240
+#: composer/e-msg-composer.c:1248
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Feil under tilgang til fil: %s"
 
-#: composer/e-msg-composer.c:1248
+#: composer/e-msg-composer.c:1256
 msgid "Unable to retrieve message from editor"
 msgstr "Kunne ikke hente melding fra editor"
 
-#: composer/e-msg-composer.c:1255
+#: composer/e-msg-composer.c:1263
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10356,7 +10607,7 @@ msgstr ""
 "Kunne ikke søke i fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1262
+#: composer/e-msg-composer.c:1270
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10365,7 +10616,16 @@ msgstr ""
 "Kunne ikke kutte av fil: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1279
+#, fuzzy, c-format
+msgid ""
+"Unable to copy file descriptor: %s\n"
+"%s"
+msgstr ""
+"Kunne ikke søke i fil: %s\n"
+"%s"
+
+#: composer/e-msg-composer.c:1288
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10374,7 +10634,7 @@ msgstr ""
 "Feil under autolagring av av melding: %s:\n"
 " %s"
 
-#: composer/e-msg-composer.c:1371
+#: composer/e-msg-composer.c:1382
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10382,7 +10642,7 @@ msgstr ""
 "Ximian Evolution har funnet ikke-lagrede filer fra en tidligere sesjon.\n"
 "Vil du prøve å gjenopprette dem?"
 
-#: composer/e-msg-composer.c:1525
+#: composer/e-msg-composer.c:1544
 #, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10393,27 +10653,32 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:1536
+#: composer/e-msg-composer.c:1549
+msgid "_Discard Changes"
+msgstr ""
+
+#: composer/e-msg-composer.c:1553
 msgid "Warning: Modified Message"
 msgstr "Advarsel: Endret melding"
 
-#: composer/e-msg-composer.c:1569
+#: composer/e-msg-composer.c:1585
 msgid "Open file"
 msgstr "Åpne fil"
 
-#: composer/e-msg-composer.c:1927
+#: composer/e-msg-composer.c:1943
 msgid "Signature:"
 msgstr "Signatur:"
 
-#: composer/e-msg-composer.c:1968 mail/mail-account-gui.c:1231
+#: composer/e-msg-composer.c:1983 mail/mail-account-gui.c:1255
 msgid "Autogenerated"
 msgstr "Generert automatisk"
 
-#: composer/e-msg-composer.c:2155 composer/e-msg-composer.c:2779
+#: composer/e-msg-composer.c:2162 composer/e-msg-composer.c:2761
+#: composer/e-msg-composer.c:2762
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:2796
+#: composer/e-msg-composer.c:2793
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10421,7 +10686,7 @@ msgstr ""
 "Kunne ikke opprette vindu for ny melding:\n"
 "Klarte ikke å aktivere kontroll for adressevelger."
 
-#: composer/e-msg-composer.c:2822
+#: composer/e-msg-composer.c:2819
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -10441,7 +10706,7 @@ msgstr ""
 "Kunne ikke opprette skrivevindu:\n"
 "Klarte ikke å aktivere HTML-redigeringskomponenten."
 
-#: composer/e-msg-composer.c:3858
+#: composer/e-msg-composer.c:3895
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10449,18 +10714,6 @@ msgstr ""
 "<b>(Redigering inneholder en meldingskropp som ikke er tekst, og derfor ikke "
 "kan redigeres.)<b>"
 
-#: composer/evolution-composer.c:393
-msgid ""
-"Could not create composer window, because you have not yet\n"
-"configured any identities in the mail component."
-msgstr ""
-"Kunne ikke opprette skrivevindu fordi du ikke har satt\n"
-"opp en identitet i e-post-komponenten."
-
-#: composer/evolution-composer.c:408
-msgid "Cannot initialize the Evolution composer."
-msgstr "Kan ikke initiere Evolutions meldingsredigerer."
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Gruppevaresuiten Evolution"
@@ -10509,8 +10762,106 @@ msgstr "Emne inneholder"
 msgid "Subject does not contain"
 msgstr "Emne inneholder ikke"
 
-#: e-util/e-dialog-utils.c:237 mail/mail-callbacks.c:2537
-#: mail/mail-display.c:192
+#: designs/OOA/ooa.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:4
+#, fuzzy
+msgid "<b>Out of Office Message:</b>"
+msgstr "Ute"
+
+#: designs/OOA/ooa.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>Status:</b> "
+
+#: designs/OOA/ooa.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:8
+msgid "I am currently in the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:9
+msgid "I am currently out of the office"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:10
+msgid "No, Don't Change Status"
+msgstr ""
+
+#: designs/OOA/ooa.glade.h:12
+#, fuzzy
+msgid "Out of Office Assistant"
+msgstr "Ute"
+
+#: designs/OOA/ooa.glade.h:13
+msgid "Yes, Change Status"
+msgstr "Ja, endre status"
+
+#: designs/read_receipts/read.glade.h:1
+msgid "      "
+msgstr "      "
+
+#: 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
+msgid "<b>Sending Email:</b>"
+msgstr "<b>Utgående e-post:</b>"
+
+#: 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"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:6
+msgid "Always send back a read reciept"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:7
+msgid "Ask me if I want to send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:8
+msgid "Never send back a read receipt"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:9
+msgid "Read Receipts"
+msgstr "Lesekvittering"
+
+#: designs/read_receipts/read.glade.h:10
+msgid "Request a read receipt for all messages I send"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:11
+msgid "Unless the message is sent to a mailing list, and not to me personally"
+msgstr ""
+
+#: designs/read_receipts/read.glade.h:12
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
+msgstr ""
+
+#: e-util/e-component-listener.c:128
+msgid ""
+"ping_timeout_callback: could not determine if the CORBA object is nil or not"
+msgstr ""
+
+#: e-util/e-dialog-utils.c:230
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -10518,208 +10869,204 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-passwords.c:363
+#: e-util/e-passwords.c:345
 msgid "Remember this password"
 msgstr "Husk dette passordet"
 
-#: e-util/e-passwords.c:365
+#: e-util/e-passwords.c:347
 msgid "Remember this password for the remainder of this session"
 msgstr "Husk dette passordet for resten av denne sesjonen"
 
-#: e-util/e-pilot-settings.c:96
+#: e-util/e-pilot-settings.c:93
 msgid "Sync Private Records:"
 msgstr "Synkroniser private oppføringer:"
 
-#: e-util/e-pilot-settings.c:105
+#: e-util/e-pilot-settings.c:102
 msgid "Sync Categories:"
 msgstr "Synkroniser kategorier"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
+#: e-util/e-time-utils.c:171 e-util/e-time-utils.c:384
 msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%a %d.%m.%Y %I:%M %p"
+msgstr "%a %d.%m.%Y %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
+#: e-util/e-time-utils.c:176 e-util/e-time-utils.c:375
 msgid "%a %m/%d/%Y %H:%M"
-msgstr "%a %d.%m.%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:182
+#: e-util/e-time-utils.c:181
 msgid "%a %m/%d/%Y %I %p"
-msgstr "%a %d.%m.%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:187
+#: e-util/e-time-utils.c:186
 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:198
+#: e-util/e-time-utils.c:197
 msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%d.%m.%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:202
+#: e-util/e-time-utils.c:201
 msgid "%m/%d/%Y %H:%M:%S"
-msgstr "%d.%m.%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:207
+#: e-util/e-time-utils.c:206
 msgid "%m/%d/%Y %I:%M %p"
-msgstr "%d.%m.%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:212
+#: e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %H:%M"
-msgstr "%d.%m.%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:217
+#: e-util/e-time-utils.c:216
 msgid "%m/%d/%Y %I %p"
-msgstr "%d.%m.%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:222
+#: e-util/e-time-utils.c:221
 msgid "%m/%d/%Y %H"
 msgstr "%d.%m.%Y %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
+#: e-util/e-time-utils.c:325 e-util/e-time-utils.c:424
 msgid "%I:%M:%S %p"
-msgstr "%I:%M:%S %p"
+msgstr "%H.%M.%S"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
+#: e-util/e-time-utils.c:329 e-util/e-time-utils.c:416
 msgid "%H:%M:%S"
-msgstr "%H:%M:%S"
+msgstr "%H.%M.%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
-#: widgets/misc/e-dateedit.c:1420 widgets/misc/e-dateedit.c:1632
+#: e-util/e-time-utils.c:334 e-util/e-time-utils.c:421
+#: widgets/misc/e-dateedit.c:1430 widgets/misc/e-dateedit.c:1643
 msgid "%I:%M %p"
-msgstr "%I:%M %p"
+msgstr "%H.%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1629
+#: e-util/e-time-utils.c:338 e-util/e-time-utils.c:413
+#: widgets/misc/e-dateedit.c:1427 widgets/misc/e-dateedit.c:1640
 msgid "%H:%M"
-msgstr "%H:%M"
+msgstr "%H.%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:343
+#: e-util/e-time-utils.c:342
 msgid "%I %p"
-msgstr "%I %p"
+msgstr "%H"
 
-#: filter/filter-datespec.c:70 filter/filter.glade.h:24
+#: filter/filter-datespec.c:65 filter/filter.glade.h:24
 #: mail/mail-config.glade.h:181
 msgid "seconds"
 msgstr " sekunder"
 
-#: filter/filter-datespec.c:71
+#: filter/filter-datespec.c:66
 msgid "minute"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:72
+#: filter/filter-datespec.c:67
 msgid "hour"
 msgstr "time"
 
-#: filter/filter-datespec.c:74
+#: filter/filter-datespec.c:69
 msgid "week"
 msgstr "uke"
 
-#: filter/filter-datespec.c:74 filter/filter.glade.h:29
+#: filter/filter-datespec.c:69 filter/filter.glade.h:29
 msgid "weeks"
 msgstr "uker"
 
-#: filter/filter-datespec.c:75
+#: filter/filter-datespec.c:70
 msgid "month"
 msgstr "måned"
 
-#: filter/filter-datespec.c:75 filter/filter.glade.h:23
+#: filter/filter-datespec.c:70 filter/filter.glade.h:23
 msgid "months"
 msgstr "måneder"
 
-#: filter/filter-datespec.c:76
+#: filter/filter-datespec.c:71
 msgid "year"
 msgstr "år"
 
-#: filter/filter-datespec.c:76 filter/filter.glade.h:33
+#: filter/filter-datespec.c:71 filter/filter.glade.h:33
 msgid "years"
 msgstr "år"
 
-#: filter/filter-datespec.c:174
+#: filter/filter-datespec.c:176
 msgid "You must choose a date."
 msgstr "Du må velge en dato."
 
-#: filter/filter-datespec.c:269
+#: filter/filter-datespec.c:275
 msgid "<click here to select a date>"
 msgstr "<klikk her for å velge en dato>"
 
-#: filter/filter-datespec.c:272 filter/filter-datespec.c:283
+#: filter/filter-datespec.c:278 filter/filter-datespec.c:289
 msgid "now"
 msgstr "nå"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: filter/filter-datespec.c:279
+#: filter/filter-datespec.c:285
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y"
 
 #. 1 (minute|day|...) ago (singular time ago)
-#: filter/filter-datespec.c:292 filter/filter-datespec.c:295
+#: filter/filter-datespec.c:298 filter/filter-datespec.c:301
 #, c-format
 msgid "%d %s ago"
 msgstr "%d %s siden"
 
-#: filter/filter-datespec.c:407
+#: filter/filter-datespec.c:417
 msgid "Select a time to compare against"
 msgstr "Velg en tid å sammenligne mot"
 
-#: filter/filter-editor.c:132 filter/filter.glade.h:4
+#: filter/filter-editor.c:114 filter/filter.glade.h:4
 msgid "Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter-file.c:178
-msgid "You must specify a file name"
-msgstr "Du må spesifisere et filnavn"
+#: filter/filter-file.c:166
+msgid "You must specify a file name."
+msgstr "Du må oppgi et filnavn."
 
-#: filter/filter-file.c:190
+#: filter/filter-file.c:184
 #, c-format
 msgid "File '%s' does not exist or is not a regular file."
 msgstr "Fil «%s» eksisterer ikke eller er ikke en vanlig fil"
 
-#: filter/filter-file.c:307
+#: filter/filter-file.c:293
 msgid "Choose a file"
 msgstr "Velg en fil"
 
 #. and now for the action area
-#: filter/filter-filter.c:513
+#: filter/filter-filter.c:491
 msgid "Then"
 msgstr "Så"
 
-#: filter/filter-filter.c:527
-msgid "Add action"
-msgstr "Legg til handling"
-
-#: filter/filter-folder.c:149
-msgid "You must specify a folder.\n"
-msgstr "Du må spesifisere en mappe.\n"
+#: filter/filter-folder.c:155
+msgid "You must specify a folder."
+msgstr "Du må oppgi en mappe."
 
-#: filter/filter-folder.c:236 filter/vfolder-rule.c:391
-#: mail/mail-account-gui.c:1464 mail/mail-account-gui.c:1478
+#: filter/filter-folder.c:243 filter/vfolder-rule.c:408
+#: mail/mail-account-gui.c:1504 mail/mail-account-gui.c:1518
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: filter/filter-input.c:200
+#: filter/filter-input.c:191
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -10728,74 +11075,70 @@ msgstr ""
 "Feil i regulært uttrykk «%s»:\n"
 "%s"
 
-#: filter/filter-label.c:136 filter/libfilter-i18n.h:26 mail/mail-config.c:68
-#: mail/mail-config.glade.h:62
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:68
+#: mail/mail-config.glade.h:64
 msgid "Important"
 msgstr "Viktig"
 
 #. red
-#: filter/filter-label.c:137 mail/mail-config.c:69
+#: filter/filter-label.c:122 mail/mail-config.c:69
 #: mail/mail-config.glade.h:133
 msgid "Work"
 msgstr "Arbeid"
 
 #. orange
-#: filter/filter-label.c:138 mail/mail-config.c:70 mail/mail-config.glade.h:86
+#: filter/filter-label.c:123 mail/mail-config.c:70 mail/mail-config.glade.h:87
 msgid "Personal"
 msgstr "Personlig"
 
 #. forest green
-#: filter/filter-label.c:139 mail/mail-config.c:71
+#: filter/filter-label.c:124 mail/mail-config.c:71
 #: mail/mail-config.glade.h:124
 msgid "To Do"
 msgstr "Oppgaver"
 
 #. blue
-#: filter/filter-label.c:140 mail/mail-config.c:72 mail/mail-config.glade.h:66
+#: filter/filter-label.c:125 mail/mail-config.c:72 mail/mail-config.glade.h:68
 msgid "Later"
 msgstr "Senere"
 
-#: filter/filter-part.c:545 shell/evolution-test-component.c:49
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:223
+#: filter/filter-rule.c:219
 msgid "You must name this filter."
 msgstr "Du må gi navn til dette filteret."
 
-#: filter/filter-rule.c:764
+#: filter/filter-rule.c:751
 msgid "Rule name: "
 msgstr "Regelnavn: "
 
-#: filter/filter-rule.c:768
+#: filter/filter-rule.c:755
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: filter/filter-rule.c:785
+#: filter/filter-rule.c:772
 msgid "If"
 msgstr "Hvis"
 
-#: filter/filter-rule.c:803
+#: filter/filter-rule.c:790
 msgid "Execute actions"
 msgstr "Utfør handlinger"
 
-#: filter/filter-rule.c:807
+#: filter/filter-rule.c:794
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:812
+#: filter/filter-rule.c:799
 msgid "if any criteria are met"
 msgstr "hvis ethvert kriterie er møtt"
 
-#: filter/filter-rule.c:823
-msgid "Add criterion"
-msgstr "Legg til kriterie"
-
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "incoming"
 msgstr "innkommende"
 
-#: filter/filter-rule.c:908
+#: filter/filter-rule.c:894
 msgid "outgoing"
 msgstr "utgående"
 
@@ -10843,7 +11186,7 @@ msgstr ""
 "Meldingens dato vil bli sammenlignet med\n"
 "tiden da filtreringen skjer."
 
-#: filter/filter.glade.h:13 filter/vfolder-editor.c:130
+#: filter/filter.glade.h:13 filter/vfolder-editor.c:114
 msgid "Virtual Folders"
 msgstr "Virtuelle mapper"
 
@@ -10905,277 +11248,291 @@ msgid "Beep"
 msgstr "Pip"
 
 #: filter/libfilter-i18n.h:7
-msgid "contains"
-msgstr "inneholder"
-
-#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopier til mappe"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:8
 msgid "Date received"
 msgstr "Dato mottatt"
 
-#: filter/libfilter-i18n.h:10
+#: filter/libfilter-i18n.h:9
 msgid "Date sent"
 msgstr "Dato sendt"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Deleted"
 msgstr "Slettet"
 
+#: filter/libfilter-i18n.h:12
+msgid "Do Not Exist"
+msgstr "Eksisterer ikke"
+
 #: filter/libfilter-i18n.h:13
-msgid "does not contain"
-msgstr "inneholder ikke"
+msgid "Draft"
+msgstr "Skisse"
 
 #: filter/libfilter-i18n.h:14
-msgid "does not end with"
-msgstr "slutter ikke med"
+msgid "Exist"
+msgstr "Eksisterer"
 
 #: filter/libfilter-i18n.h:15
-msgid "does not exist"
-msgstr "eksisterer ikke"
+msgid "Expression"
+msgstr "Uttrykk"
 
 #: filter/libfilter-i18n.h:16
-msgid "does not return"
-msgstr "returnerer ikke"
-
-#: filter/libfilter-i18n.h:17
-msgid "does not sound like"
-msgstr "ligner ikke"
+msgid "Follow Up"
+msgstr "Følg opp"
 
-#: filter/libfilter-i18n.h:18
-msgid "does not start with"
-msgstr "starter ikke med"
+#: filter/libfilter-i18n.h:18 mail/folder-browser.c:1778
+msgid "Label"
+msgstr "Etikett"
 
 #: filter/libfilter-i18n.h:19
-msgid "Do Not Exist"
-msgstr "Eksisterer ikke"
+msgid "Mailing list"
+msgstr "E-postliste"
 
 #: filter/libfilter-i18n.h:20
-msgid "Draft"
-msgstr "Skisse"
+msgid "Message Body"
+msgstr "Meldingskropp"
 
 #: filter/libfilter-i18n.h:21
-msgid "ends with"
-msgstr "slutter med"
+msgid "Message Header"
+msgstr "Meldingshode"
 
 #: filter/libfilter-i18n.h:22
-msgid "Exist"
-msgstr "Eksisterer"
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
 
 #: filter/libfilter-i18n.h:23
-msgid "exists"
-msgstr "eksisterer"
+msgid "Pipe Message to Shell Command"
+msgstr "Kjør melding gjennom en skall-kommando"
 
 #: filter/libfilter-i18n.h:24
-msgid "Expression"
-msgstr "Uttrykk"
+msgid "Play Sound"
+msgstr "Spill lyd"
 
-#: filter/libfilter-i18n.h:25
-msgid "Follow Up"
-msgstr "Følg opp"
+#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+msgid "Read"
+msgstr "Les"
+
+#: filter/libfilter-i18n.h:26
+msgid "Recipients"
+msgstr "Mottakere"
 
 #: filter/libfilter-i18n.h:27
-msgid "is"
-msgstr "er"
+msgid "Regex Match"
+msgstr "Treff på vanlig uttrykk"
 
 #: filter/libfilter-i18n.h:28
-msgid "is after"
-msgstr "er etter"
+msgid "Replied to"
+msgstr "Svart til"
 
-#: filter/libfilter-i18n.h:29
-msgid "is before"
-msgstr "er før"
+#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Gi poeng"
 
-#: filter/libfilter-i18n.h:30
-msgid "is Flagged"
-msgstr "er merket"
+#: filter/libfilter-i18n.h:30 mail/mail-callbacks.c:1823
+msgid "Sender"
+msgstr "Avsender"
 
 #: filter/libfilter-i18n.h:31
-msgid "is greater than"
-msgstr "er større enn"
+msgid "Set Status"
+msgstr "Sett status"
 
 #: filter/libfilter-i18n.h:32
-msgid "is less than"
-msgstr "er mindre enn"
+msgid "Shell Command"
+msgstr "Skall-kommando"
 
 #: filter/libfilter-i18n.h:33
-msgid "is not"
-msgstr "er ikke"
+msgid "Size (kB)"
+msgstr "Størrelse (kB)"
 
 #: filter/libfilter-i18n.h:34
-msgid "is not Flagged"
-msgstr "er ikke merket"
-
-#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1766
-msgid "Label"
-msgstr "Etikett"
+msgid "Source Account"
+msgstr "Kildekonto"
 
-#: filter/libfilter-i18n.h:36
-msgid "Mailing list"
-msgstr "E-postliste"
+#: filter/libfilter-i18n.h:35
+msgid "Specific header"
+msgstr "Spesifikk header"
 
 #: filter/libfilter-i18n.h:37
-msgid "Message Body"
-msgstr "Meldingskropp"
+msgid "Stop Processing"
+msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:38
-msgid "Message Header"
-msgstr "Meldingshode"
+#: filter/libfilter-i18n.h:38 mail/mail-format.c:903
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
+#: mail/message-tags.glade.h:4
+msgid "Subject"
+msgstr "Emne"
 
 #: filter/libfilter-i18n.h:39
-msgid "Move to Folder"
-msgstr "Flytt til mappe"
+msgid "Unset Status"
+msgstr "Nullstill status"
 
 #: filter/libfilter-i18n.h:40
-msgid "Pipe Message to Shell Command"
-msgstr "Kjør melding gjennom en skall-kommando"
+msgid "contains"
+msgstr "inneholder"
 
 #: filter/libfilter-i18n.h:41
-msgid "Play Sound"
-msgstr "Spill lyd"
+msgid "does not contain"
+msgstr "inneholder ikke"
 
-#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:60
-msgid "Read"
-msgstr "Les"
+#: filter/libfilter-i18n.h:42
+msgid "does not end with"
+msgstr "slutter ikke med"
 
 #: filter/libfilter-i18n.h:43
-msgid "Recipients"
-msgstr "Mottakere"
+msgid "does not exist"
+msgstr "eksisterer ikke"
 
 #: filter/libfilter-i18n.h:44
-msgid "Regex Match"
-msgstr "Treff på vanlig uttrykk"
+msgid "does not return"
+msgstr "returnerer ikke"
 
 #: filter/libfilter-i18n.h:45
-msgid "Replied to"
-msgstr "Svart til"
+msgid "does not sound like"
+msgstr "ligner ikke"
 
 #: filter/libfilter-i18n.h:46
-msgid "returns"
-msgstr "returnerer"
+msgid "does not start with"
+msgstr "starter ikke med"
 
 #: filter/libfilter-i18n.h:47
-msgid "returns greater than"
-msgstr "returnerer større enn"
+msgid "ends with"
+msgstr "slutter med"
 
 #: filter/libfilter-i18n.h:48
-msgid "returns less than"
-msgstr "returnerer mindre enn"
+msgid "exists"
+msgstr "eksisterer"
 
-#: filter/libfilter-i18n.h:49 filter/score-rule.c:204 filter/score-rule.c:206
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Gi poeng"
+#: filter/libfilter-i18n.h:49
+msgid "is Flagged"
+msgstr "er merket"
 
-#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1831
-msgid "Sender"
-msgstr "Avsender"
+#: filter/libfilter-i18n.h:50
+msgid "is after"
+msgstr "er etter"
 
 #: filter/libfilter-i18n.h:51
-msgid "Set Status"
-msgstr "Sett status"
+msgid "is before"
+msgstr "er før"
 
 #: filter/libfilter-i18n.h:52
-msgid "Shell Command"
-msgstr "Skall-kommando"
+msgid "is greater than"
+msgstr "er større enn"
 
 #: filter/libfilter-i18n.h:53
-msgid "Size (kB)"
-msgstr "Størrelse (kB)"
+msgid "is less than"
+msgstr "er mindre enn"
 
 #: filter/libfilter-i18n.h:54
-msgid "sounds like"
-msgstr "lyder som"
+msgid "is not Flagged"
+msgstr "er ikke merket"
 
 #: filter/libfilter-i18n.h:55
-msgid "Source Account"
-msgstr "Kildekonto"
+msgid "is not"
+msgstr "er ikke"
 
 #: filter/libfilter-i18n.h:56
-msgid "Specific header"
-msgstr "Spesifikk header"
+msgid "is"
+msgstr "er"
 
 #: filter/libfilter-i18n.h:57
-msgid "starts with"
-msgstr "starter med"
+msgid "returns greater than"
+msgstr "returnerer større enn"
+
+#: filter/libfilter-i18n.h:58
+msgid "returns less than"
+msgstr "returnerer mindre enn"
 
 #: filter/libfilter-i18n.h:59
-msgid "Stop Processing"
-msgstr "Stopp behandling"
+msgid "returns"
+msgstr "returnerer"
 
-#: filter/libfilter-i18n.h:60 mail/mail-format.c:935
-#: mail/message-list.etspec.h:13 mail/message-tags.glade.h:4
-msgid "Subject"
-msgstr "Emne"
+#: filter/libfilter-i18n.h:60
+msgid "sounds like"
+msgstr "lyder som"
 
 #: filter/libfilter-i18n.h:61
-msgid "Unset Status"
-msgstr "Nullstill status"
+msgid "starts with"
+msgstr "starter med"
 
-#: filter/rule-editor.c:180
+#: filter/rule-editor.c:170
 msgid "Rules"
 msgstr "Regler"
 
-#: filter/rule-editor.c:239 filter/rule-editor.c:335
+#: filter/rule-editor.c:241 filter/rule-editor.c:325
 #, c-format
-msgid "Rule name '%s' is not unique, choose another"
-msgstr "Regelnavn «%s» er ikke unikt. Velg et annet navn"
+msgid "Rule name '%s' is not unique, choose another."
+msgstr "Regelnavn «%s» er ikke unikt. Velg et annet navn."
 
-#: filter/rule-editor.c:299
+#: filter/rule-editor.c:291
 msgid "Add Rule"
 msgstr "Legg til regel"
 
-#: filter/rule-editor.c:388
+#: filter/rule-editor.c:372
 msgid "Edit Rule"
 msgstr "Rediger regel"
 
-#: filter/score-editor.c:130
+#: filter/rule-editor.c:689
+msgid "Rule name"
+msgstr "Regelnavn"
+
+#: filter/score-editor.c:114
 msgid "Score Rules"
 msgstr "Poengregler"
 
-#: filter/vfolder-rule.c:206
+#: filter/vfolder-rule.c:208
 msgid "You must name this vfolder."
 msgstr "Du må gi navn til denne vfolderen."
 
-#: filter/vfolder-rule.c:215
+#: filter/vfolder-rule.c:222
 msgid "You need to to specify at least one folder as a source."
 msgstr "Du må spesifisere minst en mappe som kilde."
 
-#: importers/elm-importer.c:95
+#: filter/vfolder-rule.c:492
+msgid "VFolder source"
+msgstr "VFolder-kilde"
+
+#: importers/elm-importer.c:95 mail/importers/elm-importer.c:103
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
 
 #: importers/elm-importer.c:96 importers/netscape-importer.c:1228
-#: importers/pine-importer.c:101
+#: importers/pine-importer.c:101 mail/importers/elm-importer.c:104
+#: mail/importers/netscape-importer.c:1237 mail/importers/pine-importer.c:114
 msgid "Importing..."
 msgstr "Importerer..."
 
 #: importers/elm-importer.c:98 importers/netscape-importer.c:1230
-#: importers/pine-importer.c:103
+#: importers/pine-importer.c:103 mail/importers/elm-importer.c:106
+#: mail/importers/netscape-importer.c:1239 mail/importers/pine-importer.c:116
 msgid "Please wait"
 msgstr "Vennligst vent"
 
 #: importers/elm-importer.c:169 importers/netscape-importer.c:1808
-#: importers/pine-importer.c:365
+#: importers/pine-importer.c:365 mail/importers/elm-importer.c:183
+#: mail/importers/netscape-importer.c:1794 mail/importers/pine-importer.c:330
 #, c-format
 msgid "Importing %s as %s"
 msgstr "Importerer %s som %s"
 
 #: importers/elm-importer.c:375 importers/netscape-importer.c:1917
-#: importers/pine-importer.c:471
+#: importers/pine-importer.c:471 mail/importers/elm-importer.c:389
+#: mail/importers/netscape-importer.c:1906 mail/importers/pine-importer.c:439
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker i %s"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:102
-#: mail/folder-browser-ui.c:353
+#: importers/pine-importer.c:637 mail/component-factory.c:114
+#: mail/folder-browser-ui.c:357 mail/importers/elm-importer.c:523
+#: mail/importers/netscape-importer.c:2104 mail/importers/pine-importer.c:586
 msgid "Mail"
 msgstr "Post"
 
-#: importers/elm-importer.c:545
+#: importers/elm-importer.c:545 mail/importers/elm-importer.c:544
 msgid ""
 "Evolution has found Elm mail files\n"
 "Would you like to import them into Evolution?"
@@ -11183,7 +11540,7 @@ msgstr ""
 "Evolution har funnet Elm e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/elm-importer.c:574
+#: importers/elm-importer.c:574 mail/importers/elm-importer.c:565
 msgid "Elm"
 msgstr "Elm"
 
@@ -11195,12 +11552,12 @@ msgstr ""
 "Evolution har funnet GnomeCard filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/netscape-importer.c:70
+#: importers/netscape-importer.c:70 mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: importers/netscape-importer.c:653
+#: importers/netscape-importer.c:653 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"
@@ -11215,7 +11572,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: importers/netscape-importer.c:677
+#: importers/netscape-importer.c:677 mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -11223,7 +11580,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: importers/netscape-importer.c:694
+#: importers/netscape-importer.c:694 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"
@@ -11232,37 +11589,39 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: importers/netscape-importer.c:1227
+#: importers/netscape-importer.c:1227 mail/importers/netscape-importer.c:1236
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
 #. Fill in the new fields
-#: importers/netscape-importer.c:1872 mail/mail-ops.c:1101
-#: shell/e-local-storage.c:183
+#: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1861
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Søppel"
 
-#: importers/netscape-importer.c:2028
+#: importers/netscape-importer.c:2028 mail/importers/netscape-importer.c:2014
 msgid "Scanning mail filters"
 msgstr "Skanner e-postfiltre"
 
 #: importers/netscape-importer.c:2038 importers/pine-importer.c:570
+#: mail/importers/netscape-importer.c:2025 mail/importers/pine-importer.c:534
 msgid "Scanning directory"
 msgstr "Søker i katalog"
 
-#: importers/netscape-importer.c:2047
+#: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2034
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Starter import"
 
-#: importers/netscape-importer.c:2133
+#: importers/netscape-importer.c:2133 mail/importers/netscape-importer.c:2109
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: importers/netscape-importer.c:2138
+#: importers/netscape-importer.c:2138 mail/importers/netscape-importer.c:2114
 msgid "Mail Filters"
 msgstr "E-post filtre"
 
-#: importers/netscape-importer.c:2161
+#: importers/netscape-importer.c:2161 mail/importers/netscape-importer.c:2138
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -11270,11 +11629,11 @@ msgstr ""
 "Evolution har funnet Netscape e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:100
+#: importers/pine-importer.c:100 mail/importers/pine-importer.c:113
 msgid "Evolution is importing your old Pine data"
 msgstr "Evolution importerer gammel e-post fra Pine"
 
-#: importers/pine-importer.c:663
+#: importers/pine-importer.c:663 mail/importers/pine-importer.c:613
 msgid ""
 "Evolution has found Pine mail files.\n"
 "Would you like to import them into Evolution?"
@@ -11282,125 +11641,118 @@ msgstr ""
 "Evolution har funnet Pine e-post filer.\n"
 "Vil du importere dem til Evolution?"
 
-#: importers/pine-importer.c:691
+#: importers/pine-importer.c:691 mail/importers/pine-importer.c:632
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Configuration control for the Evolution Display Fonts."
 msgstr "Konfigurasjonskontroll for Evolution skjermskrifter."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configuration control for the Evolution Mail Accounts."
 msgstr "Konfigurasjonskontroll for Evolution e-post-konti."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configuration control for the Evolution Mailer."
 msgstr "Konfigurasjonskontroll for Evolution e-posthåndterer."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configuration control for the Evolution Message Composer."
 msgstr "Konfigurasjonskontroll for Evolution meldingsredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 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.oaf.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Configure the fonts used by Evolution here"
 msgstr "Konfigurer skrifter for Evolution her"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Configure your email accounts here"
 msgstr "Konfigurer e-post-kontoer her"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution component for handling mail."
 msgstr "Evolution komponent for håndtering av e-post."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:11
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution mail composer."
 msgstr "Evolutions e-postredigering."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
 msgid "Evolution mail executive summary component."
 msgstr "Evolution e-post komponent for sammendrag."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:13
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Evolution mail folder display component."
 msgstr "Evolution komponent for e-post mappevisning."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:14
-msgid "Evolution mail folder factory component."
-msgstr "Evolution komponent for e-postmappe factory."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:15
-msgid "Factory for the Evolution composer."
-msgstr "Factory for Evolution meldingsredigering."
-
-#: mail/GNOME_Evolution_Mail.oaf.in.h:16
-msgid "Factory for the Mail Summary component."
-msgstr "Factory for e-post sammendrag komponent."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+#, fuzzy
+msgid "Factory for the controls exported by the Evolution Mailer"
+msgstr "Konfigurasjonskontroll for Evolution e-posthåndterer."
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:17
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
 msgid "Font Preferences"
 msgstr "Brukervalg for skrift"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:18
+#: mail/GNOME_Evolution_Mail.server.in.in.h:16
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:19 mail/mail-config.glade.h:69
+#: mail/GNOME_Evolution_Mail.server.in.in.h:17 mail/mail-config.glade.h:71
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
-#: mail/GNOME_Evolution_Mail.oaf.in.h:20
+#: mail/GNOME_Evolution_Mail.server.in.in.h:18
 msgid "Mail configuration interface"
 msgstr "Grensesnitt for e-post-konfigurasjon"
 
-#: mail/component-factory.c:102
+#: mail/component-factory.c:114
 msgid "Folder containing mail"
 msgstr "Mappe som inneholder e-post"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:115
 msgid "Public Mail"
 msgstr "Offentlig e-post"
 
-#: mail/component-factory.c:103
+#: mail/component-factory.c:115
 msgid "Public folder containing mail"
 msgstr "Offentlig mappe som inneholder e-post"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:116
 msgid "Virtual Trash"
 msgstr "Virtuell søppel"
 
-#: mail/component-factory.c:104
+#: mail/component-factory.c:116
 msgid "Virtual Trash folder"
 msgstr "Virtuelle søppelmappe"
 
-#: mail/component-factory.c:132
+#: mail/component-factory.c:144
 msgid "This folder cannot contain messages."
 msgstr "Denne mappen kan ikke inneholde meldinger."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:438
 msgid "Properties..."
 msgstr "Egenskaper ..."
 
-#: mail/component-factory.c:427
+#: mail/component-factory.c:438
 msgid "Change this folder's properties"
 msgstr "Endre denne mappens egenskaper"
 
-#: mail/component-factory.c:805
+#: mail/component-factory.c:822
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -11408,264 +11760,248 @@ msgstr ""
 "Noen av dine innstillinger for e-post ser ut til å være korrupt. Vennligst "
 "sjekk at alt er i orden."
 
-#: mail/component-factory.c:970
+#: mail/component-factory.c:997
 msgid "You have not set a mail transport method"
 msgstr "Du har ikke satt en transportmetode for e-post"
 
-#: mail/component-factory.c:992
+#: mail/component-factory.c:1021
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Du har usendte meldinger, vil du avslutte likevel?"
 
-#: mail/component-factory.c:998
-msgid "Warning: Unsent Messages"
-msgstr "Advarsel: Usendte meldinger"
-
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1061
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/component-factory.c:1040
+#: mail/component-factory.c:1061
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/component-factory.c:1041
+#: mail/component-factory.c:1062
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1070
 msgid "New Message Post"
 msgstr "Ny publisering av melding"
 
-#: mail/component-factory.c:1049
+#: mail/component-factory.c:1070
 msgid "_Post Message"
 msgstr "_Publiser melding"
 
-#: mail/component-factory.c:1050
+#: mail/component-factory.c:1071
 msgid "Post a new mail message"
 msgstr "Publiser en ny e-postmelding"
 
-#: mail/component-factory.c:1078
-msgid "Cannot initialize the Evolution mail component."
-msgstr "Kan ikke initiere Evolutions e-postkomponent."
-
-#: mail/component-factory.c:1087
-msgid "Cannot initialize Evolution's mail config component."
-msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
-
-#: mail/component-factory.c:1093
-msgid "Cannot initialize Evolution's folder info component."
-msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
-
-#: mail/component-factory.c:1334 mail/component-factory.c:1364
+#: mail/component-factory.c:1354
 msgid "Connecting..."
 msgstr "Kobler til..."
 
-#: mail/component-factory.c:1375
+#: mail/component-factory.c:1365
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere lagring i skallet"
 
-#: mail/folder-browser-ui.c:471
+#: mail/folder-browser-ui.c:483
 #, c-format
 msgid "Properties for \"%s\""
 msgstr "Egenskaper for «%s»"
 
-#: mail/folder-browser-ui.c:473
+#: mail/folder-browser-ui.c:485
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: mail/folder-browser.c:309 mail/mail-display.c:376 mail/mail-display.c:888
+#: mail/folder-browser.c:327 mail/mail-display.c:391 mail/mail-display.c:920
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Kunne ikke opprette midlertidig katalog: %s"
 
-#: mail/folder-browser.c:764
+#: mail/folder-browser.c:782
 #, c-format
 msgid "%d new"
 msgstr "%d nye"
 
-#: mail/folder-browser.c:767 mail/folder-browser.c:775
-#: mail/folder-browser.c:778
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
 msgid ", "
 msgstr ", "
 
-#: mail/folder-browser.c:769
+#: mail/folder-browser.c:787
 #, c-format
 msgid "%d hidden"
 msgstr "%d skjulte"
 
-#: mail/folder-browser.c:771
+#: mail/folder-browser.c:789
 #, c-format
 msgid "%d visible"
 msgstr "%d synlig"
 
-#: mail/folder-browser.c:776
+#: mail/folder-browser.c:794
 #, c-format
 msgid "%d selected"
 msgstr "%d valgt"
 
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:799
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/folder-browser.c:783
+#: mail/folder-browser.c:801
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/folder-browser.c:785
+#: mail/folder-browser.c:803
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/folder-browser.c:1118
+#: mail/folder-browser.c:1167
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe fra søk..."
 
-#: mail/folder-browser.c:1702
+#: mail/folder-browser.c:1714
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/folder-browser.c:1703
+#: mail/folder-browser.c:1715
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/folder-browser.c:1704
+#: mail/folder-browser.c:1716
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/folder-browser.c:1705
+#: mail/folder-browser.c:1717
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/folder-browser.c:1709
+#: mail/folder-browser.c:1721
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/folder-browser.c:1710
+#: mail/folder-browser.c:1722
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/folder-browser.c:1711
+#: mail/folder-browser.c:1723
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/folder-browser.c:1712 mail/folder-browser.c:2035
+#: mail/folder-browser.c:1724 mail/folder-browser.c:2048
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
-#: mail/folder-browser.c:1730
+#: mail/folder-browser.c:1742
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/folder-browser.c:1732
+#: mail/folder-browser.c:1744
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/folder-browser.c:1736 ui/evolution-mail-message.xml.h:110
+#: mail/folder-browser.c:1748 ui/evolution-mail-message.xml.h:110
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/folder-browser.c:1737 ui/evolution-mail-message.xml.h:75
+#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:75
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/folder-browser.c:1738 ui/evolution-mail-message.xml.h:74
+#: mail/folder-browser.c:1750 ui/evolution-mail-message.xml.h:74
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/folder-browser.c:1739
+#: mail/folder-browser.c:1751
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/folder-browser.c:1743
+#: mail/folder-browser.c:1755
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/folder-browser.c:1744
+#: mail/folder-browser.c:1756
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/folder-browser.c:1745
+#: mail/folder-browser.c:1757
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
 #. separator here?
-#: mail/folder-browser.c:1749 ui/evolution-mail-message.xml.h:43
+#: mail/folder-browser.c:1761 ui/evolution-mail-message.xml.h:43
 msgid "Mar_k as Read"
 msgstr "Mer_k som lest"
 
-#: mail/folder-browser.c:1750
+#: mail/folder-browser.c:1762
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/folder-browser.c:1751
+#: mail/folder-browser.c:1763
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/folder-browser.c:1752
+#: mail/folder-browser.c:1764
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/folder-browser.c:1757
+#: mail/folder-browser.c:1769
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/folder-browser.c:1761
+#: mail/folder-browser.c:1773
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/folder-browser.c:1762 ui/evolution-addressbook.xml.h:31
+#: mail/folder-browser.c:1774 ui/evolution-addressbook.xml.h:31
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/folder-browser.c:1770
+#: mail/folder-browser.c:1782
 msgid "Add Sender to Address_book"
 msgstr "Legg til sender i adresse_bok"
 
-#: mail/folder-browser.c:1774
+#: mail/folder-browser.c:1786
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/folder-browser.c:1778
+#: mail/folder-browser.c:1790
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/folder-browser.c:2036
+#: mail/folder-browser.c:2049
 msgid "VFolder on M_ailing List"
 msgstr "VFolder på _e-postliste"
 
-#: mail/folder-browser.c:2038
+#: mail/folder-browser.c:2051
 #, c-format
 msgid "Filter on _Mailing List (%s)"
 msgstr "Filtrer _på e-postliste (%s)"
 
-#: mail/folder-browser.c:2039
+#: mail/folder-browser.c:2052
 #, c-format
 msgid "VFolder on M_ailing List (%s)"
 msgstr "VFolder _på e-postliste (%s)"
 
-#: mail/folder-browser.h:26 mail/mail-config.glade.h:38
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:40
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/folder-info.c:71
+#: mail/folder-info.c:70
 msgid "Getting Folder Information"
 msgstr "Henter mappeinformasjon"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:1
 msgid "Factory to import mbox into Evolution"
 msgstr "Factory for å importere mbox til Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Mbox_Importer.server.in.in.h:2
 msgid "Imports mbox files into Evolution"
 msgstr "Importerer mbox-filer til Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:1
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:1
 msgid "Factory to import Outlook Express 4 mails into Evolution"
 msgstr "Factory for å importere Outlook Express 4-meldinger til Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Outlook_Importer.server.in.in.h:2
 msgid "Imports Outlook Express 4 files into Evolution"
 msgstr "Importerer Outlook Express 4-filer til Evolution"
 
@@ -11703,97 +12039,96 @@ msgstr "mbox"
 msgid "mh"
 msgstr "mh"
 
-#: mail/mail-account-editor.c:106
+#: mail/mail-account-editor.c:102
 msgid "You have not filled in all of the required information."
 msgstr "Du har ikke fylt ut all nødvendig informasjon."
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:159
+#: mail/mail-account-editor.c:146
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:743 mail/mail-config.glade.h:157
+#: mail/mail-account-gui.c:752 mail/mail-config.glade.h:157
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:747 mail/mail-config.glade.h:127
+#: mail/mail-account-gui.c:756 mail/mail-config.glade.h:127
 msgid "User_name:"
 msgstr "Bruker_navn:"
 
-#: mail/mail-account-gui.c:751 mail/mail-config.glade.h:164
+#: mail/mail-account-gui.c:760 mail/mail-config.glade.h:164
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-account-gui.c:1847
+#: mail/mail-account-gui.c:1881
 msgid "You may not create two accounts with the same name."
 msgstr "Du kan ikke opprette to kontoer med samme navn."
 
-#: mail/mail-accounts.c:224
+#: mail/mail-accounts.c:231
 msgid "Are you sure you want to delete this account?"
 msgstr "Er du sikker på at du vil slette denne kontoen?"
 
-#: mail/mail-accounts.c:228
+#: mail/mail-accounts.c:239
 msgid "Don't delete"
 msgstr "Ikke slett"
 
-#: mail/mail-accounts.c:231
-msgid "Really delete account?"
-msgstr "Vil du virkelig slette kontoen?"
-
-#: mail/mail-accounts.c:367 mail/mail-accounts.c:401
-#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:677
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:391
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: mail/mail-accounts.c:369 mail/mail-accounts.c:403
-#: mail/mail-composer-prefs.c:650 mail/mail-composer-prefs.c:675
-#: mail/mail-composer-prefs.c:707
+#: mail/mail-accounts.c:312 mail/mail-accounts.c:351 mail/mail-accounts.c:393
+#: mail/mail-composer-prefs.c:648 mail/mail-composer-prefs.c:666
 msgid "Enable"
 msgstr "Aktiver"
 
-#: mail/mail-accounts.c:531 mail/mail-accounts.etspec.h:2
-#: mail/mail-config.glade.h:53
+#. translators: default account indicator
+#: mail/mail-accounts.c:433
+msgid "[Default]"
+msgstr "[Forvalg]"
+
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:809
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: mail/mail-accounts.c:532 mail/mail-accounts.etspec.h:1
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/mail-accounts.c:533 mail/mail-accounts.etspec.h:3
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/mail-autofilter.c:78
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Send til %s"
 
-#: mail/mail-autofilter.c:242
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:258
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:275
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:327
+#: mail/mail-autofilter.c:323
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-autofilter.c:376
+#: mail/mail-autofilter.c:372
 msgid "The following filter rule(s):\n"
 msgstr "Følgende filter-regel/regler:\n"
 
-#: mail/mail-autofilter.c:382
+#: mail/mail-autofilter.c:378
 #, c-format
 msgid ""
 "Used the removed folder:\n"
@@ -11804,7 +12139,12 @@ msgstr ""
 "    «%s»\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-callbacks.c:154
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:102 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Ikke vis denne meldingen igjen."
+
+#: mail/mail-callbacks.c:191
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -11816,7 +12156,15 @@ msgstr ""
 "motta eller skrive meldinger.\n"
 "Vil du konfigurere den nå?"
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:213
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Du må konfigurere en konto\n"
+"før du kan skrive meldinger."
+
+#: mail/mail-callbacks.c:227
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -11824,7 +12172,7 @@ msgstr ""
 "Du må konfigurere en identitet\n"
 "før du kan skrive e-post."
 
-#: mail/mail-callbacks.c:217
+#: mail/mail-callbacks.c:234
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -11833,7 +12181,7 @@ msgstr ""
 "før du kan skrive e-post."
 
 #. FIXME: this wording sucks
-#: mail/mail-callbacks.c:255
+#: mail/mail-callbacks.c:256
 msgid ""
 "You are sending an HTML-formatted message. Please make sure that\n"
 "the following recipients are willing and able to receive HTML mail:\n"
@@ -11841,11 +12189,11 @@ msgstr ""
 "Du sender en melding i HMTL-format. Sjekk at følgende mottakere\n"
 "kan og vil motta e-post som HTML:\n"
 
-#: mail/mail-callbacks.c:270
+#: mail/mail-callbacks.c:268
 msgid "Send anyway?"
 msgstr "Send likevel?"
 
-#: mail/mail-callbacks.c:312
+#: mail/mail-callbacks.c:289
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -11853,7 +12201,7 @@ msgstr ""
 "Denne meldingen har ikke emne.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:356
+#: mail/mail-callbacks.c:315
 msgid ""
 "Since the contact list you are sending to is configured to hide the list's "
 "addresses, this message will contain only Bcc recipients."
@@ -11861,11 +12209,11 @@ msgstr ""
 "Siden kontaktlisten du sender til er konfigurert til å skjule listens "
 "adresser vil denne meldingen kun inneholde Bcc mottakere."
 
-#: mail/mail-callbacks.c:360
+#: mail/mail-callbacks.c:319
 msgid "This message contains only Bcc recipients."
 msgstr "Denne meldingen inneholder kun Bcc mottakere."
 
-#: mail/mail-callbacks.c:364
+#: mail/mail-callbacks.c:324
 msgid ""
 "It is possible that the mail server may reveal the recipients by adding an "
 "Apparently-To header.\n"
@@ -11875,11 +12223,11 @@ msgstr ""
 "«Apparently-To»-header.\n"
 "Send likevel?"
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:472
 msgid "You must specify recipients in order to send this message."
 msgstr "Du må spesifisere mottakere for å kunne sende denne meldingen."
 
-#: mail/mail-callbacks.c:777
+#: mail/mail-callbacks.c:727
 msgid ""
 "Unable to open the drafts folder for this account.\n"
 "Would you like to use the default drafts folder?"
@@ -11887,28 +12235,28 @@ msgstr ""
 "Kunne ikke åpne skisse-mappen for denne kontoen.\n"
 "Vil du bruke standard skisse-mappe?"
 
-#: mail/mail-callbacks.c:1207
+#: mail/mail-callbacks.c:1192
 msgid "an unknown sender"
 msgstr "en ukjent avsender"
 
-#: mail/mail-callbacks.c:1211
+#: mail/mail-callbacks.c:1196
 msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
+msgstr "%a, %d.%m.%Y kl. %H.%M skrev %%s:"
 
-#: mail/mail-callbacks.c:1712 mail/message-browser.c:132
+#: mail/mail-callbacks.c:1703 mail/message-browser.c:143
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:1714 mail/message-browser.c:134
+#: mail/mail-callbacks.c:1705 mail/message-browser.c:145
 msgid "Copy message(s) to"
 msgstr "Kopier melding(er) til"
 
-#: mail/mail-callbacks.c:2381
+#: mail/mail-callbacks.c:2349
 #, c-format
 msgid "Are you sure you want to edit all %d messages?"
 msgstr "Er du sikker på at du vil redigere alle %d meldingene?"
 
-#: mail/mail-callbacks.c:2406
+#: mail/mail-callbacks.c:2365
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -11916,7 +12264,7 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:2445
+#: mail/mail-callbacks.c:2398
 msgid ""
 "You may only resend messages\n"
 "in the Sent folder."
@@ -11924,43 +12272,46 @@ msgstr ""
 "Du kan kun sende meldinger på nytt\n"
 "som er lagret i sendt-katalogen."
 
-#: mail/mail-callbacks.c:2459
+#: mail/mail-callbacks.c:2408
 #, c-format
 msgid "Are you sure you want to resend all %d messages?"
 msgstr "Er du sikker på at du vil sende alle %d meldingene på nytt?"
 
-#: mail/mail-callbacks.c:2485
+#: mail/mail-callbacks.c:2429
 msgid "No Message Selected"
 msgstr "Ingen melding valgt"
 
-#: mail/mail-callbacks.c:2530 mail/mail-display.c:188
-msgid "Overwrite file?"
-msgstr "Overskriv fil?"
+#: mail/mail-callbacks.c:2470
+#, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Kan ikke lagre til «%s»\n"
+" %s"
+
+#: mail/mail-callbacks.c:2475
+#, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"«%s» eksisterer allerede\n"
+"Vil du overskrive den?"
 
-#: mail/mail-callbacks.c:2584
+#: mail/mail-callbacks.c:2516
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:2586
+#: mail/mail-callbacks.c:2518
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:2655
-msgid "Go to next folder with unread messages?"
-msgstr "Gå til neste mappe med uleste meldinger?"
-
-#: mail/mail-callbacks.c:2662
-msgid ""
-"There are no more new messages in this folder.\n"
-"Would you like to go to the next folder?"
-msgstr ""
-"Ingen flere nye meldinger i denne mappen.\n"
-"Vil du gå til neste mappe?"
-
-#: mail/mail-callbacks.c:2905
+#: mail/mail-callbacks.c:2686
+#, fuzzy
 msgid ""
-"This operation will permanently erase all messages marked as deleted. If you "
-"continue, you will not be able to recover these messages.\n"
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
 "\n"
 "Really erase these messages?"
 msgstr ""
@@ -11969,7 +12320,7 @@ msgstr ""
 "\n"
 "Vil du virkelig slette disse meldingene?"
 
-#: mail/mail-callbacks.c:3018
+#: mail/mail-callbacks.c:2772
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -11978,62 +12329,58 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:3030
+#: mail/mail-callbacks.c:2780
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/mail-callbacks.c:3074
+#: mail/mail-callbacks.c:2822
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/mail-callbacks.c:3129
+#: mail/mail-callbacks.c:2878
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:3156
-msgid "US-Letter"
-msgstr "US-letter"
-
-#: mail/mail-callbacks.c:3197
+#: mail/mail-callbacks.c:2945
 msgid "Printing of message failed"
 msgstr "Feil under utskrift av melding"
 
-#: mail/mail-callbacks.c:3387
+#: mail/mail-callbacks.c:3135
 #, c-format
 msgid "Are you sure you want to open all %d messages in separate windows?"
 msgstr "Er du sikker på at du vil åpne alle %d meldingene i separate vinduer?"
 
-#: mail/mail-composer-prefs.c:223
-msgid ""
-"Please specify signature filename\n"
-"in Andvanced section of signature settings."
-msgstr ""
-"Vennligst oppgi filnavn for signatur\n"
-"under avanserte innstillinger for signaturer."
+#: mail/mail-composer-prefs.c:225 mail/mail-composer-prefs.c:326
+#: mail/mail-config.c:1218
+msgid "Unnamed"
+msgstr "Uten navn"
 
-#: mail/mail-composer-prefs.c:243 mail/mail-composer-prefs.c:368
-#: mail/mail-composer-prefs.c:416
-msgid " [script]"
-msgstr " [skript]"
+#: mail/mail-composer-prefs.c:311
+msgid "You must specify a valid script name."
+msgstr "Du må oppgi et gyldig navn på skriptet."
 
-#: mail/mail-composer-prefs.c:309
-msgid "Please specify a valid script name"
-msgstr "Vennligst spesifiser et gyldig navn på skriptet"
+#: mail/mail-composer-prefs.c:367 mail/mail-composer-prefs.c:429
+msgid "[script]"
+msgstr "[skript]"
 
-#: mail/mail-composer-prefs.c:325 mail/mail-config.c:2629
-msgid "Unnamed"
-msgstr "Uten navn"
+#: mail/mail-composer-prefs.c:813
+msgid "Language(s)"
+msgstr "Språk"
 
-#: mail/mail-composer-prefs.c:875
+#: mail/mail-composer-prefs.c:855
 msgid "Add script signature"
 msgstr "Legg til skriptsignatur"
 
-#: mail/mail-composer-prefs.c:876
-msgid "Add Signature"
-msgstr "Legg til signatur"
+#: mail/mail-composer-prefs.c:875
+msgid "Signature(s)"
+msgstr "Signatur(er)"
+
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:63
+msgid "Identity"
+msgstr "Identitet"
 
-#: mail/mail-config-druid.c:146
+#: mail/mail-config-druid.c:382
 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 "
@@ -12043,7 +12390,12 @@ msgstr ""
 "under må ikke nødvendigvis fylles ut, hvis du ikke ønsker å inkludere denne "
 "informasjonen i meldingene du sender."
 
-#: mail/mail-config-druid.c:148
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
+#, fuzzy
+msgid "Receiving Mail"
+msgstr "_Mottak av e-post"
+
+#: mail/mail-config-druid.c:390
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
@@ -12052,11 +12404,16 @@ msgstr ""
 "Hvis du ikke er sikker, kontakt din systemadministrator eller Internett "
 "tjenestetilbyder."
 
-#: mail/mail-config-druid.c:150
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Vennligst velg mellom følgende alternativer"
 
-#: mail/mail-config-druid.c:152
+#: mail/mail-config-druid.c:400
+#, fuzzy
+msgid "Sending Mail"
+msgstr "Ut_sending av e-post"
+
+#: mail/mail-config-druid.c:402
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -12064,7 +12421,11 @@ 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-druid.c:154
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
+msgid "Account Management"
+msgstr "Håndtering av konti"
+
+#: mail/mail-config-druid.c:409
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
 "incoming mail server and outgoing mail transport method which you provided "
@@ -12078,419 +12439,397 @@ msgstr ""
 "et navn for denne kontoen i feltet under. Dette navnet blir kun brukt for "
 "visning på skjermen."
 
-#. set window title
-#: mail/mail-config-druid.c:637
-msgid "Evolution Account Assistant"
-msgstr "Evolution kontoassistent"
-
-#: mail/mail-config.c:622
-#, c-format
-msgid "Account %d"
-msgstr "Konto %d"
-
-#: mail/mail-config.c:2316
+#: mail/mail-config.c:922
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:2394 mail/mail-config.c:2398
+#: mail/mail-config.c:1000 mail/mail-config.c:1004
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
-#: mail/mail-config.glade.h:1
+#: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Søk etter støttede typer"
 
-#: mail/mail-config.glade.h:2
+#: mail/mail-config.glade.h:4
 msgid "(SSL is not supported in this build of Evolution)"
 msgstr "(SSL er ikke støttet i denne versjonen av Evolution)"
 
-#: mail/mail-config.glade.h:3
+#: mail/mail-config.glade.h:5
 msgid "(SSL is not supported in this build of evolution)"
 msgstr "(SSL er ikke støttet i denne versjonen av evolution)"
 
-#: mail/mail-config.glade.h:4
+#: mail/mail-config.glade.h:7
 msgid "A_lways encrypt to myself when sending encrypted mail"
 msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:5
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZzÆæØøÅå"
-
-#: mail/mail-config.glade.h:6
+#: mail/mail-config.glade.h:8
 msgid "Account Editor"
 msgstr "Kontoredigering"
 
-#: mail/mail-config.glade.h:7
+#: mail/mail-config.glade.h:9
 msgid "Account Information"
 msgstr "Kontoinformasjon"
 
-#: mail/mail-config.glade.h:8 shell/glade/evolution-startup-wizard.glade.h:1
-msgid "Account Management"
-msgstr "Håndtering av konti"
-
-#: mail/mail-config.glade.h:9
+#: mail/mail-config.glade.h:11
 msgid "Add Sc_ript"
 msgstr "Legg til sk_ript"
 
-#: mail/mail-config.glade.h:10
+#: mail/mail-config.glade.h:12
 msgid "Add new signature..."
 msgstr "Legg til ny signatur..."
 
-#: mail/mail-config.glade.h:11
+#: mail/mail-config.glade.h:13
 msgid "Al_ways encrypt to myself when sending encrypted mail"
 msgstr "A_lltid krypter til meg selv ved sending av kryptert e-post"
 
-#: mail/mail-config.glade.h:13
+#: mail/mail-config.glade.h:15
 msgid "Alwa_ys sign outgoing messages when using this account"
 msgstr "Alltid signer _utgående meldinger når denne kontoen brukes"
 
-#: mail/mail-config.glade.h:15
+#: mail/mail-config.glade.h:17
 msgid "Always _blind carbon-copy (Bcc) to:"
 msgstr "Alltid _blind karbonkopi (Bcc) til:"
 
-#: mail/mail-config.glade.h:16
+#: mail/mail-config.glade.h:18
 msgid "Always _carbon-copy (Cc) to:"
 msgstr "Alltid _karbonkopi (Cc) til:"
 
-#: mail/mail-config.glade.h:17
+#: mail/mail-config.glade.h:19
 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:18
+#: mail/mail-config.glade.h:20
 msgid "Attach original message"
 msgstr "Legg ved opprinnelig melding"
 
-#: mail/mail-config.glade.h:19 mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:21 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Vedlegg"
 
-#: mail/mail-config.glade.h:20
+#: mail/mail-config.glade.h:22
 msgid "Authentication"
 msgstr "Autentisering"
 
-#: mail/mail-config.glade.h:21
+#: mail/mail-config.glade.h:23
 msgid "Automatically _detect links"
 msgstr "Finn _lenker automatisk"
 
-#: mail/mail-config.glade.h:22
+#: mail/mail-config.glade.h:24
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisk (ISO-8859-13)"
 
-#: mail/mail-config.glade.h:23
+#: mail/mail-config.glade.h:25
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisk (ISO-8859-4)"
 
-#: mail/mail-config.glade.h:24
+#: mail/mail-config.glade.h:26
 msgid "C_haracter set:"
 msgstr "Te_gnsett:"
 
-#: mail/mail-config.glade.h:25
+#: mail/mail-config.glade.h:27
 msgid "C_olors"
 msgstr "F_arger"
 
-#: mail/mail-config.glade.h:26
+#: mail/mail-config.glade.h:28
 msgid "Check spelling while I _type"
 msgstr "Sjekk s_taving mens jeg skriver"
 
-#: mail/mail-config.glade.h:27
+#: mail/mail-config.glade.h:29
 msgid "Checking for New Mail"
 msgstr "Ser etter nye meldinger"
 
-#: mail/mail-config.glade.h:28
+#: mail/mail-config.glade.h:30
 msgid "Color for _misspelled words:"
 msgstr "_Farge for feilstavede ord:"
 
-#: mail/mail-config.glade.h:29
+#: mail/mail-config.glade.h:31
 msgid "Composing Messages"
 msgstr "Skriver meldinger"
 
-#: mail/mail-config.glade.h:30
+#: mail/mail-config.glade.h:32
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: mail/mail-config.glade.h:31
+#: mail/mail-config.glade.h:33
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
 "You are now ready to send and receive email \n"
 "using Evolution. \n"
 "\n"
-"Click \"Finish\" to save your settings."
+"Click \"Apply\" to save your settings."
 msgstr ""
 "Gratulerer, din e-post-konfigurasjon er nå fullført.\n"
 "\n"
 "Du kan nå sende og motta e-post \n"
 "med Evolution.\n"
 "\n"
-"Klikk «Fullfør» for å lagre dine innstillinger"
+"Klikk «Fullfør» for å lagre dine innstillinger."
 
-#: mail/mail-config.glade.h:37
+#: mail/mail-config.glade.h:39
 msgid "De_fault"
 msgstr "_Forvalgt"
 
-#: mail/mail-config.glade.h:39
+#: mail/mail-config.glade.h:41
 msgid "Default Behavior"
 msgstr "Forvalgt oppførsel"
 
-#: mail/mail-config.glade.h:40
+#: mail/mail-config.glade.h:42
 msgid "Default character _encoding:"
 msgstr "Forvalgt t_egnkoding:"
 
-#: mail/mail-config.glade.h:41
+#: mail/mail-config.glade.h:43
 msgid "Deleting Mail"
 msgstr "Sletter meldinger"
 
-#: mail/mail-config.glade.h:43
+#: mail/mail-config.glade.h:45
 msgid "Digital IDs..."
 msgstr "Digitale IDer..."
 
-#: mail/mail-config.glade.h:44
+#: mail/mail-config.glade.h:46
 msgid "Do not quote original message"
 msgstr "Ikke siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:45
+#: mail/mail-config.glade.h:47
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ikke signer _møteforespørsler (for kompatibilitet med Outlook)"
 
-#: mail/mail-config.glade.h:46 shell/glade/evolution-startup-wizard.glade.h:2
+#: mail/mail-config.glade.h:48 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Ferdig"
 
-#: mail/mail-config.glade.h:47
+#: mail/mail-config.glade.h:49
 msgid "Drafts _folder:"
 msgstr "Mappe _for skisser:"
 
-#: mail/mail-config.glade.h:48
+#: mail/mail-config.glade.h:50
 msgid "E_nable"
 msgstr "A_ktiver"
 
-#: mail/mail-config.glade.h:49
+#: mail/mail-config.glade.h:51
 msgid "Emacs"
 msgstr "Emacs"
 
-#: mail/mail-config.glade.h:50
+#: mail/mail-config.glade.h:52
 msgid "Email Accounts"
 msgstr "E-post kontoer"
 
-#: mail/mail-config.glade.h:51
+#: mail/mail-config.glade.h:53
 msgid "Email _address:"
 msgstr "E-post _adresse:"
 
-#: mail/mail-config.glade.h:52
+#: mail/mail-config.glade.h:54
 msgid "Empty _trash folders on exit"
 msgstr "_Tøm søppelkurven ved slutt"
 
-#: mail/mail-config.glade.h:54
+#: mail/mail-config.glade.h:55
+msgid "Evolution Account Assistant"
+msgstr "Evolution kontoassistent"
+
+#: mail/mail-config.glade.h:56
 msgid "Execute Command..."
 msgstr "Kjør kommando..."
 
-#: mail/mail-config.glade.h:55
+#: mail/mail-config.glade.h:57
 msgid "Fi_xed -width:"
 msgstr "Fast _bredde:"
 
-#: mail/mail-config.glade.h:56
+#: mail/mail-config.glade.h:58
 msgid "Font Properties"
 msgstr "Egenskaper for skrift"
 
-#: mail/mail-config.glade.h:57
+#: mail/mail-config.glade.h:59
 msgid "Format messages in _HTML"
 msgstr "Formater meldinger med _HTML"
 
-#: mail/mail-config.glade.h:58
+#: mail/mail-config.glade.h:60
 msgid "Get Digital ID..."
 msgstr "Hent digital ID..."
 
-#: mail/mail-config.glade.h:59
+#: mail/mail-config.glade.h:61
 msgid "Highlight _quotations with"
 msgstr "_Merk sitering med"
 
-#: mail/mail-config.glade.h:60
+#: mail/mail-config.glade.h:62
 msgid "IMAPv4 "
 msgstr "IMAPv4"
 
-#: mail/mail-config.glade.h:61 shell/glade/evolution-startup-wizard.glade.h:4
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config.glade.h:63
+#: mail/mail-config.glade.h:65
 msgid "Inline"
 msgstr "Inline"
 
-#: mail/mail-config.glade.h:64
+#: mail/mail-config.glade.h:66
 msgid "Kerberos "
 msgstr "Kerberos "
 
-#: mail/mail-config.glade.h:65
+#: mail/mail-config.glade.h:67
 msgid "Labels and Colors"
 msgstr "Etiketter og farger"
 
-#: mail/mail-config.glade.h:67
+#: mail/mail-config.glade.h:69
 msgid "Loading Images"
 msgstr "Laster bilder"
 
-#: mail/mail-config.glade.h:68
+#: mail/mail-config.glade.h:70
 msgid "Mail Configuration"
 msgstr "E-post-konfigurasjon"
 
-#: mail/mail-config.glade.h:70
+#: mail/mail-config.glade.h:72
 msgid "Mailbox location"
 msgstr "Plassering av postboks"
 
-#: mail/mail-config.glade.h:71
+#: mail/mail-config.glade.h:73
 msgid "Message Composer"
 msgstr "Meldingsredigering"
 
-#: mail/mail-config.glade.h:72
+#: mail/mail-config.glade.h:74
 msgid "Message Display"
 msgstr "Meldingsvisning"
 
-#: mail/mail-config.glade.h:73
+#: mail/mail-config.glade.h:75
 msgid "Microsoft"
 msgstr "Microsoft"
 
-#: mail/mail-config.glade.h:76
+#: mail/mail-config.glade.h:77
 msgid "New Mail Notification"
 msgstr "Melding om ny e-post"
 
-#: mail/mail-config.glade.h:78
+#: mail/mail-config.glade.h:79
 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:79
+#: mail/mail-config.glade.h:80
 msgid "On Screen fonts"
 msgstr "Skrifter på skjermen"
 
-#: mail/mail-config.glade.h:80
+#: mail/mail-config.glade.h:81
 msgid "Optional Information"
 msgstr "Tilleggsinformasjon"
 
-#: mail/mail-config.glade.h:82
+#: mail/mail-config.glade.h:83
 msgid "Or_ganization:"
 msgstr "Or_ganisasjon:"
 
-#: mail/mail-config.glade.h:83
+#: mail/mail-config.glade.h:84
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG-nø_kkel ID:"
 
-#: mail/mail-config.glade.h:87
+#: mail/mail-config.glade.h:88
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: mail/mail-config.glade.h:88
+#: mail/mail-config.glade.h:89
 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:89
+#: mail/mail-config.glade.h:90
 msgid "Pretty Good Privacy (PGP/GPG)"
 msgstr "Pretty Good Privacy (PGP/GPG)"
 
-#: mail/mail-config.glade.h:90
+#: mail/mail-config.glade.h:91
 msgid "Printed Fonts"
 msgstr "Skrifter ved utskrift"
 
-#: mail/mail-config.glade.h:91
+#: mail/mail-config.glade.h:92
 msgid "Qmail maildir "
 msgstr "Qmail maildir"
 
-#: mail/mail-config.glade.h:92
+#: mail/mail-config.glade.h:93
 msgid "Quote original message"
 msgstr "Siter opprinnelig melding"
 
-#: mail/mail-config.glade.h:93
+#: mail/mail-config.glade.h:94
 msgid "Quoted"
 msgstr "Sitert"
 
-#: mail/mail-config.glade.h:94
+#: mail/mail-config.glade.h:95
 msgid "Re_member this password"
 msgstr "H_usk dette passordet"
 
-#: mail/mail-config.glade.h:95
+#: mail/mail-config.glade.h:96
 msgid "Re_ply-To:"
 msgstr "S_var-til:"
 
-#: mail/mail-config.glade.h:96 shell/glade/evolution-startup-wizard.glade.h:6
+#: mail/mail-config.glade.h:97
 msgid "Receiving Email"
 msgstr "Innkommende e-post"
 
-#: mail/mail-config.glade.h:97
+#: mail/mail-config.glade.h:98
 msgid "Receiving _Options"
 msgstr "Alternativer for m_ottak"
 
-#: mail/mail-config.glade.h:98
+#: mail/mail-config.glade.h:99
 msgid "Remember this _password"
 msgstr "Husk dette _passordet"
 
-#: mail/mail-config.glade.h:99
+#: mail/mail-config.glade.h:100
 msgid "Required Information"
 msgstr "Nødvendig informasjon"
 
-#: mail/mail-config.glade.h:100
+#: mail/mail-config.glade.h:101
 msgid "Restore Defaults"
 msgstr "Gjenopprett forvalg"
 
-#: mail/mail-config.glade.h:102
+#: mail/mail-config.glade.h:103
 msgid "S_ecurity"
 msgstr "Sikk_erhet"
 
-#: mail/mail-config.glade.h:103
+#: mail/mail-config.glade.h:104
 msgid "Secure MIME (S/MIME)"
 msgstr "Sikker MIME (S/MIME)"
 
-#: mail/mail-config.glade.h:104
+#: mail/mail-config.glade.h:105
 msgid "Select HTML fixed width font"
 msgstr "Velg skrift med fast bredde for HTML"
 
-#: mail/mail-config.glade.h:105
+#: mail/mail-config.glade.h:106
 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:106
+#: mail/mail-config.glade.h:107
 msgid "Select HTML variable width font"
 msgstr "Velg skrift med variabel bredde for HTML"
 
-#: mail/mail-config.glade.h:107
+#: mail/mail-config.glade.h:108
 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:108 shell/glade/evolution-startup-wizard.glade.h:7
+#: mail/mail-config.glade.h:109
 msgid "Sending Email"
 msgstr "Utgående e-post"
 
-#: mail/mail-config.glade.h:110
+#: mail/mail-config.glade.h:111
 msgid "Sent _messages folder:"
 msgstr "Mappe for sendte _meldinger:"
 
-#: mail/mail-config.glade.h:111
+#: mail/mail-config.glade.h:112
 msgid "Sent and Draft Messages"
 msgstr "Sendte meldinger og skisser"
 
-#: mail/mail-config.glade.h:112
+#: mail/mail-config.glade.h:113
 msgid "Ser_ver requires authentication"
 msgstr "Tjener kre_ver autentisering"
 
-#: mail/mail-config.glade.h:113
+#: mail/mail-config.glade.h:114
 msgid "Server Configuration"
 msgstr "Tjenerkonfigurasjon"
 
-#: mail/mail-config.glade.h:114
+#: mail/mail-config.glade.h:115
 msgid "Server _Type: "
 msgstr "Tjener_type: "
 
-#: mail/mail-config.glade.h:115
+#: mail/mail-config.glade.h:116
 msgid "Shortcuts _type:"
 msgstr "Snarvei_type:"
 
-#: mail/mail-config.glade.h:116
+#: mail/mail-config.glade.h:117
 msgid "Specify _filename:"
 msgstr "Spesifiser _filnavn:"
 
-#: mail/mail-config.glade.h:117
-msgid "Spell Checking Language"
-msgstr "Språk for stavekontroll"
-
 #: mail/mail-config.glade.h:118
 msgid "Spell _Checking"
 msgstr "Stave_kontroll"
@@ -12534,7 +12873,7 @@ msgstr "V_ariabel bredde:"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Next\" to begin. "
+"Click \"Forward\" to begin. "
 msgstr ""
 "Velkommen til assistenten for konfigurasjon av Evolution e-post.\n"
 "\n"
@@ -12720,178 +13059,187 @@ msgstr "Kunne ikke opprette S/MIME «envelope»-kontekst."
 msgid "Could not create a S/MIME decode context."
 msgstr "Kunne ikke opprette S/MIME dekodingskontekst."
 
-#: mail/mail-display.c:321
+#: mail/mail-display.c:193
+#, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Filen «%s»  eksisterer allerede.\n"
+"Overskriv den?"
+
+#: mail/mail-display.c:196
+msgid "Overwrite file?"
+msgstr "Overskriv fil?"
+
+#: mail/mail-display.c:333
 msgid "Save Attachment"
 msgstr "Lagre vedlegg"
 
-#: mail/mail-display.c:386
+#: mail/mail-display.c:406
 #, c-format
 msgid "Could not create temporary file '%s': %s"
 msgstr "Kunne ikke opprette midlertidig fil «%s»: %s"
 
-#: mail/mail-display.c:432
+#: mail/mail-display.c:454
 msgid "Save Attachment..."
 msgstr "Lagre vedlegg..."
 
-#: mail/mail-display.c:433
+#: mail/mail-display.c:455
 msgid "View Inline"
 msgstr "Vis «inline»"
 
-#: mail/mail-display.c:434
+#: mail/mail-display.c:456
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
 
-#: mail/mail-display.c:494
+#: mail/mail-display.c:512
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Vis «inline» (via %s)"
 
-#: mail/mail-display.c:498
+#: mail/mail-display.c:516
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-display.c:519
+#: mail/mail-display.c:536
 msgid "External Viewer"
 msgstr "Ekstern visning"
 
-#: mail/mail-display.c:1319
+#: mail/mail-display.c:1341
 msgid "Downloading images"
 msgstr "Laster ned bilder"
 
-#: mail/mail-display.c:1496
+#: mail/mail-display.c:1518
 msgid "Loading message content"
 msgstr "Laster meldingsinnhold"
 
-#: mail/mail-display.c:1783
+#: mail/mail-display.c:1855
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: mail/mail-display.c:1787
+#: mail/mail-display.c:1859
 msgid "by %B %d, %Y, %l:%M %P"
 msgstr "ved %B %d, %Y, %l:%M %P"
 
-#: mail/mail-display.c:2114
+#: mail/mail-display.c:2210
 msgid "Open Link in Browser"
 msgstr "Åpne lenke i nettleser"
 
-#: mail/mail-display.c:2115
+#: mail/mail-display.c:2211
 msgid "Copy Link Location"
 msgstr "Kopier lokasjon for lenke"
 
-#: mail/mail-display.c:2117
+#: mail/mail-display.c:2213
 msgid "Save Link as (FIXME)"
 msgstr "Lagre lenke som"
 
-#: mail/mail-display.c:2119
+#: mail/mail-display.c:2215
 msgid "Save Image as..."
 msgstr "Lagre bilde som..."
 
-#: mail/mail-folder-cache.c:743
+#: mail/mail-folder-cache.c:744
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
 
-#: mail/mail-format.c:656
+#: mail/mail-format.c:635
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/mail-format.c:701 mail/mail-format.c:1730 mail/mail-format.c:1805
-#: mail/mail-format.c:1925 mail/mail-format.c:2050 mail/mail-format.c:2075
+#: mail/mail-format.c:677 mail/mail-format.c:1331 mail/mail-format.c:1400
+#: mail/mail-format.c:1520 mail/mail-format.c:1644 mail/mail-format.c:1669
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/mail-format.c:783 mail/message-list.etspec.h:2
+#: mail/mail-format.c:754 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "Dato"
 
-#: mail/mail-format.c:870
+#: mail/mail-format.c:840
 msgid "Bad Address"
 msgstr "Ugyldig e-post-adresse:"
 
-#: mail/mail-format.c:913 mail/message-list.etspec.h:7
-#: mail/message-tags.glade.h:3
+#: mail/mail-format.c:881 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301 mail/message-tags.glade.h:3
 msgid "From"
 msgstr "Fra"
 
-#: mail/mail-format.c:917
+#: mail/mail-format.c:885
 msgid "Reply-To"
 msgstr "Svar-til"
 
-#: mail/mail-format.c:922 mail/message-list.etspec.h:14
+#: mail/mail-format.c:890 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "Til"
 
-#: mail/mail-format.c:927
+#: mail/mail-format.c:895
 msgid "Cc"
 msgstr "Cc"
 
-#: mail/mail-format.c:932
+#: mail/mail-format.c:900
 msgid "Bcc"
 msgstr "Bcc"
 
-#: mail/mail-format.c:963
-msgid "Mailer"
-msgstr "Postprogram"
-
-#: mail/mail-format.c:1848
+#: mail/mail-format.c:1443
 msgid ""
 "This message is digitally signed. Click the lock icon for more information."
 msgstr ""
 "Denne meldingen er digitalt signert. Klikk låsikonet for mer informasjon."
 
-#: mail/mail-format.c:1875
+#: mail/mail-format.c:1471
 msgid "Could not create a PGP verfication context"
 msgstr "Kunne ikke opprette PGP verifiseringskontekst"
 
-#: mail/mail-format.c:1884
+#: mail/mail-format.c:1479
 msgid "This message is digitally signed and has been found to be authentic."
 msgstr "Denne meldingen er digitalt signert og er funnet autentisk."
 
-#: mail/mail-format.c:1892
+#: mail/mail-format.c:1486
 msgid "This message is digitally signed but can not be proven to be authentic."
 msgstr "Denne meldingen er digitalt signert, men kan ikke finnes autentisk."
 
-#: mail/mail-format.c:2157
+#: mail/mail-format.c:1750
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:2171
+#: mail/mail-format.c:1761
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/mail-format.c:2176
+#: mail/mail-format.c:1764
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:2205
+#: mail/mail-format.c:1791
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/mail-format.c:2213
+#: mail/mail-format.c:1797
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/mail-format.c:2218
+#: mail/mail-format.c:1799
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/mail-local.c:539 mail/mail-local.c:541
+#: mail/mail-local.c:537 mail/mail-local.c:539
 #, c-format
 msgid "Local folders/%s"
 msgstr "Lokale mapper/%s"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:667
 msgid "Reconfiguring folder"
 msgstr "Omkonfigurerer mappe"
 
-#: mail/mail-local.c:752
+#: mail/mail-local.c:748
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -12900,12 +13248,12 @@ msgstr ""
 "Kan ikke lagre metainformasjon for mappe; du vil kanskje\n"
 "ikke kunne åpne denne mappen igjen: %s: %s"
 
-#: mail/mail-local.c:808
+#: mail/mail-local.c:804
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Kan ikke lagre metainformasjon om mappe på: %s: %s"
 
-#: mail/mail-local.c:860
+#: mail/mail-local.c:856
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Kan ikke slette metainformasjon for mappe %s: %s"
@@ -12915,7 +13263,7 @@ msgstr "Kan ikke slette metainformasjon for mappe %s: %s"
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Endrer mappe «%s» til «%s»-format"
 
-#: mail/mail-local.c:1351
+#: mail/mail-local.c:1354
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -12923,12 +13271,12 @@ msgstr ""
 "Hvis du ikke kan åpne denne postboksen igjen må\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:1446
+#: mail/mail-local.c:1454
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Konfigurer /%s på nytt"
 
-#: mail/mail-local.c:1510
+#: mail/mail-local.c:1518
 msgid "You cannot change the format of a non-local folder."
 msgstr "Du kan ikke endre format på en ikke-lokal mappe."
 
@@ -12950,108 +13298,108 @@ msgstr ""
 "Feil under utføring av operasjon:\n"
 "%s"
 
-#: mail/mail-mt.c:904
+#: mail/mail-mt.c:903
 msgid "Working"
 msgstr "Arbeider"
 
-#: mail/mail-ops.c:89
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:267
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:553 mail/mail-ops.c:582
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
 msgid "However, the message was successfully sent."
 msgstr "Likevel, fullførte sending av meldingen."
 
-#: mail/mail-ops.c:618
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sender «%s»"
 
-#: mail/mail-ops.c:738
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:757
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Feilet på melding %d av %d"
 
-#: mail/mail-ops.c:759 mail/mail-send-recv.c:544
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:569
 msgid "Complete."
 msgstr "Fullført."
 
-#: mail/mail-ops.c:853
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Lagrer melding til mappe"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter melding(er) til %s"
 
-#: mail/mail-ops.c:934
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldinger til %s"
 
-#: mail/mail-ops.c:1051
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i «%s»"
 
-#: mail/mail-ops.c:1234
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1277
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åpner mappe %s"
 
-#: mail/mail-ops.c:1349
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "Åpner lager %s"
 
-#: mail/mail-ops.c:1422
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1516
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrer mappe «%s»"
 
-#: mail/mail-ops.c:1567
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Oppdaterer mappe"
 
-#: mail/mail-ops.c:1603
+#: mail/mail-ops.c:1594
 msgid "Expunging folder"
 msgstr "Tømmer mappe"
 
-#: mail/mail-ops.c:1652
+#: mail/mail-ops.c:1643
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter melding %s"
 
-#: mail/mail-ops.c:1724
+#: mail/mail-ops.c:1715
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "Henter %d melding(er)"
 
-#: mail/mail-ops.c:1810
+#: mail/mail-ops.c:1801
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "Lagrer %d melding(er)"
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1916
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13060,7 +13408,7 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1950
+#: mail/mail-ops.c:1944
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13069,11 +13417,11 @@ msgstr ""
 "Feil under lagring av av meldinger til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2024
+#: mail/mail-ops.c:2018
 msgid "Saving attachment"
 msgstr "Lagrer vedlegg"
 
-#: mail/mail-ops.c:2041
+#: mail/mail-ops.c:2035
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13082,54 +13430,58 @@ msgstr ""
 "Kunne ikke opprette utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2071
+#: mail/mail-ops.c:2065
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2213
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2219
+#: mail/mail-ops.c:2213
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s på nytt"
 
-#: mail/mail-search-dialogue.c:113 widgets/misc/e-search-bar.c:515
+#: mail/mail-search-dialogue.c:121 widgets/misc/e-search-bar.c:518
 msgid "_Search"
 msgstr "_Søk"
 
-#: mail/mail-search.c:137
+#: mail/mail-search.c:148
 msgid "(Untitled Message)"
 msgstr "(Melding uten tittel)"
 
-#: mail/mail-search.c:240
+#: mail/mail-search.c:230
 msgid "Untitled Message"
 msgstr "Melding uten tittel"
 
-#: mail/mail-search.c:244
+#: mail/mail-search.c:232
 msgid "Empty Message"
 msgstr "Tom melding"
 
-#: mail/mail-search.c:291
+#: mail/mail-search.c:280
 msgid "Find in Message"
 msgstr "Finn i melding"
 
-#: mail/mail-search.c:321
+#: mail/mail-search.c:283
+msgid "Search"
+msgstr "Søk"
+
+#: mail/mail-search.c:309
 msgid "Case Sensitive"
 msgstr "Skill mellom store/små bokstaver"
 
-#: mail/mail-search.c:323
+#: mail/mail-search.c:311
 msgid "Search Forward"
 msgstr "Søk fremover"
 
-#: mail/mail-search.c:343
+#: mail/mail-search.c:331
 msgid "Find:"
 msgstr "Finn:"
 
-#: mail/mail-search.c:346
+#: mail/mail-search.c:334
 msgid "Matches:"
 msgstr "Treff:"
 
@@ -13137,68 +13489,64 @@ msgstr "Treff:"
 msgid "Cancelling..."
 msgstr "Avbryter..."
 
-#: mail/mail-send-recv.c:246
+#: mail/mail-send-recv.c:248
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Tjener: %s, Type: %s"
 
-#: mail/mail-send-recv.c:248
+#: mail/mail-send-recv.c:250
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Sti: %s, Type: %s"
 
-#: mail/mail-send-recv.c:250
+#: mail/mail-send-recv.c:252
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: mail/mail-send-recv.c:293
+#: mail/mail-send-recv.c:297
 msgid "Send & Receive Mail"
 msgstr "Send & motta e-post"
 
-#: mail/mail-send-recv.c:295
+#: mail/mail-send-recv.c:299
 msgid "Cancel All"
 msgstr "Avbryt alle"
 
-#: mail/mail-send-recv.c:355
+#: mail/mail-send-recv.c:378
 msgid "Updating..."
 msgstr "Oppdaterer..."
 
-#: mail/mail-send-recv.c:356 mail/mail-send-recv.c:409
+#: mail/mail-send-recv.c:379 mail/mail-send-recv.c:434
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:221
+#: mail/mail-session.c:225
 msgid "User canceled operation."
 msgstr "Operasjon avbrutt av bruker."
 
-#: mail/mail-session.c:272
-msgid "_Remember this password"
-msgstr "Husk dette passo_rdet"
-
-#: mail/mail-session.c:273
-msgid "_Remember this password for the remainder of this session"
-msgstr "Husk dette passo_rdet for resten av denne sesjonen"
-
-#: mail/mail-session.c:330
+#: mail/mail-session.c:258
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Skriv inn passord for %s"
 
-#: mail/mail-session.c:333
+#: mail/mail-session.c:260
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: mail/mail-signature-editor.c:81
+#: mail/mail-session.c:280
+msgid "_Remember this password"
+msgstr "Husk dette passo_rdet"
+
+#: mail/mail-session.c:281
+msgid "_Remember this password for the remainder of this session"
+msgstr "Husk dette passo_rdet for resten av denne sesjonen"
+
+#: mail/mail-signature-editor.c:80
 #, c-format
 msgid "Could not save signature file: %s"
 msgstr "Kunne ikke lagre signaturfil: %s"
 
-#: mail/mail-signature-editor.c:175
-msgid "Save signature"
-msgstr "Lagre signatur"
-
-#: mail/mail-signature-editor.c:181
+#: mail/mail-signature-editor.c:226
 msgid ""
 "This signature has been changed, but hasn't been saved.\n"
 "\n"
@@ -13208,42 +13556,50 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: mail/mail-signature-editor.c:333
+#: mail/mail-signature-editor.c:229
+msgid "_Discard changes"
+msgstr ""
+
+#: mail/mail-signature-editor.c:233
+msgid "Save signature"
+msgstr "Lagre signatur"
+
+#: mail/mail-signature-editor.c:389
 msgid "Edit signature"
 msgstr "Rediger signatur"
 
-#: mail/mail-signature-editor.c:372
+#: mail/mail-signature-editor.c:428
 msgid "Enter a name for this signature."
 msgstr "Oppgi et navn for denne signaturen."
 
-#: mail/mail-signature-editor.c:375 my-evolution/e-summary-preferences.c:852
+#: mail/mail-signature-editor.c:431 my-evolution/e-summary-preferences.c:625
 msgid "Name:"
 msgstr "Navn:"
 
-#: mail/mail-tools.c:262
+#: mail/mail-tools.c:267
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Videresendt melding - %s"
 
-#: mail/mail-tools.c:266
+#: mail/mail-tools.c:269
 msgid "Forwarded message"
 msgstr "Videresendt melding"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:429
 msgid "Forwarded Message"
 msgstr "Videresendt melding"
 
-#: mail/mail-vfolder.c:84
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp VFolder: %s"
 
-#: mail/mail-vfolder.c:202
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "Oppdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:447
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13256,97 +13612,97 @@ msgstr ""
 "    «%s»\n"
 "Og har blitt oppdatert."
 
-#: mail/mail-vfolder.c:757 my-evolution/e-summary-mail.c:732
+#: mail/mail-vfolder.c:777 my-evolution/e-summary-mail.c:732
 msgid "VFolders"
 msgstr "VFoldere"
 
-#: mail/mail-vfolder.c:819
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:861
+#: mail/mail-vfolder.c:875
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:877
+#: mail/mail-vfolder.c:893
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "Prøver å redigere en vfolder «%s» som ikke eksisterer."
 
-#: mail/mail-vfolder.c:931
+#: mail/mail-vfolder.c:946
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-browser.c:210
+#: mail/message-browser.c:219
 msgid "(No subject)"
 msgstr "(Uten emne)"
 
-#: mail/message-browser.c:212
+#: mail/message-browser.c:221
 #, c-format
 msgid "%s - Message"
 msgstr "%s - Melding"
 
-#: mail/message-list.c:736
+#: mail/message-list.c:740
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:737
+#: mail/message-list.c:741
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:738
+#: mail/message-list.c:742
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:739
+#: mail/message-list.c:743
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:740
+#: mail/message-list.c:744
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:744
+#: mail/message-list.c:748
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:745
+#: mail/message-list.c:749
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:749
+#: mail/message-list.c:753
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:750
+#: mail/message-list.c:754
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:1066
+#: mail/message-list.c:1076
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1073
+#: mail/message-list.c:1083
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1082
+#: mail/message-list.c:1092
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1094
+#: mail/message-list.c:1104
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%a %H:%M"
 
-#: mail/message-list.c:1102
+#: mail/message-list.c:1112
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%b %d %H.%M"
 
-#: mail/message-list.c:1104
+#: mail/message-list.c:1114
 msgid "%b %d %Y"
-msgstr "%b %d %Y"
+msgstr "%d %b %Y"
 
-#: mail/message-list.c:2568
+#: mail/message-list.c:2602
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -13378,43 +13734,43 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/message-tag-followup.c:54
+#: mail/message-tag-followup.c:62
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:55
+#: mail/message-tag-followup.c:63
 msgid "Do Not Forward"
 msgstr "Ikke videresend"
 
-#: mail/message-tag-followup.c:56
+#: mail/message-tag-followup.c:64
 msgid "Follow-Up"
 msgstr "Følg opp"
 
-#: mail/message-tag-followup.c:57
+#: mail/message-tag-followup.c:65
 msgid "For Your Information"
 msgstr "Til din informasjon"
 
-#: mail/message-tag-followup.c:58 ui/evolution-mail-message.xml.h:36
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:59
+#: mail/message-tag-followup.c:67
 msgid "No Response Necessary"
 msgstr "Ingen respons nødvendig"
 
-#: mail/message-tag-followup.c:61 ui/evolution-mail-message.xml.h:72
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:62 ui/evolution-mail-message.xml.h:73
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Svar til alle"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:71
 msgid "Review"
 msgstr "Gjennomgå"
 
-#: mail/message-tag-followup.c:246 mail/message-tags.glade.h:2
+#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "Merk for oppfølging"
 
@@ -13442,52 +13798,48 @@ msgstr "_Ferdig til"
 msgid "_Flag:"
 msgstr "_Flagg:"
 
-#: mail/subscribe-dialog.c:231
+#: mail/subscribe-dialog.c:232
 #, c-format
 msgid "Scanning folders under %s on \"%s\""
 msgstr "Søker i mapper under %s på «%s»"
 
-#: mail/subscribe-dialog.c:233
+#: mail/subscribe-dialog.c:234
 #, c-format
 msgid "Scanning root-level folders on \"%s\""
 msgstr "Søker i mapper på rot-nivå på «%s»"
 
-#: mail/subscribe-dialog.c:336
+#: mail/subscribe-dialog.c:332
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Abonnerer på mappe «%s»"
 
-#: mail/subscribe-dialog.c:338
+#: mail/subscribe-dialog.c:334
 #, c-format
 msgid "Unsubscribing to folder \"%s\""
 msgstr "Fjerner abonnement på mappe «%s»"
 
-#: mail/subscribe-dialog.c:1271 mail/subscribe-dialog.etspec.h:1
+#: mail/subscribe-dialog.c:1272 mail/subscribe-dialog.etspec.h:1
 #: shell/e-storage-set-view.etspec.h:2
 msgid "Folder"
 msgstr "Mappe"
 
-#: mail/subscribe-dialog.c:1450
+#: mail/subscribe-dialog.c:1429
 msgid "Scanning folders..."
 msgstr "Søker gjennom mapper..."
 
-#: mail/subscribe-dialog.c:1557
+#: mail/subscribe-dialog.c:1551
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/subscribe-dialog.c:1621
+#: mail/subscribe-dialog.c:1626
 msgid "Please select a server."
 msgstr "Vennligst velg en tjener."
 
-#: mail/subscribe-dialog.glade.h:1
+#: mail/subscribe-dialog.glade.h:4
 msgid "All folders"
 msgstr "Alle mapper"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "Apri file"
-msgstr ""
-
-#: mail/subscribe-dialog.glade.h:3 ui/evolution-comp-editor.xml.h:2
+#: mail/subscribe-dialog.glade.h:5 ui/evolution-comp-editor.xml.h:2
 #: ui/evolution-contact-editor.xml.h:1
 #: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
@@ -13496,59 +13848,47 @@ msgstr ""
 msgid "Close"
 msgstr "Lukk"
 
-#: mail/subscribe-dialog.glade.h:4
+#: mail/subscribe-dialog.glade.h:6
 msgid "Display Options"
 msgstr "Alternativer for visning"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:7
 msgid "Folders whose names begin with:"
 msgstr "Vis mapper med navn som begynner på:"
 
-#: mail/subscribe-dialog.glade.h:6
+#: mail/subscribe-dialog.glade.h:8
 msgid "Manage Subscriptions"
 msgstr "Håndter abonnement"
 
-#: mail/subscribe-dialog.glade.h:7 ui/evolution-subscribe.xml.h:3
+#: mail/subscribe-dialog.glade.h:9 ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "Les listen på nytt"
 
-#: mail/subscribe-dialog.glade.h:8
+#: mail/subscribe-dialog.glade.h:10
 msgid "S_elect server: "
 msgstr "V_elg tjener: "
 
-#: mail/subscribe-dialog.glade.h:9
-msgid "Salve file"
-msgstr "Redd fil"
-
-#: mail/subscribe-dialog.glade.h:10
+#: mail/subscribe-dialog.glade.h:11
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: mail/subscribe-dialog.glade.h:11
+#: mail/subscribe-dialog.glade.h:12
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:1
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 msgid "Configuration control for the Evolution Summary."
 msgstr "Konfigurasjonskontroll for Evolution sammendrag."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:2
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:2
 msgid "Configure the appearance of the Evolution Summary here"
 msgstr "Konfigurer utseende for Evolution sammendrag her"
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:3
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:3
 msgid "Evolution Summary component."
 msgstr "Komponent for Evolution sammendrag."
 
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:4
-msgid "Factory for Evolution Summary's configuration control."
-msgstr "Factory for konfigurasjonskontroll for Evolution sammendrag."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:5
-msgid "Factory for the Evolution Summary component."
-msgstr "Factory for Evolutions sammendrag-komponent."
-
-#: my-evolution/GNOME_Evolution_Summary.oaf.in.h:6
+#: my-evolution/GNOME_Evolution_Summary.server.in.in.h:4
 msgid "Summary Preferences"
 msgstr "Brukervalg for sammendrag"
 
@@ -16949,7 +17289,7 @@ msgid "Hagerstown"
 msgstr "Hagerstown"
 
 #. HAIL
-#: my-evolution/Locations.h:885 my-evolution/metar.c:217
+#: my-evolution/Locations.h:885 my-evolution/metar.c:218
 msgid "Hail"
 msgstr "Hagl"
 
@@ -18642,4761 +18982,4747 @@ msgid "Marion-Wytheville"
 msgstr "Marion-Wytheville"
 
 #: my-evolution/Locations.h:1325
-msgid "Marquette"
-msgstr "Marquette"
-
-#: my-evolution/Locations.h:1326
 msgid "Marseille-Provence"
 msgstr "Marseille-Provence"
 
-#: my-evolution/Locations.h:1327
+#: my-evolution/Locations.h:1326
 msgid "Marseilles"
 msgstr "Marseilles"
 
-#: my-evolution/Locations.h:1328
+#: my-evolution/Locations.h:1327
 msgid "Marshall"
 msgstr "Marshall"
 
-#: my-evolution/Locations.h:1329
+#: my-evolution/Locations.h:1328
 msgid "Marshalltown"
 msgstr "Marshalltown"
 
-#: my-evolution/Locations.h:1330
+#: my-evolution/Locations.h:1329
 msgid "Marshfield"
 msgstr "Marshfield"
 
-#: my-evolution/Locations.h:1331
+#: my-evolution/Locations.h:1330
 msgid "Marte"
 msgstr "Marte"
 
-#: my-evolution/Locations.h:1332
+#: my-evolution/Locations.h:1331
 msgid "Marthas Vineyard"
 msgstr "Marthas Vineyard"
 
-#: my-evolution/Locations.h:1333
+#: my-evolution/Locations.h:1332
 msgid "Martinsburg"
 msgstr "Martinsburg"
 
-#: my-evolution/Locations.h:1334
+#: my-evolution/Locations.h:1333
 msgid "Martinsville"
 msgstr "Martinsville"
 
-#: my-evolution/Locations.h:1335
+#: my-evolution/Locations.h:1334
 msgid "Maryland"
 msgstr "Maryland"
 
-#: my-evolution/Locations.h:1336
+#: my-evolution/Locations.h:1335
 msgid "Marysville"
 msgstr "Marysville"
 
-#: my-evolution/Locations.h:1337
+#: my-evolution/Locations.h:1336
 msgid "Marysville-Beale AFB"
 msgstr "Marysville-Beale AFB"
 
-#: my-evolution/Locations.h:1338
+#: my-evolution/Locations.h:1337
 msgid "Mashhad"
 msgstr "Mashhad"
 
-#: my-evolution/Locations.h:1339
+#: my-evolution/Locations.h:1338
 msgid "Masirah"
 msgstr "Masirah"
 
-#: my-evolution/Locations.h:1340
+#: my-evolution/Locations.h:1339
 msgid "Mason City"
 msgstr "Mason City"
 
-#: my-evolution/Locations.h:1341
+#: my-evolution/Locations.h:1340
 msgid "Massachusetts"
 msgstr "Massachusetts"
 
-#: my-evolution/Locations.h:1342
+#: my-evolution/Locations.h:1341
 msgid "Massena"
 msgstr "Massena"
 
-#: my-evolution/Locations.h:1343
+#: my-evolution/Locations.h:1342
 msgid "Matamoros"
 msgstr "Matamoros"
 
-#: my-evolution/Locations.h:1344
+#: my-evolution/Locations.h:1343
 msgid "Matsumoto Airport"
 msgstr "Matsumoto flyplass"
 
-#: my-evolution/Locations.h:1345
+#: my-evolution/Locations.h:1344
 msgid "Matsushima Ab"
 msgstr "Matsushima Ab"
 
-#: my-evolution/Locations.h:1346
+#: my-evolution/Locations.h:1345
 msgid "Matsuyama Airport"
 msgstr "Matsuyama flyplass"
 
-#: my-evolution/Locations.h:1347
+#: my-evolution/Locations.h:1346
 msgid "Mattoon"
 msgstr "Mattoon"
 
-#: my-evolution/Locations.h:1348
+#: my-evolution/Locations.h:1347
 msgid "Mayaguez"
 msgstr "Mayaguez"
 
-#: my-evolution/Locations.h:1349
+#: my-evolution/Locations.h:1348
 msgid "Mayport"
 msgstr "Mayport"
 
-#: my-evolution/Locations.h:1350
+#: my-evolution/Locations.h:1349
 msgid "Mazatlan"
 msgstr "Mazatlan"
 
-#: my-evolution/Locations.h:1351
+#: my-evolution/Locations.h:1350
 msgid "Mazu"
 msgstr "Mazu"
 
-#: my-evolution/Locations.h:1352
+#: my-evolution/Locations.h:1351
 msgid "McAlester"
 msgstr "McAlester"
 
-#: my-evolution/Locations.h:1353
+#: my-evolution/Locations.h:1352
 msgid "McAllen"
 msgstr "McAllen"
 
-#: my-evolution/Locations.h:1354
+#: my-evolution/Locations.h:1353
 msgid "McCall"
 msgstr "McAll"
 
-#: my-evolution/Locations.h:1355
+#: my-evolution/Locations.h:1354
 msgid "McCarthy"
 msgstr "McCarthy"
 
-#: my-evolution/Locations.h:1356
+#: my-evolution/Locations.h:1355
 msgid "McClellan"
 msgstr "McClellan"
 
-#: my-evolution/Locations.h:1357
+#: my-evolution/Locations.h:1356
 msgid "McComb"
 msgstr "McComb"
 
-#: my-evolution/Locations.h:1358
+#: my-evolution/Locations.h:1357
 msgid "McCook"
 msgstr "McCook"
 
-#: my-evolution/Locations.h:1359
+#: my-evolution/Locations.h:1358
 msgid "McGrath"
 msgstr "McGrath"
 
-#: my-evolution/Locations.h:1360
+#: my-evolution/Locations.h:1359
 msgid "Mc Gregor"
 msgstr "Mc Gregor"
 
-#: my-evolution/Locations.h:1361
+#: my-evolution/Locations.h:1360
 msgid "Meacham"
 msgstr "Meacham"
 
-#: my-evolution/Locations.h:1362
+#: my-evolution/Locations.h:1361
 msgid "Medford"
 msgstr "Medford"
 
-#: my-evolution/Locations.h:1363
+#: my-evolution/Locations.h:1362
 msgid "Medicine Lodge"
 msgstr "Medicine Lodge"
 
-#: my-evolution/Locations.h:1364
+#: my-evolution/Locations.h:1363
 msgid "Mehamn"
 msgstr "Mehamn"
 
-#: my-evolution/Locations.h:1365
+#: my-evolution/Locations.h:1364
 msgid "Mekoryuk"
 msgstr "Mekoryuk"
 
-#: my-evolution/Locations.h:1366
+#: my-evolution/Locations.h:1365
 msgid "Melbourne"
 msgstr "Melbourne"
 
-#: my-evolution/Locations.h:1367
+#: my-evolution/Locations.h:1366
 msgid "Melfa"
 msgstr "Melfa"
 
-#: my-evolution/Locations.h:1368
+#: my-evolution/Locations.h:1367
 msgid "Melilla"
 msgstr "Melilla"
 
-#: my-evolution/Locations.h:1369
+#: my-evolution/Locations.h:1368
 msgid "Memambetsu Airport"
 msgstr "Memambetsu flyplass"
 
-#: my-evolution/Locations.h:1370
+#: my-evolution/Locations.h:1369
 msgid "Memphis"
 msgstr "Memphis"
 
-#: my-evolution/Locations.h:1371
+#: my-evolution/Locations.h:1370
 msgid "Memphis-NAS"
 msgstr "Memphis-NAS"
 
-#: my-evolution/Locations.h:1372
+#: my-evolution/Locations.h:1371
 msgid "Mendoza"
 msgstr "Mendoza"
 
-#: my-evolution/Locations.h:1373
+#: my-evolution/Locations.h:1372
 msgid "Mene Grande"
 msgstr "Mene Grande"
 
-#: my-evolution/Locations.h:1374
+#: my-evolution/Locations.h:1373
 msgid "Menominee"
 msgstr "Menominee"
 
-#: my-evolution/Locations.h:1375
+#: my-evolution/Locations.h:1374
 msgid "Menorca"
 msgstr "Menorca"
 
-#: my-evolution/Locations.h:1376
+#: my-evolution/Locations.h:1375
 msgid "Merced"
 msgstr "Merced"
 
-#: my-evolution/Locations.h:1377
+#: my-evolution/Locations.h:1376
 msgid "Merida"
 msgstr "Merida"
 
-#: my-evolution/Locations.h:1378
+#: my-evolution/Locations.h:1377
 msgid "Meridian"
 msgstr "Meridian"
 
-#: my-evolution/Locations.h:1379
+#: my-evolution/Locations.h:1378
 msgid "Meridian-Lauderdale"
 msgstr "Meridian-Lauderdale"
 
-#: my-evolution/Locations.h:1380
+#: my-evolution/Locations.h:1379
 msgid "Merril Field"
 msgstr "Merril Field"
 
-#: my-evolution/Locations.h:1381
+#: my-evolution/Locations.h:1380
 msgid "Mersa Matruh"
 msgstr "Mersa Matruh"
 
-#: my-evolution/Locations.h:1382
+#: my-evolution/Locations.h:1381
 msgid "Mesa-Falcon Field"
 msgstr "Mesa-Falcon Field"
 
-#: my-evolution/Locations.h:1383
+#: my-evolution/Locations.h:1382
 msgid "Metabaru Ab"
 msgstr "Metabaru Ab"
 
-#: my-evolution/Locations.h:1384
+#: my-evolution/Locations.h:1383
 msgid "Metz-Frescaty"
 msgstr "Metz-Frescaty"
 
-#: my-evolution/Locations.h:1385
+#: my-evolution/Locations.h:1384
 msgid "Mexicali"
 msgstr "Mexicali"
 
-#: my-evolution/Locations.h:1387
+#: my-evolution/Locations.h:1386
 msgid "Miami"
 msgstr "Miami"
 
-#: my-evolution/Locations.h:1388
+#: my-evolution/Locations.h:1387
 msgid "Miami-Kendall"
 msgstr "Miami-Kendall"
 
-#: my-evolution/Locations.h:1389
+#: my-evolution/Locations.h:1388
 msgid "Miami-Opa Locka"
 msgstr "Miami-Opa Locka"
 
-#: my-evolution/Locations.h:1390
+#: my-evolution/Locations.h:1389
 msgid "Michigan"
 msgstr "Michigan"
 
-#: my-evolution/Locations.h:1391
+#: my-evolution/Locations.h:1390
 msgid "Middle East"
 msgstr "Midtøsten"
 
-#: my-evolution/Locations.h:1392
+#: my-evolution/Locations.h:1391
 msgid "Middleton Island"
 msgstr "Middleton Island"
 
-#: my-evolution/Locations.h:1393
+#: my-evolution/Locations.h:1392
 msgid "Middletown"
 msgstr "Middletown"
 
-#: my-evolution/Locations.h:1394
+#: my-evolution/Locations.h:1393
 msgid "Midland"
 msgstr "Midland"
 
-#: my-evolution/Locations.h:1395
+#: my-evolution/Locations.h:1394
 msgid "Miho Ab"
 msgstr "Miho Ab"
 
-#: my-evolution/Locations.h:1396
+#: my-evolution/Locations.h:1395
 msgid "Milano/Linate"
 msgstr "Milano/Linate"
 
-#: my-evolution/Locations.h:1397
+#: my-evolution/Locations.h:1396
 msgid "Milano/Malpensa"
 msgstr "Milano/Malpensa"
 
-#: my-evolution/Locations.h:1398
+#: my-evolution/Locations.h:1397
 msgid "Miles City"
 msgstr "Miles City"
 
-#: my-evolution/Locations.h:1399
+#: my-evolution/Locations.h:1398
 msgid "Milford"
 msgstr "Milford"
 
-#: my-evolution/Locations.h:1400
+#: my-evolution/Locations.h:1399
 msgid "Millinocket"
 msgstr "Millinocket"
 
-#: my-evolution/Locations.h:1401
+#: my-evolution/Locations.h:1400
 msgid "Millville"
 msgstr "Millville"
 
-#: my-evolution/Locations.h:1402
+#: my-evolution/Locations.h:1401
 msgid "Milton"
 msgstr "Milton"
 
-#: my-evolution/Locations.h:1403
+#: my-evolution/Locations.h:1402
 msgid "Milwaukee"
 msgstr "Milwaukee"
 
-#: my-evolution/Locations.h:1404
+#: my-evolution/Locations.h:1403
 msgid "Milwaukee-Timmerman"
 msgstr "Milwaukee-Timmerman"
 
-#: my-evolution/Locations.h:1405
+#: my-evolution/Locations.h:1404
 msgid "Minamitorishima"
 msgstr "Minamitorishima"
 
-#: my-evolution/Locations.h:1406
+#: my-evolution/Locations.h:1405
 msgid "Minatitlan"
 msgstr "Minatitlan"
 
-#: my-evolution/Locations.h:1407
+#: my-evolution/Locations.h:1406
 msgid "Minchumina"
 msgstr "Minchumina"
 
-#: my-evolution/Locations.h:1408
+#: my-evolution/Locations.h:1407
 msgid "Mineralnye Vody"
 msgstr "Mineralnye Vody"
 
-#: my-evolution/Locations.h:1409
+#: my-evolution/Locations.h:1408
 msgid "Mineral Wells"
 msgstr "Mineral Wells"
 
-#: my-evolution/Locations.h:1410
+#: my-evolution/Locations.h:1409
 msgid "Minneapolis"
 msgstr "Minneapolis"
 
-#: my-evolution/Locations.h:1411
+#: my-evolution/Locations.h:1410
 msgid "Minneapolis [2]"
 msgstr "Minneapolis [2]"
 
-#: my-evolution/Locations.h:1412
+#: my-evolution/Locations.h:1411
 msgid "Minneapolis [3]"
 msgstr "Minneapolis [3]"
 
-#: my-evolution/Locations.h:1413
+#: my-evolution/Locations.h:1412
 msgid "Minnesota"
 msgstr "Minnesota"
 
-#: my-evolution/Locations.h:1414
+#: my-evolution/Locations.h:1413
 msgid "Minocqua"
 msgstr "Minocqua"
 
-#: my-evolution/Locations.h:1415
+#: my-evolution/Locations.h:1414
 msgid "Minot"
 msgstr "Minot"
 
-#: my-evolution/Locations.h:1416
+#: my-evolution/Locations.h:1415
 msgid "Minot AFB"
 msgstr "Minot AFB"
 
-#: my-evolution/Locations.h:1417
+#: my-evolution/Locations.h:1416
 msgid "Misawa Ab"
 msgstr "Misawa Ab"
 
-#: my-evolution/Locations.h:1418
+#: my-evolution/Locations.h:1417
 msgid "Mississippi"
 msgstr "Mississippi"
 
-#: my-evolution/Locations.h:1419
+#: my-evolution/Locations.h:1418
 msgid "Missoula"
 msgstr "Missoula"
 
-#: my-evolution/Locations.h:1420
+#: my-evolution/Locations.h:1419
 msgid "Missouri"
 msgstr "Missouri"
 
-#: my-evolution/Locations.h:1421
+#: my-evolution/Locations.h:1420
 msgid "Mitchell"
 msgstr "Mitchell"
 
-#: my-evolution/Locations.h:1422
+#: my-evolution/Locations.h:1421
 msgid "Mitilini"
 msgstr "Mitilini"
 
-#: my-evolution/Locations.h:1423
+#: my-evolution/Locations.h:1422
 msgid "Miyakejima Airport"
 msgstr "Miyakejima flyplass"
 
-#: my-evolution/Locations.h:1424
+#: my-evolution/Locations.h:1423
 msgid "Miyazaki Airport"
 msgstr "Miyazaki flyplass"
 
-#: my-evolution/Locations.h:1425
+#: my-evolution/Locations.h:1424
 msgid "Moa"
 msgstr "Moa"
 
-#: my-evolution/Locations.h:1426
+#: my-evolution/Locations.h:1425
 msgid "Mobile Downtown"
 msgstr "Mobile sentrum"
 
-#: my-evolution/Locations.h:1427
+#: my-evolution/Locations.h:1426
 msgid "Mobile Regional Airport"
 msgstr "Mobile regionale flyplass"
 
-#: my-evolution/Locations.h:1428
+#: my-evolution/Locations.h:1427
 msgid "Mobridge"
 msgstr "Mobridge"
 
-#: my-evolution/Locations.h:1429
+#: my-evolution/Locations.h:1428
 msgid "Modesto"
 msgstr "Modesto"
 
-#: my-evolution/Locations.h:1430
+#: my-evolution/Locations.h:1429
 msgid "Mo I Rana"
 msgstr "Mo i rana"
 
-#: my-evolution/Locations.h:1431
+#: my-evolution/Locations.h:1430
 msgid "Mojave"
 msgstr "Mojave"
 
-#: my-evolution/Locations.h:1432
+#: my-evolution/Locations.h:1431
 msgid "Molde"
 msgstr "Molde"
 
-#: my-evolution/Locations.h:1433
+#: my-evolution/Locations.h:1432
 msgid "Moldova"
 msgstr "Moldova"
 
-#: my-evolution/Locations.h:1434
+#: my-evolution/Locations.h:1433
 msgid "Moline-Quad Cities"
 msgstr "Moline-Quad Cities"
 
-#: my-evolution/Locations.h:1435
+#: my-evolution/Locations.h:1434
 msgid "Molokai"
 msgstr "Molokai"
 
-#: my-evolution/Locations.h:1436
+#: my-evolution/Locations.h:1435
 msgid "Mombetsu Airport"
 msgstr "Mombetsu flyplass"
 
-#: my-evolution/Locations.h:1437
+#: my-evolution/Locations.h:1436
 msgid "Monchengladbach"
 msgstr "Monchencladbach"
 
-#: my-evolution/Locations.h:1438
+#: my-evolution/Locations.h:1437
 msgid "Monclova"
 msgstr "Monclova"
 
-#: my-evolution/Locations.h:1439
+#: my-evolution/Locations.h:1438
 msgid "Moncton"
 msgstr "Moncton"
 
-#: my-evolution/Locations.h:1440
+#: my-evolution/Locations.h:1439
 msgid "Monida"
 msgstr "Monida"
 
-#: my-evolution/Locations.h:1441
+#: my-evolution/Locations.h:1440
 msgid "Monpellier-Mediterrannee"
 msgstr "Monpellier-Mediterrannee"
 
-#: my-evolution/Locations.h:1442
+#: my-evolution/Locations.h:1441
 msgid "Monroe"
 msgstr "Monroe"
 
-#: my-evolution/Locations.h:1443
+#: my-evolution/Locations.h:1442
 msgid "Montague"
 msgstr "Montaque"
 
-#: my-evolution/Locations.h:1444
+#: my-evolution/Locations.h:1443
 msgid "Montana"
 msgstr "Montana"
 
-#: my-evolution/Locations.h:1445
+#: my-evolution/Locations.h:1444
 msgid "Mont-de-Marsan"
 msgstr "Mont-de-Marsan"
 
-#: my-evolution/Locations.h:1446
+#: my-evolution/Locations.h:1445
 msgid "Monte Argentario"
 msgstr "Monte Argentario"
 
-#: my-evolution/Locations.h:1447
+#: my-evolution/Locations.h:1446
 msgid "Monte Bisbino"
 msgstr "Monte Bisbino"
 
-#: my-evolution/Locations.h:1448
+#: my-evolution/Locations.h:1447
 msgid "Monte Calamita"
 msgstr "Monte Calamita"
 
-#: my-evolution/Locations.h:1449
+#: my-evolution/Locations.h:1448
 msgid "Monte Cimone"
 msgstr "Monte Cimone"
 
-#: my-evolution/Locations.h:1450
+#: my-evolution/Locations.h:1449
 msgid "Montego Bay"
 msgstr "Montego Bay"
 
-#: my-evolution/Locations.h:1451
+#: my-evolution/Locations.h:1450
 msgid "Monte Malanotte"
 msgstr "Monte Malanotte"
 
-#: my-evolution/Locations.h:1452
+#: my-evolution/Locations.h:1451
 msgid "Monterey"
 msgstr "Monterey"
 
-#: my-evolution/Locations.h:1453
+#: my-evolution/Locations.h:1452
 msgid "Monterrey"
 msgstr "Monterrey"
 
-#: my-evolution/Locations.h:1454
+#: my-evolution/Locations.h:1453
 msgid "Monte Scuro"
 msgstr "Monte Sucro"
 
-#: my-evolution/Locations.h:1455
+#: my-evolution/Locations.h:1454
 msgid "Monte Terminillo"
 msgstr "Monte Terminillo"
 
-#: my-evolution/Locations.h:1456
+#: my-evolution/Locations.h:1455
 msgid "Montevideo/Carrasco"
 msgstr "Montevideo/Carrasco"
 
-#: my-evolution/Locations.h:1457
+#: my-evolution/Locations.h:1456
 msgid "Montgomery"
 msgstr "Montgomery"
 
-#: my-evolution/Locations.h:1458
+#: my-evolution/Locations.h:1457
 msgid "Montgomery-Maxwell AFB"
 msgstr "Montgomery-Maxwell AFB"
 
-#: my-evolution/Locations.h:1459
+#: my-evolution/Locations.h:1458
 msgid "Monticello"
 msgstr "Monticello"
 
-#: my-evolution/Locations.h:1460
+#: my-evolution/Locations.h:1459
 msgid "Montpelier"
 msgstr "Montpelier"
 
-#: my-evolution/Locations.h:1461
+#: my-evolution/Locations.h:1460
 msgid "Montreal Dorval"
 msgstr "Montreal Dorval"
 
-#: my-evolution/Locations.h:1462
+#: my-evolution/Locations.h:1461
 msgid "Montreal Mirabel"
 msgstr "Montreal Mirabel"
 
-#: my-evolution/Locations.h:1463
+#: my-evolution/Locations.h:1462
 msgid "Montreal Saint-Hubert"
 msgstr "Montreal Saint-Hubert"
 
-#: my-evolution/Locations.h:1464
+#: my-evolution/Locations.h:1463
 msgid "Montrose"
 msgstr "Montrose"
 
-#: my-evolution/Locations.h:1465
+#: my-evolution/Locations.h:1464
 msgid "Montrose (2)"
 msgstr "Montrose (2)"
 
-#: my-evolution/Locations.h:1466
+#: my-evolution/Locations.h:1465
 msgid "Morelia"
 msgstr "Morelia"
 
-#: my-evolution/Locations.h:1467
+#: my-evolution/Locations.h:1466
 msgid "Morgantown"
 msgstr "Morgantown"
 
-#: my-evolution/Locations.h:1468
+#: my-evolution/Locations.h:1467
 msgid "Moriarty"
 msgstr "Moriarty"
 
-#: my-evolution/Locations.h:1470
+#: my-evolution/Locations.h:1469
 msgid "Morristown"
 msgstr "Morristown"
 
-#: my-evolution/Locations.h:1471
+#: my-evolution/Locations.h:1470
 msgid "Moscow Domodedovo"
 msgstr "Moskva Domodedovo"
 
-#: my-evolution/Locations.h:1472
+#: my-evolution/Locations.h:1471
 msgid "Moscow Sheremetyevo"
 msgstr "Moskva Sheremetyevo"
 
-#: my-evolution/Locations.h:1473
+#: my-evolution/Locations.h:1472
 msgid "Moses Lake"
 msgstr "Moses Lake"
 
-#: my-evolution/Locations.h:1474
+#: my-evolution/Locations.h:1473
 msgid "Mosinee"
 msgstr "Mosinee"
 
-#: my-evolution/Locations.h:1475
+#: my-evolution/Locations.h:1474
 msgid "Mosjoen"
 msgstr "Mosjøen"
 
-#: my-evolution/Locations.h:1476
+#: my-evolution/Locations.h:1475
 msgid "Moultrie"
 msgstr "Moultrie"
 
-#: my-evolution/Locations.h:1477
+#: my-evolution/Locations.h:1476
 msgid "Mountain Home"
 msgstr "Mountain Home"
 
-#: my-evolution/Locations.h:1478
+#: my-evolution/Locations.h:1477
 msgid "Mountain View"
 msgstr "Mountain View"
 
-#: my-evolution/Locations.h:1479
+#: my-evolution/Locations.h:1478
 msgid "Mount Clemens"
 msgstr "Mount Clemens"
 
-#: my-evolution/Locations.h:1480
+#: my-evolution/Locations.h:1479
 msgid "Mount Holly"
 msgstr "Mount Holly"
 
-#: my-evolution/Locations.h:1481
+#: my-evolution/Locations.h:1480
 msgid "Mount Shasta"
 msgstr "Mount Shasta"
 
-#: my-evolution/Locations.h:1482
+#: my-evolution/Locations.h:1481
 msgid "Mount Vernon"
 msgstr "Mount Vernon"
 
-#: my-evolution/Locations.h:1483
+#: my-evolution/Locations.h:1482
 msgid "Mount Wilson"
 msgstr "Mount Wilson"
 
-#: my-evolution/Locations.h:1484
+#: my-evolution/Locations.h:1483
 msgid "Mt Washington"
 msgstr "Mt Washington"
 
-#: my-evolution/Locations.h:1485
+#: my-evolution/Locations.h:1484
 msgid "Mugla/Dalaman"
 msgstr "Mugla/Dalaman"
 
-#: my-evolution/Locations.h:1486
+#: my-evolution/Locations.h:1485
 msgid "Muir"
 msgstr "Muir"
 
-#: my-evolution/Locations.h:1487
+#: my-evolution/Locations.h:1486
 msgid "Mullan"
 msgstr "Mullan"
 
-#: my-evolution/Locations.h:1488
+#: my-evolution/Locations.h:1487
 msgid "Mullen"
 msgstr "Mullen"
 
-#: my-evolution/Locations.h:1489
+#: my-evolution/Locations.h:1488
 msgid "Munchen"
 msgstr "Munchen"
 
-#: my-evolution/Locations.h:1490
+#: my-evolution/Locations.h:1489
 msgid "Muncie"
 msgstr "Muncie"
 
-#: my-evolution/Locations.h:1491
+#: my-evolution/Locations.h:1490
 msgid "Munster/Osnabruck"
 msgstr "Munster/Osnabruck"
 
-#: my-evolution/Locations.h:1492
+#: my-evolution/Locations.h:1491
 msgid "Murcia"
 msgstr "Murcia"
 
-#: my-evolution/Locations.h:1493
+#: my-evolution/Locations.h:1492
 msgid "Murmansk"
 msgstr "Murmansk"
 
-#: my-evolution/Locations.h:1494
+#: my-evolution/Locations.h:1493
 msgid "Mus"
 msgstr "Mus"
 
-#: my-evolution/Locations.h:1495
+#: my-evolution/Locations.h:1494
 msgid "Muscatine"
 msgstr "Muscatine"
 
-#: my-evolution/Locations.h:1496
+#: my-evolution/Locations.h:1495
 msgid "Muscle Shoals"
 msgstr "Muscle Shoals"
 
-#: my-evolution/Locations.h:1497
+#: my-evolution/Locations.h:1496
 msgid "Muskegon"
 msgstr "Muskegon"
 
-#: my-evolution/Locations.h:1498
+#: my-evolution/Locations.h:1497
 msgid "Mykonos"
 msgstr "Mykonos"
 
-#: my-evolution/Locations.h:1499
+#: my-evolution/Locations.h:1498
 msgid "Myrtle Beach"
 msgstr "Myrtle Beach"
 
-#: my-evolution/Locations.h:1500
+#: my-evolution/Locations.h:1499
 msgid "Nabesna/Devil Mt."
 msgstr "Nabesna/Devil Mt."
 
-#: my-evolution/Locations.h:1501
+#: my-evolution/Locations.h:1500
 msgid "Nacogdoches"
 msgstr "Nacogdoches"
 
-#: my-evolution/Locations.h:1502
+#: my-evolution/Locations.h:1501
 msgid "Nagasaki Airport"
 msgstr "Nagasaki flyplass"
 
-#: my-evolution/Locations.h:1503
+#: my-evolution/Locations.h:1502
 msgid "Nagoya Airport"
 msgstr "Nagoya flyplass"
 
-#: my-evolution/Locations.h:1504
+#: my-evolution/Locations.h:1503
 msgid "Nagpur Sonegaon"
 msgstr "Nagpur Sonegaon"
 
-#: my-evolution/Locations.h:1505
+#: my-evolution/Locations.h:1504
 msgid "Naha Airport"
 msgstr "Naha flyplass"
 
-#: my-evolution/Locations.h:1506
+#: my-evolution/Locations.h:1505
 msgid "Najran"
 msgstr "Najran"
 
-#: my-evolution/Locations.h:1507
+#: my-evolution/Locations.h:1506
 msgid "Nakashibetsu Airport"
 msgstr "Nakashibetsu flyplass"
 
-#: my-evolution/Locations.h:1508
+#: my-evolution/Locations.h:1507
 msgid "Nalchik"
 msgstr "Nalchik"
 
-#: my-evolution/Locations.h:1509
+#: my-evolution/Locations.h:1508
 msgid "Namsos"
 msgstr "Namsos"
 
-#: my-evolution/Locations.h:1510
+#: my-evolution/Locations.h:1509
 msgid "Nancy-Essey"
 msgstr "Nancy-Essey"
 
-#: my-evolution/Locations.h:1511
+#: my-evolution/Locations.h:1510
 msgid "Nancy-Ochey"
 msgstr "Nancy-Ochey"
 
-#: my-evolution/Locations.h:1512
+#: my-evolution/Locations.h:1511
 msgid "Nankishirahama Airport"
 msgstr "Nankishirahama flyplass"
 
-#: my-evolution/Locations.h:1513
+#: my-evolution/Locations.h:1512
 msgid "Nanning"
 msgstr "Nanning"
 
-#: my-evolution/Locations.h:1514
+#: my-evolution/Locations.h:1513
 msgid "Nantes Adlantique"
 msgstr "Nantes Adlantique"
 
-#: my-evolution/Locations.h:1515
+#: my-evolution/Locations.h:1514
 msgid "Nantucket"
 msgstr "Nantucket"
 
-#: my-evolution/Locations.h:1516
+#: my-evolution/Locations.h:1515
 msgid "Napa"
 msgstr "Napa"
 
-#: my-evolution/Locations.h:1517
+#: my-evolution/Locations.h:1516
 msgid "Naples"
 msgstr "Naples"
 
-#: my-evolution/Locations.h:1518
+#: my-evolution/Locations.h:1517
 msgid "Napoli"
 msgstr "Napoli"
 
-#: my-evolution/Locations.h:1519
+#: my-evolution/Locations.h:1518
 msgid "Narvik"
 msgstr "Narvik"
 
-#: my-evolution/Locations.h:1520
+#: my-evolution/Locations.h:1519
 msgid "Nasa Shuttle"
 msgstr "Nasa's romferge"
 
-#: my-evolution/Locations.h:1521
+#: my-evolution/Locations.h:1520
 msgid "Nashua"
 msgstr "Nashua"
 
-#: my-evolution/Locations.h:1522
+#: my-evolution/Locations.h:1521
 msgid "Nashville"
 msgstr "Nashville"
 
-#: my-evolution/Locations.h:1523
+#: my-evolution/Locations.h:1522
 msgid "Nassau"
 msgstr "Nassau"
 
-#: my-evolution/Locations.h:1524
+#: my-evolution/Locations.h:1523
 msgid "Natal"
 msgstr "Natal"
 
-#: my-evolution/Locations.h:1525
+#: my-evolution/Locations.h:1524
 msgid "Natchez"
 msgstr "Natchez"
 
-#: my-evolution/Locations.h:1526
+#: my-evolution/Locations.h:1525
 msgid "Nawabshah"
 msgstr "Nawabshah"
 
-#: my-evolution/Locations.h:1527
+#: my-evolution/Locations.h:1526
 msgid "Nebraska"
 msgstr "Nebraska"
 
-#: my-evolution/Locations.h:1528
+#: my-evolution/Locations.h:1527
 msgid "Needles"
 msgstr "Needles"
 
-#: my-evolution/Locations.h:1529
+#: my-evolution/Locations.h:1528
 msgid "Nenana"
 msgstr "Nenana"
 
-#: my-evolution/Locations.h:1531
+#: my-evolution/Locations.h:1530
 msgid "Neuquen"
 msgstr "Neuquen"
 
-#: my-evolution/Locations.h:1532
+#: my-evolution/Locations.h:1531
 msgid "Nevada"
 msgstr "Nevada"
 
-#: my-evolution/Locations.h:1533
+#: my-evolution/Locations.h:1532
 msgid "Newark"
 msgstr "Newark"
 
-#: my-evolution/Locations.h:1534
+#: my-evolution/Locations.h:1533
 msgid "New Bedford"
 msgstr "New Bedford"
 
-#: my-evolution/Locations.h:1535
+#: my-evolution/Locations.h:1534
 msgid "New Bern"
 msgstr "New Bern"
 
-#: my-evolution/Locations.h:1536
+#: my-evolution/Locations.h:1535
 msgid "New Braunfels"
 msgstr "New Braunfels"
 
-#: my-evolution/Locations.h:1537
+#: my-evolution/Locations.h:1536
 msgid "New Brunswick"
 msgstr "New Brunswick"
 
-#: my-evolution/Locations.h:1538
+#: my-evolution/Locations.h:1537
 msgid "Newburgh"
 msgstr "Newburgh"
 
-#: my-evolution/Locations.h:1539
+#: my-evolution/Locations.h:1538
 msgid "Newcastle"
 msgstr "Newcastle"
 
-#: my-evolution/Locations.h:1540
+#: my-evolution/Locations.h:1539
 msgid "New Delhi/Palam"
 msgstr "New Delhi/Palam"
 
-#: my-evolution/Locations.h:1541
+#: my-evolution/Locations.h:1540
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
-#: my-evolution/Locations.h:1542
+#: my-evolution/Locations.h:1541
 msgid "New Hampshire"
 msgstr "New Hampshire"
 
-#: my-evolution/Locations.h:1543
+#: my-evolution/Locations.h:1542
 msgid "New Haven"
 msgstr "New Haven"
 
-#: my-evolution/Locations.h:1544
+#: my-evolution/Locations.h:1543
 msgid "New Iberia"
 msgstr "New Iberia"
 
-#: my-evolution/Locations.h:1545
+#: my-evolution/Locations.h:1544
 msgid "New Jersey"
 msgstr "New Jersey"
 
-#: my-evolution/Locations.h:1546
+#: my-evolution/Locations.h:1545
 msgid "New Mexico"
 msgstr "New Mexico"
 
-#: my-evolution/Locations.h:1547
+#: my-evolution/Locations.h:1546
 msgid "New Orleans"
 msgstr "New Orleans"
 
-#: my-evolution/Locations.h:1548
+#: my-evolution/Locations.h:1547
 msgid "New Orleans-Lakefront"
 msgstr "New Orleans-Lakefront"
 
-#: my-evolution/Locations.h:1549
+#: my-evolution/Locations.h:1548
 msgid "New Orleans NAS"
 msgstr "New Orleans NAS"
 
-#: my-evolution/Locations.h:1550
+#: my-evolution/Locations.h:1549
 msgid "Newport"
 msgstr "Newport"
 
-#: my-evolution/Locations.h:1551
+#: my-evolution/Locations.h:1550
 msgid "Newport News"
 msgstr "Newport News"
 
-#: my-evolution/Locations.h:1552
+#: my-evolution/Locations.h:1551
 msgid "New Port Richey"
 msgstr "New Port Richey"
 
-#: my-evolution/Locations.h:1553
+#: my-evolution/Locations.h:1552
 msgid "New River"
 msgstr "New River"
 
-#: my-evolution/Locations.h:1554
+#: my-evolution/Locations.h:1553
 msgid "New Tokyo International Airport"
 msgstr "Nye Tokyo internasjonale flyplass"
 
-#: my-evolution/Locations.h:1555
+#: my-evolution/Locations.h:1554
 msgid "Newton"
 msgstr "Newton"
 
-#: my-evolution/Locations.h:1556
+#: my-evolution/Locations.h:1555
 msgid "New York"
 msgstr "New York"
 
-#: my-evolution/Locations.h:1557
+#: my-evolution/Locations.h:1556
 msgid "New York-JFK Arpt"
 msgstr "New York-JFK flyplass"
 
-#: my-evolution/Locations.h:1558
+#: my-evolution/Locations.h:1557
 msgid "New York-La Guardia"
 msgstr "New York-La Guardia"
 
-#: my-evolution/Locations.h:1560
+#: my-evolution/Locations.h:1559
 msgid "Niagara Falls"
 msgstr "Niagara Falls"
 
-#: my-evolution/Locations.h:1562
+#: my-evolution/Locations.h:1561
 msgid "Nice-Cote d'Azur"
 msgstr "Nice-Côte d'Azur"
 
-#: my-evolution/Locations.h:1563
+#: my-evolution/Locations.h:1562
 msgid "Niigata Airport"
 msgstr "Niigata flyplass"
 
-#: my-evolution/Locations.h:1564
+#: my-evolution/Locations.h:1563
 msgid "Nimes-Garons"
 msgstr "Nimes-Garons"
 
-#: my-evolution/Locations.h:1565
+#: my-evolution/Locations.h:1564
 msgid "Nipawin"
 msgstr "Nipawin"
 
-#: my-evolution/Locations.h:1566
+#: my-evolution/Locations.h:1565
 msgid "Nis"
 msgstr "Nis"
 
-#: my-evolution/Locations.h:1567
+#: my-evolution/Locations.h:1566
 msgid "Nizhny Novgorod"
 msgstr "Nizhny Novgorod"
 
-#: my-evolution/Locations.h:1568
+#: my-evolution/Locations.h:1567
 msgid "N Las Vegas"
 msgstr "Las Vegas N"
 
-#: my-evolution/Locations.h:1569
+#: my-evolution/Locations.h:1568
 msgid "N Myrtle Beach"
 msgstr "Myrtle Beach N"
 
-#: my-evolution/Locations.h:1570
+#: my-evolution/Locations.h:1569
 msgid "Nogales"
 msgstr "Nogales"
 
-#: my-evolution/Locations.h:1571
+#: my-evolution/Locations.h:1570
 msgid "Nome"
 msgstr "Nome"
 
-#: my-evolution/Locations.h:1572
+#: my-evolution/Locations.h:1571
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: my-evolution/Locations.h:1574
+#: my-evolution/Locations.h:1573
 msgid "Norfolk NAS"
 msgstr "Norfolk NAS"
 
-#: my-evolution/Locations.h:1575
+#: my-evolution/Locations.h:1574
 msgid "Norrkoping"
 msgstr "Nörrköping"
 
-#: my-evolution/Locations.h:1576
+#: my-evolution/Locations.h:1575
 msgid "North Adams"
 msgstr "North Adams"
 
-#: my-evolution/Locations.h:1577
+#: my-evolution/Locations.h:1576
 msgid "North Bend"
 msgstr "North Bend"
 
-#: my-evolution/Locations.h:1578
+#: my-evolution/Locations.h:1577
 msgid "North Carolina"
 msgstr "North Carolina"
 
-#: my-evolution/Locations.h:1579
+#: my-evolution/Locations.h:1578
 msgid "North Conway"
 msgstr "North Conway"
 
-#: my-evolution/Locations.h:1580
+#: my-evolution/Locations.h:1579
 msgid "North Dakota"
 msgstr "North Dakota"
 
-#: my-evolution/Locations.h:1581
+#: my-evolution/Locations.h:1580
 msgid "Northeast Philadelphia"
 msgstr "Northeast Philadelphia"
 
-#: my-evolution/Locations.h:1582
+#: my-evolution/Locations.h:1581
 msgid "North Kingstown"
 msgstr "North Kingstown"
 
-#: my-evolution/Locations.h:1583
+#: my-evolution/Locations.h:1582
 msgid "North Platte"
 msgstr "North Platte"
 
-#: my-evolution/Locations.h:1584
+#: my-evolution/Locations.h:1583
 msgid "Northway"
 msgstr "Northway"
 
-#: my-evolution/Locations.h:1585
+#: my-evolution/Locations.h:1584
 msgid "Northwest Territories"
 msgstr "Nordvest-territoriet"
 
-#: my-evolution/Locations.h:1587
+#: my-evolution/Locations.h:1586
 msgid "Norwich"
 msgstr "Norwich"
 
-#: my-evolution/Locations.h:1588
+#: my-evolution/Locations.h:1587
 msgid "Norwood"
 msgstr "Norwood"
 
-#: my-evolution/Locations.h:1589
+#: my-evolution/Locations.h:1588
 msgid "Notodden"
 msgstr "Notodden"
 
-#: my-evolution/Locations.h:1590
+#: my-evolution/Locations.h:1589
 msgid "Novara/Cameri"
 msgstr "Novara/Cameri"
 
-#: my-evolution/Locations.h:1591
+#: my-evolution/Locations.h:1590
 msgid "Nova Scotia"
 msgstr "Nova Scotia"
 
-#: my-evolution/Locations.h:1592
+#: my-evolution/Locations.h:1591
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
-#: my-evolution/Locations.h:1593
+#: my-evolution/Locations.h:1592
 msgid "Nueva Gerona"
 msgstr "Nueva Gerona"
 
-#: my-evolution/Locations.h:1594
+#: my-evolution/Locations.h:1593
 msgid "Nueva Ocotepeque"
 msgstr "Nueva Ocotepeque"
 
-#: my-evolution/Locations.h:1595
+#: my-evolution/Locations.h:1594
 msgid "Nuevo Laredo"
 msgstr "Nuevo Laredo"
 
-#: my-evolution/Locations.h:1596
+#: my-evolution/Locations.h:1595
 msgid "Nurnberg"
 msgstr "Nürnberg"
 
-#: my-evolution/Locations.h:1597
+#: my-evolution/Locations.h:1596
 msgid "Nyutabaru Ab"
 msgstr "Nyutabaru Ab"
 
-#: my-evolution/Locations.h:1598
+#: my-evolution/Locations.h:1597
 msgid "Oahu"
 msgstr "Oahu"
 
-#: my-evolution/Locations.h:1599
+#: my-evolution/Locations.h:1598
 msgid "Oak Harbor"
 msgstr "Oak Harbor"
 
-#: my-evolution/Locations.h:1600
+#: my-evolution/Locations.h:1599
 msgid "Oakland"
 msgstr "Oakland"
 
-#: my-evolution/Locations.h:1601
+#: my-evolution/Locations.h:1600
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: my-evolution/Locations.h:1602
+#: my-evolution/Locations.h:1601
 msgid "Oberpfaffenhofen"
 msgstr "Oberpfaffenhofen"
 
-#: my-evolution/Locations.h:1603
+#: my-evolution/Locations.h:1602
 msgid "Obihiro Airport"
 msgstr "Obihiro flyplass"
 
-#: my-evolution/Locations.h:1604
+#: my-evolution/Locations.h:1603
 msgid "Ocala"
 msgstr "Ocalu"
 
-#: my-evolution/Locations.h:1605
+#: my-evolution/Locations.h:1604
 msgid "Oceanside"
 msgstr "Oceanside"
 
-#: my-evolution/Locations.h:1606
+#: my-evolution/Locations.h:1605
 msgid "Odense"
 msgstr "Odense"
 
-#: my-evolution/Locations.h:1607
+#: my-evolution/Locations.h:1606
 msgid "Odesa"
 msgstr "Odesa"
 
-#: my-evolution/Locations.h:1608
+#: my-evolution/Locations.h:1607
 msgid "Oelwen"
 msgstr "Oelwen"
 
-#: my-evolution/Locations.h:1609
+#: my-evolution/Locations.h:1608
 msgid "Ogden"
 msgstr "Ogden"
 
-#: my-evolution/Locations.h:1610
+#: my-evolution/Locations.h:1609
 msgid "Ogden-Hill AFB"
 msgstr "Ogden-Hill AFB"
 
-#: my-evolution/Locations.h:1611
+#: my-evolution/Locations.h:1610
 msgid "Ogdensburg"
 msgstr "Ogdensburg"
 
-#: my-evolution/Locations.h:1612
+#: my-evolution/Locations.h:1611
 msgid "Ohio"
 msgstr "Ohio"
 
-#: my-evolution/Locations.h:1613
+#: my-evolution/Locations.h:1612
 msgid "Ohrid"
 msgstr "Ohrid"
 
-#: my-evolution/Locations.h:1614
+#: my-evolution/Locations.h:1613
 msgid "Oita Airport"
 msgstr "Oita flyplass"
 
-#: my-evolution/Locations.h:1615
+#: my-evolution/Locations.h:1614
 msgid "Ojika Island"
 msgstr "Ojika Island"
 
-#: my-evolution/Locations.h:1616
+#: my-evolution/Locations.h:1615
 msgid "Okayama Airport"
 msgstr "Okayama flyplass"
 
-#: my-evolution/Locations.h:1617
+#: my-evolution/Locations.h:1616
 msgid "Oki Airport"
 msgstr "Oki flyplass"
 
-#: my-evolution/Locations.h:1618
+#: my-evolution/Locations.h:1617
 msgid "Okinoerabu"
 msgstr "Okinoerabu"
 
-#: my-evolution/Locations.h:1619
+#: my-evolution/Locations.h:1618
 msgid "Oklahoma"
 msgstr "Oklahoma"
 
-#: my-evolution/Locations.h:1620
+#: my-evolution/Locations.h:1619
 msgid "Oklahoma City"
 msgstr "Oklahoma City"
 
-#: my-evolution/Locations.h:1621
+#: my-evolution/Locations.h:1620
 msgid "Oklahoma City-Bethany"
 msgstr "Oklahoma City-Bethany"
 
-#: my-evolution/Locations.h:1622
+#: my-evolution/Locations.h:1621
 msgid "Oklahoma City-Midwest City"
 msgstr "Oklahoma City-Midwest City"
 
-#: my-evolution/Locations.h:1623
+#: my-evolution/Locations.h:1622
 msgid "Okushiri Island"
 msgstr "Okushiri Island"
 
-#: my-evolution/Locations.h:1624
+#: my-evolution/Locations.h:1623
 msgid "Olathe"
 msgstr "Olathe"
 
-#: my-evolution/Locations.h:1625
+#: my-evolution/Locations.h:1624
 msgid "Olathe/Ind."
 msgstr "Olathe/Ind."
 
-#: my-evolution/Locations.h:1626
+#: my-evolution/Locations.h:1625
 msgid "Olbia"
 msgstr "Olbia"
 
-#: my-evolution/Locations.h:1627
+#: my-evolution/Locations.h:1626
 msgid "Olympia"
 msgstr "Olympia"
 
-#: my-evolution/Locations.h:1628
+#: my-evolution/Locations.h:1627
 msgid "Omaha"
 msgstr "Omaha"
 
-#: my-evolution/Locations.h:1629
+#: my-evolution/Locations.h:1628
 msgid "Omaha-Bellevue"
 msgstr "Omaha-Bellevue"
 
-#: my-evolution/Locations.h:1630
+#: my-evolution/Locations.h:1629
 msgid "Omak"
 msgstr "Omak"
 
-#: my-evolution/Locations.h:1632
+#: my-evolution/Locations.h:1631
 msgid "Ominato Ab"
 msgstr "Ominato Ab"
 
-#: my-evolution/Locations.h:1633
+#: my-evolution/Locations.h:1632
 msgid "Omsk"
 msgstr "Omsk"
 
-#: my-evolution/Locations.h:1634
+#: my-evolution/Locations.h:1633
 msgid "O'Neill"
 msgstr "O'Neill"
 
-#: my-evolution/Locations.h:1635
+#: my-evolution/Locations.h:1634
 msgid "Ontario"
 msgstr "Ontario"
 
-#: my-evolution/Locations.h:1636
+#: my-evolution/Locations.h:1635
 msgid "Oostende"
 msgstr "Oostende"
 
-#: my-evolution/Locations.h:1637
+#: my-evolution/Locations.h:1636
 msgid "Oran"
 msgstr "Oran"
 
-#: my-evolution/Locations.h:1638
+#: my-evolution/Locations.h:1637
 msgid "Oran/Es Senia"
 msgstr "Oran/Es Senia"
 
-#: my-evolution/Locations.h:1639
+#: my-evolution/Locations.h:1638
 msgid "Orange"
 msgstr "Orange"
 
-#: my-evolution/Locations.h:1640
+#: my-evolution/Locations.h:1639
 msgid "Orange City"
 msgstr "Orange City"
 
-#: my-evolution/Locations.h:1641
+#: my-evolution/Locations.h:1640
 msgid "Ord-Sharp"
 msgstr "Ord-Sharp"
 
-#: my-evolution/Locations.h:1642
+#: my-evolution/Locations.h:1641
 msgid "Oregon"
 msgstr "Oregon"
 
-#: my-evolution/Locations.h:1643
+#: my-evolution/Locations.h:1642
 msgid "Orenburg"
 msgstr "Orenburg"
 
-#: my-evolution/Locations.h:1644
+#: my-evolution/Locations.h:1643
 msgid "Orland"
 msgstr "Orland"
 
-#: my-evolution/Locations.h:1645
+#: my-evolution/Locations.h:1644
 msgid "Orlando"
 msgstr "Orlando"
 
-#: my-evolution/Locations.h:1646
+#: my-evolution/Locations.h:1645
 msgid "Orlando (Orlando International)"
 msgstr "Orlando (Orlando internasjonale)"
 
-#: my-evolution/Locations.h:1647
+#: my-evolution/Locations.h:1646
 msgid "Orsta-Volda"
 msgstr "Ørsta-Volda"
 
-#: my-evolution/Locations.h:1648
+#: my-evolution/Locations.h:1647
 msgid "Oruro"
 msgstr "Oruro"
 
-#: my-evolution/Locations.h:1649
+#: my-evolution/Locations.h:1648
 msgid "Osaka International Airport"
 msgstr "Osaka internasjonale flyplass"
 
-#: my-evolution/Locations.h:1650
+#: my-evolution/Locations.h:1649
 msgid "Osan Ab"
 msgstr "Osan Ab"
 
-#: my-evolution/Locations.h:1651
+#: my-evolution/Locations.h:1650
 msgid "Oscoda"
 msgstr "Oscoda"
 
-#: my-evolution/Locations.h:1652
+#: my-evolution/Locations.h:1651
 msgid "Oseberg A"
 msgstr "Oseberg A"
 
-#: my-evolution/Locations.h:1653
+#: my-evolution/Locations.h:1652
 msgid "Oshima Airport"
 msgstr "Oshima flyplass"
 
-#: my-evolution/Locations.h:1654
+#: my-evolution/Locations.h:1653
 msgid "Oshkosh"
 msgstr "Oshkosh"
 
-#: my-evolution/Locations.h:1655
+#: my-evolution/Locations.h:1654
 msgid "Oslo/Gardenmoen"
 msgstr "Oslo/Gardemoen"
 
-#: my-evolution/Locations.h:1656
+#: my-evolution/Locations.h:1655
 msgid "Ostrava"
 msgstr "Ostrava"
 
-#: my-evolution/Locations.h:1657
+#: my-evolution/Locations.h:1656
 msgid "Ottawa"
 msgstr "Ottawa"
 
-#: my-evolution/Locations.h:1658
+#: my-evolution/Locations.h:1657
 msgid "Ottumwa"
 msgstr "Ottumwa"
 
-#: my-evolution/Locations.h:1659
+#: my-evolution/Locations.h:1658
 msgid "Owensboro"
 msgstr "Owensboro"
 
-#: my-evolution/Locations.h:1660
+#: my-evolution/Locations.h:1659
 msgid "Owyhee"
 msgstr "Owyhee"
 
-#: my-evolution/Locations.h:1661
+#: my-evolution/Locations.h:1660
 msgid "Oxford"
 msgstr "Oxford"
 
-#: my-evolution/Locations.h:1662
+#: my-evolution/Locations.h:1661
 msgid "Oxnard"
 msgstr "Oxnard"
 
-#: my-evolution/Locations.h:1663
+#: my-evolution/Locations.h:1662
 msgid "Ozark"
 msgstr "Ozark"
 
-#: my-evolution/Locations.h:1664
+#: my-evolution/Locations.h:1663
 msgid "Ozuki Ab"
 msgstr "Ozuki Ab"
 
-#: my-evolution/Locations.h:1665
+#: my-evolution/Locations.h:1664
 msgid "Paderborn-Haxterberg"
 msgstr "Paderborn-Haxterberg"
 
-#: my-evolution/Locations.h:1666
+#: my-evolution/Locations.h:1665
 msgid "Padova"
 msgstr "Padova"
 
-#: my-evolution/Locations.h:1667
+#: my-evolution/Locations.h:1666
 msgid "Paducah"
 msgstr "Paducah"
 
-#: my-evolution/Locations.h:1668
+#: my-evolution/Locations.h:1667
 msgid "Paekado"
 msgstr "Paekado"
 
-#: my-evolution/Locations.h:1669
+#: my-evolution/Locations.h:1668
 msgid "Paengnyongdo Ab"
 msgstr "Paengnyongdo Ab"
 
-#: my-evolution/Locations.h:1670
+#: my-evolution/Locations.h:1669
 msgid "Paganella"
 msgstr "Paganella"
 
-#: my-evolution/Locations.h:1673
+#: my-evolution/Locations.h:1672
 msgid "Pa Kuei/Bakuai"
 msgstr "Pa Kuei/Bakuai"
 
-#: my-evolution/Locations.h:1674
+#: my-evolution/Locations.h:1673
 msgid "Palacios"
 msgstr "Palacios"
 
-#: my-evolution/Locations.h:1675
+#: my-evolution/Locations.h:1674
 msgid "Palermo"
 msgstr "Palermo"
 
-#: my-evolution/Locations.h:1676
+#: my-evolution/Locations.h:1675
 msgid "Palma de Mallorca"
 msgstr "Palma de Mallorca"
 
-#: my-evolution/Locations.h:1677
+#: my-evolution/Locations.h:1676
 msgid "Palmdale"
 msgstr "Palmdale"
 
-#: my-evolution/Locations.h:1678
+#: my-evolution/Locations.h:1677
 msgid "Palmer"
 msgstr "Palmer"
 
-#: my-evolution/Locations.h:1679
+#: my-evolution/Locations.h:1678
 msgid "Palm Springs"
 msgstr "Palm Springs"
 
-#: my-evolution/Locations.h:1680
+#: my-evolution/Locations.h:1679
 msgid "Palo Alto"
 msgstr "Palo Alto"
 
-#: my-evolution/Locations.h:1681
+#: my-evolution/Locations.h:1680
 msgid "Pamplona"
 msgstr "Pamplona"
 
-#: my-evolution/Locations.h:1683
+#: my-evolution/Locations.h:1682
 msgid "Panama City"
 msgstr "Panama City"
 
-#: my-evolution/Locations.h:1684
+#: my-evolution/Locations.h:1683
 msgid "Pantelleria"
 msgstr "Pantelleria"
 
-#: my-evolution/Locations.h:1685
+#: my-evolution/Locations.h:1684
 msgid "Papa"
 msgstr "Papa"
 
-#: my-evolution/Locations.h:1686
+#: my-evolution/Locations.h:1685
 msgid "Paphos"
 msgstr "Paphos"
 
-#: my-evolution/Locations.h:1688
+#: my-evolution/Locations.h:1687
 msgid "Paris"
 msgstr "Paris"
 
-#: my-evolution/Locations.h:1689
+#: my-evolution/Locations.h:1688
 msgid "Paris/Charles De Gaulle"
 msgstr "Paris/Charles De Gaulle"
 
-#: my-evolution/Locations.h:1690
+#: my-evolution/Locations.h:1689
 msgid "Paris/Le Bourget"
 msgstr "Paris/Le Bourget"
 
-#: my-evolution/Locations.h:1691
+#: my-evolution/Locations.h:1690
 msgid "Paris/Orly"
 msgstr "Paris/Orly"
 
-#: my-evolution/Locations.h:1692
+#: my-evolution/Locations.h:1691
 msgid "Parkersburg"
 msgstr "Parkersburg:"
 
-#: my-evolution/Locations.h:1693
+#: my-evolution/Locations.h:1692
 msgid "Pasco"
 msgstr "Pasco"
 
-#: my-evolution/Locations.h:1694
+#: my-evolution/Locations.h:1693
 msgid "Paso De Los Libres"
 msgstr "Paso De Los Libres"
 
-#: my-evolution/Locations.h:1695
+#: my-evolution/Locations.h:1694
 msgid "Paso Robles"
 msgstr "Paso Robles"
 
-#: my-evolution/Locations.h:1696
+#: my-evolution/Locations.h:1695
 msgid "Passo dei Giovi"
 msgstr "Passo dei Giovi"
 
-#: my-evolution/Locations.h:1697
+#: my-evolution/Locations.h:1696
 msgid "Passo della Cisa"
 msgstr "Passo della Cisa"
 
-#: my-evolution/Locations.h:1698
+#: my-evolution/Locations.h:1697
 msgid "Passo Resia"
 msgstr "Passo Resia"
 
-#: my-evolution/Locations.h:1699
+#: my-evolution/Locations.h:1698
 msgid "Passo Rolle"
 msgstr "Passo Rolle"
 
-#: my-evolution/Locations.h:1700
+#: my-evolution/Locations.h:1699
 msgid "Patna"
 msgstr "Patna"
 
-#: my-evolution/Locations.h:1701
+#: my-evolution/Locations.h:1700
 msgid "Patterson"
 msgstr "Patterson"
 
-#: my-evolution/Locations.h:1702
+#: my-evolution/Locations.h:1701
 msgid "Patuxent River"
 msgstr "Patuxent River"
 
-#: my-evolution/Locations.h:1703
+#: my-evolution/Locations.h:1702
 msgid "Pau/Pyrenees"
 msgstr "Pau/Pyreneene"
 
-#: my-evolution/Locations.h:1704
+#: my-evolution/Locations.h:1703
 msgid "Paxson"
 msgstr "Paxson"
 
-#: my-evolution/Locations.h:1705
+#: my-evolution/Locations.h:1704
 msgid "Paysandu"
 msgstr "Paysandu"
 
-#: my-evolution/Locations.h:1706
+#: my-evolution/Locations.h:1705
 msgid "Payson"
 msgstr "Payson:"
 
-#: my-evolution/Locations.h:1707
+#: my-evolution/Locations.h:1706
 msgid "Pellston"
 msgstr "Pellston"
 
-#: my-evolution/Locations.h:1708
+#: my-evolution/Locations.h:1707
 msgid "Pelotas"
 msgstr "Pelotas"
 
-#: my-evolution/Locations.h:1709
+#: my-evolution/Locations.h:1708
 msgid "Pendleton"
 msgstr "Pendleton:"
 
-#: my-evolution/Locations.h:1710
+#: my-evolution/Locations.h:1709
 msgid "Pennsylvania"
 msgstr "Pennsylvania"
 
-#: my-evolution/Locations.h:1711
+#: my-evolution/Locations.h:1710
 msgid "Penn Yan"
 msgstr "Penn Yan"
 
-#: my-evolution/Locations.h:1712
+#: my-evolution/Locations.h:1711
 msgid "Pensacola"
 msgstr "Pensacola"
 
-#: my-evolution/Locations.h:1713
+#: my-evolution/Locations.h:1712
 msgid "Pensacola NAS"
 msgstr "Pensacola NAS"
 
-#: my-evolution/Locations.h:1714
+#: my-evolution/Locations.h:1713
 msgid "People's Republic of China"
 msgstr "Folkerepublikken Kina"
 
-#: my-evolution/Locations.h:1715
+#: my-evolution/Locations.h:1714
 msgid "Peoria"
 msgstr "Peoria"
 
-#: my-evolution/Locations.h:1716
+#: my-evolution/Locations.h:1715
 msgid "Pequot Lakes"
 msgstr "Pequot Lakes"
 
-#: my-evolution/Locations.h:1717
+#: my-evolution/Locations.h:1716
 msgid "Pereira/Matecana"
 msgstr "Pereira/Matecana"
 
-#: my-evolution/Locations.h:1718
+#: my-evolution/Locations.h:1717
 msgid "Perm"
 msgstr "Perm"
 
-#: my-evolution/Locations.h:1719
+#: my-evolution/Locations.h:1718
 msgid "Perpignan-Rivesaltes"
 msgstr "Perpugnan-Rivesaltes"
 
-#: my-evolution/Locations.h:1720
+#: my-evolution/Locations.h:1719
 msgid "Perry-Foley"
 msgstr "Perry-Foley"
 
-#: my-evolution/Locations.h:1721
+#: my-evolution/Locations.h:1720
 msgid "Perth"
 msgstr "Perth"
 
-#: my-evolution/Locations.h:1723
+#: my-evolution/Locations.h:1722
 msgid "Perugia"
 msgstr "Perugia"
 
-#: my-evolution/Locations.h:1724
+#: my-evolution/Locations.h:1723
 msgid "Pescara"
 msgstr "Pescara"
 
-#: my-evolution/Locations.h:1725
+#: my-evolution/Locations.h:1724
 msgid "Petersburg"
 msgstr "Petersburg"
 
-#: my-evolution/Locations.h:1726
+#: my-evolution/Locations.h:1725
 msgid "Petropavlovsk-Kamchatsky"
 msgstr "Petropavlovsk-Kamchatsky"
 
-#: my-evolution/Locations.h:1727
+#: my-evolution/Locations.h:1726
 msgid "Petrozavodsk"
 msgstr "Petrozadovsk"
 
-#: my-evolution/Locations.h:1728
+#: my-evolution/Locations.h:1727
 msgid "Philadelphia"
 msgstr "Philadelphia"
 
-#: my-evolution/Locations.h:1729
+#: my-evolution/Locations.h:1728
 msgid "Philip"
 msgstr "Philip"
 
-#: my-evolution/Locations.h:1730
+#: my-evolution/Locations.h:1729
 msgid "Philipsburg"
 msgstr "Philipsburg"
 
-#: my-evolution/Locations.h:1731
+#: my-evolution/Locations.h:1730
 msgid "Phillips"
 msgstr "Phillips"
 
-#: my-evolution/Locations.h:1732
+#: my-evolution/Locations.h:1731
 msgid "Phoenix"
 msgstr "Phoenix"
 
-#: my-evolution/Locations.h:1733
+#: my-evolution/Locations.h:1732
 msgid "Phoenix-Deer Valley"
 msgstr "Phoenix-Deer Valley"
 
-#: my-evolution/Locations.h:1734
+#: my-evolution/Locations.h:1733
 msgid "Phoenix-Goodyear"
 msgstr "Phoenix-Goodyear"
 
-#: my-evolution/Locations.h:1735
+#: my-evolution/Locations.h:1734
 msgid "Phoenix-Luke AFB"
 msgstr "Phoenix-Luke AFB"
 
-#: my-evolution/Locations.h:1736
+#: my-evolution/Locations.h:1735
 msgid "Piacenza"
 msgstr "Piacenza"
 
-#: my-evolution/Locations.h:1737
+#: my-evolution/Locations.h:1736
 msgid "Pian Rosa"
 msgstr "Pian Rosa"
 
-#: my-evolution/Locations.h:1738
+#: my-evolution/Locations.h:1737
 msgid "Piedras Negras"
 msgstr "Piedras Negras"
 
-#: my-evolution/Locations.h:1739
+#: my-evolution/Locations.h:1738
 msgid "Pierre"
 msgstr "Pierre"
 
-#: my-evolution/Locations.h:1740
+#: my-evolution/Locations.h:1739
 msgid "Pietersburg"
 msgstr "Pietersburg"
 
-#: my-evolution/Locations.h:1741
+#: my-evolution/Locations.h:1740
 msgid "Pikeville"
 msgstr "Pikeville"
 
-#: my-evolution/Locations.h:1742
+#: my-evolution/Locations.h:1741
 msgid "Pine Bluff"
 msgstr "Pine Bluff"
 
-#: my-evolution/Locations.h:1743
+#: my-evolution/Locations.h:1742
 msgid "Pingtung North"
 msgstr "Pingtung nord"
 
-#: my-evolution/Locations.h:1744
+#: my-evolution/Locations.h:1743
 msgid "Pingtung South"
 msgstr "Pingtung syd"
 
-#: my-evolution/Locations.h:1745
+#: my-evolution/Locations.h:1744
 msgid "Pirassununga"
 msgstr "Pirassununga"
 
-#: my-evolution/Locations.h:1746
+#: my-evolution/Locations.h:1745
 msgid "Pisa"
 msgstr "Pisa"
 
-#: my-evolution/Locations.h:1747
+#: my-evolution/Locations.h:1746
 msgid "Pisco"
 msgstr "Pisco"
 
-#: my-evolution/Locations.h:1748
+#: my-evolution/Locations.h:1747
 msgid "Pittsburgh"
 msgstr "Pittsburgh"
 
-#: my-evolution/Locations.h:1749
+#: my-evolution/Locations.h:1748
 msgid "Pittsburgh-West Mifflin"
 msgstr "Pittsburgh-West Mifflin"
 
-#: my-evolution/Locations.h:1750
+#: my-evolution/Locations.h:1749
 msgid "Plattsburg"
 msgstr "Plattsburg"
 
-#: my-evolution/Locations.h:1751
+#: my-evolution/Locations.h:1750
 msgid "Plovdiv"
 msgstr "Plovdiv"
 
-#: my-evolution/Locations.h:1752
+#: my-evolution/Locations.h:1751
 msgid "Plymouth"
 msgstr "Plymouth"
 
-#: my-evolution/Locations.h:1753
+#: my-evolution/Locations.h:1752
 msgid "Pocatello"
 msgstr "Pocatello"
 
-#: my-evolution/Locations.h:1754
+#: my-evolution/Locations.h:1753
 msgid "Pocos De Caldas"
 msgstr "Pocos De Caldas"
 
-#: my-evolution/Locations.h:1755
+#: my-evolution/Locations.h:1754
 msgid "Podgorica"
 msgstr "Podgorica"
 
-#: my-evolution/Locations.h:1756
+#: my-evolution/Locations.h:1755
 msgid "Podgorica Titograd"
 msgstr "Podgorica Titograd"
 
-#: my-evolution/Locations.h:1757
+#: my-evolution/Locations.h:1756
 msgid "Pohang Ab"
 msgstr "Pohang Ab"
 
-#: my-evolution/Locations.h:1758
+#: my-evolution/Locations.h:1757
 msgid "Point Hope"
 msgstr "Point Hope"
 
-#: my-evolution/Locations.h:1759
+#: my-evolution/Locations.h:1758
 msgid "Point Lay"
 msgstr "Point Lay"
 
-#: my-evolution/Locations.h:1760
+#: my-evolution/Locations.h:1759
 msgid "Point Mugu"
 msgstr "Point Mugu"
 
-#: my-evolution/Locations.h:1761
+#: my-evolution/Locations.h:1760
 msgid "Point Piedras Blanca"
 msgstr "Point Piedras Blanca"
 
-#: my-evolution/Locations.h:1762
+#: my-evolution/Locations.h:1761
 msgid "Poitiers"
 msgstr "Poitiers"
 
-#: my-evolution/Locations.h:1764
+#: my-evolution/Locations.h:1763
 msgid "Pompano Beach"
 msgstr "Pompano Beach"
 
-#: my-evolution/Locations.h:1765
+#: my-evolution/Locations.h:1764
 msgid "Ponca City"
 msgstr "Ponca City"
 
-#: my-evolution/Locations.h:1766
+#: my-evolution/Locations.h:1765
 msgid "Ponce"
 msgstr "Ponce"
 
-#: my-evolution/Locations.h:1767
+#: my-evolution/Locations.h:1766
 msgid "Ponta Pora"
 msgstr "Ponta Pora"
 
-#: my-evolution/Locations.h:1768
+#: my-evolution/Locations.h:1767
 msgid "Pontiac"
 msgstr "Pontiac"
 
-#: my-evolution/Locations.h:1769
+#: my-evolution/Locations.h:1768
 msgid "Pope AFB"
 msgstr "Pope AFB"
 
-#: my-evolution/Locations.h:1770
+#: my-evolution/Locations.h:1769
 msgid "Poplar Bluff"
 msgstr "Poplar Bluff"
 
-#: my-evolution/Locations.h:1771
+#: my-evolution/Locations.h:1770
 msgid "Poprad"
 msgstr "Poprad"
 
-#: my-evolution/Locations.h:1772
+#: my-evolution/Locations.h:1771
 msgid "Port Alexander"
 msgstr "Port Alexander"
 
-#: my-evolution/Locations.h:1773
+#: my-evolution/Locations.h:1772
 msgid "Port Alsworth"
 msgstr "Port Alsworth"
 
-#: my-evolution/Locations.h:1774
+#: my-evolution/Locations.h:1773
 msgid "Port Angeles"
 msgstr "Port Angeles"
 
-#: my-evolution/Locations.h:1775
+#: my-evolution/Locations.h:1774
 msgid "Port-Au-Prince"
 msgstr "Port-Au-Prince"
 
-#: my-evolution/Locations.h:1776
+#: my-evolution/Locations.h:1775
 msgid "Port Elizabeth"
 msgstr "Port Elizabeth"
 
-#: my-evolution/Locations.h:1777
+#: my-evolution/Locations.h:1776
 msgid "Porterville"
 msgstr "Porterville"
 
-#: my-evolution/Locations.h:1778
+#: my-evolution/Locations.h:1777
 msgid "Port Hardy"
 msgstr "Port Hardy"
 
-#: my-evolution/Locations.h:1779
+#: my-evolution/Locations.h:1778
 msgid "Port Hedland"
 msgstr "Port Hedland"
 
-#: my-evolution/Locations.h:1780
+#: my-evolution/Locations.h:1779
 msgid "Port Heiden"
 msgstr "Port Heiden"
 
-#: my-evolution/Locations.h:1781
+#: my-evolution/Locations.h:1780
 msgid "Portland"
 msgstr "Portland"
 
-#: my-evolution/Locations.h:1782
+#: my-evolution/Locations.h:1781
 msgid "Porto"
 msgstr "Porto"
 
-#: my-evolution/Locations.h:1783
+#: my-evolution/Locations.h:1782
 msgid "Porto Alegre"
 msgstr "Porto Alegre"
 
-#: my-evolution/Locations.h:1784
+#: my-evolution/Locations.h:1783
 msgid "Porto Alegre Apt"
 msgstr "Porte Alegre Apt"
 
-#: my-evolution/Locations.h:1785
+#: my-evolution/Locations.h:1784
 msgid "Portoroz"
 msgstr "Portoroz"
 
-#: my-evolution/Locations.h:1786
+#: my-evolution/Locations.h:1785
 msgid "Porto Santo"
 msgstr "Porto Santo"
 
-#: my-evolution/Locations.h:1787
+#: my-evolution/Locations.h:1786
 msgid "Porto Velho"
 msgstr "Porto Velho"
 
-#: my-evolution/Locations.h:1788
+#: my-evolution/Locations.h:1787
 msgid "Port Said"
 msgstr "Port Said"
 
-#: my-evolution/Locations.h:1789
+#: my-evolution/Locations.h:1788
 msgid "Portsmouth"
 msgstr "Portsmouth"
 
-#: my-evolution/Locations.h:1791
+#: my-evolution/Locations.h:1790
 msgid "Posadas"
 msgstr "Posadas"
 
-#: my-evolution/Locations.h:1792
+#: my-evolution/Locations.h:1791
 msgid "Potosi"
 msgstr "Potosi"
 
-#: my-evolution/Locations.h:1793
+#: my-evolution/Locations.h:1792
 msgid "Poughkeepsie"
 msgstr "Poughkeepsie"
 
-#: my-evolution/Locations.h:1794
+#: my-evolution/Locations.h:1793
 msgid "Pownal"
 msgstr "Pownal"
 
-#: my-evolution/Locations.h:1795
+#: my-evolution/Locations.h:1794
 msgid "Poza Rica"
 msgstr "Poza Rica"
 
-#: my-evolution/Locations.h:1796
+#: my-evolution/Locations.h:1795
 msgid "Poznan"
 msgstr "Poznan"
 
-#: my-evolution/Locations.h:1797
+#: my-evolution/Locations.h:1796
 msgid "Praha"
 msgstr "Praha"
 
-#: my-evolution/Locations.h:1798
+#: my-evolution/Locations.h:1797
 msgid "Pratica di Mare"
 msgstr "Pratica di Mare"
 
-#: my-evolution/Locations.h:1799
+#: my-evolution/Locations.h:1798
 msgid "Prescott"
 msgstr "Prescott"
 
-#: my-evolution/Locations.h:1800
+#: my-evolution/Locations.h:1799
 msgid "Presidente Prudente"
 msgstr "Presidente Prudente"
 
-#: my-evolution/Locations.h:1801
+#: my-evolution/Locations.h:1800
 msgid "Presque Isle"
 msgstr "Presque Isle"
 
-#: my-evolution/Locations.h:1802
+#: my-evolution/Locations.h:1801
 msgid "Prestwick"
 msgstr "Prestwick"
 
-#: my-evolution/Locations.h:1803
+#: my-evolution/Locations.h:1802
 msgid "Pretoria"
 msgstr "Pretoria"
 
-#: my-evolution/Locations.h:1804
+#: my-evolution/Locations.h:1803
 msgid "Preveza"
 msgstr "Preveza"
 
-#: my-evolution/Locations.h:1805
+#: my-evolution/Locations.h:1804
 msgid "Price-Carbon"
 msgstr "Price-Carbon"
 
-#: my-evolution/Locations.h:1806
+#: my-evolution/Locations.h:1805
 msgid "Pristina"
 msgstr "Pristina"
 
-#: my-evolution/Locations.h:1807
+#: my-evolution/Locations.h:1806
 msgid "Providence"
 msgstr "Providence"
 
-#: my-evolution/Locations.h:1808
+#: my-evolution/Locations.h:1807
 msgid "Provincetown"
 msgstr "Provincetown"
 
-#: my-evolution/Locations.h:1809
+#: my-evolution/Locations.h:1808
 msgid "Provo"
 msgstr "Provo"
 
-#: my-evolution/Locations.h:1810
+#: my-evolution/Locations.h:1809
 msgid "Pskov"
 msgstr "Pskov"
 
-#: my-evolution/Locations.h:1811
+#: my-evolution/Locations.h:1810
 msgid "Pucallpa"
 msgstr "Pucallpa"
 
-#: my-evolution/Locations.h:1812
+#: my-evolution/Locations.h:1811
 msgid "Pudahuel"
 msgstr "Pudahuel"
 
-#: my-evolution/Locations.h:1813
+#: my-evolution/Locations.h:1812
 msgid "Puebla"
 msgstr "Puebla"
 
-#: my-evolution/Locations.h:1814
+#: my-evolution/Locations.h:1813
 msgid "Pueblo"
 msgstr "Pueblo"
 
-#: my-evolution/Locations.h:1815
+#: my-evolution/Locations.h:1814
 msgid "Puerto Barrios"
 msgstr "Puerto Barrios"
 
-#: my-evolution/Locations.h:1816
+#: my-evolution/Locations.h:1815
 msgid "Puerto Cabezas"
 msgstr "Puerto Cabezas"
 
-#: my-evolution/Locations.h:1817
+#: my-evolution/Locations.h:1816
 msgid "Puerto Escondido"
 msgstr "Puerto Escondido"
 
-#: my-evolution/Locations.h:1818
+#: my-evolution/Locations.h:1817
 msgid "Puerto Lempira"
 msgstr "Puerto Lempira"
 
-#: my-evolution/Locations.h:1819
+#: my-evolution/Locations.h:1818
 msgid "Puerto Limon"
 msgstr "Puerto Limon"
 
-#: my-evolution/Locations.h:1820
+#: my-evolution/Locations.h:1819
 msgid "Puerto Maldonado"
 msgstr "Puerto Maldonado"
 
-#: my-evolution/Locations.h:1821
+#: my-evolution/Locations.h:1820
 msgid "Puerto Montt"
 msgstr "Puerto Montt"
 
-#: my-evolution/Locations.h:1822
+#: my-evolution/Locations.h:1821
 msgid "Puerto Plata"
 msgstr "Puerto Plata"
 
-#: my-evolution/Locations.h:1824
+#: my-evolution/Locations.h:1823
 msgid "Puerto Suarez"
 msgstr "Puerto Suarez"
 
-#: my-evolution/Locations.h:1825
+#: my-evolution/Locations.h:1824
 msgid "Puerto Vallarta"
 msgstr "Puerto Vallarta"
 
-#: my-evolution/Locations.h:1826
+#: my-evolution/Locations.h:1825
 msgid "Pula"
 msgstr "Pula"
 
-#: my-evolution/Locations.h:1827
+#: my-evolution/Locations.h:1826
 msgid "Pullman"
 msgstr "Pullman"
 
-#: my-evolution/Locations.h:1828
+#: my-evolution/Locations.h:1827
 msgid "Punta Arenas"
 msgstr "Punta Arenas"
 
-#: my-evolution/Locations.h:1829
+#: my-evolution/Locations.h:1828
 msgid "Punta Cana"
 msgstr "Punta Cana"
 
-#: my-evolution/Locations.h:1830
+#: my-evolution/Locations.h:1829
 msgid "Punta Gorda"
 msgstr "Punta Gorda"
 
-#: my-evolution/Locations.h:1831
+#: my-evolution/Locations.h:1830
 msgid "Puntilla Lake"
 msgstr "Puntilla Lake"
 
-#: my-evolution/Locations.h:1832
+#: my-evolution/Locations.h:1831
 msgid "Pusan/Kimhae"
 msgstr "Pusan/Kimhae"
 
-#: my-evolution/Locations.h:1833
+#: my-evolution/Locations.h:1832
 msgid "Pyongtaek Ab"
 msgstr "Pyongtaek Ab"
 
-#: my-evolution/Locations.h:1834
+#: my-evolution/Locations.h:1833
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
-#: my-evolution/Locations.h:1836
+#: my-evolution/Locations.h:1835
 msgid "Quantico"
 msgstr "Quantico"
 
-#: my-evolution/Locations.h:1837
+#: my-evolution/Locations.h:1836
 msgid "Quebec"
 msgstr "Quebec"
 
-#: my-evolution/Locations.h:1838
+#: my-evolution/Locations.h:1837
 msgid "Quebec City"
 msgstr "Quebec City"
 
-#: my-evolution/Locations.h:1839
+#: my-evolution/Locations.h:1838
 msgid "Queretaro"
 msgstr "Queretaro"
 
-#: my-evolution/Locations.h:1840
+#: my-evolution/Locations.h:1839
 msgid "Quillayute"
 msgstr "Quillayute"
 
-#: my-evolution/Locations.h:1841
+#: my-evolution/Locations.h:1840
 msgid "Quimper"
 msgstr "Quimper"
 
-#: my-evolution/Locations.h:1842
+#: my-evolution/Locations.h:1841
 msgid "Quincy"
 msgstr "Quincy"
 
-#: my-evolution/Locations.h:1843
+#: my-evolution/Locations.h:1842
 msgid "Quito/Mariscal Sucre"
 msgstr "Quito/Mariscal Sucre"
 
-#: my-evolution/Locations.h:1844
+#: my-evolution/Locations.h:1843
 msgid "Rabat"
 msgstr "Rabat"
 
-#: my-evolution/Locations.h:1845
+#: my-evolution/Locations.h:1844
 msgid "Raduzhny"
 msgstr "Raduzhny"
 
-#: my-evolution/Locations.h:1846
+#: my-evolution/Locations.h:1845
 msgid "Rafha"
 msgstr "Rafha"
 
-#: my-evolution/Locations.h:1847
+#: my-evolution/Locations.h:1846
 msgid "Raleigh-Durham"
 msgstr "Raleigh-Durham"
 
-#: my-evolution/Locations.h:1848
+#: my-evolution/Locations.h:1847
 msgid "Randolph AFB"
 msgstr "Randolph AFB"
 
-#: my-evolution/Locations.h:1849
+#: my-evolution/Locations.h:1848
 msgid "Rapid City"
 msgstr "Rapid City"
 
-#: my-evolution/Locations.h:1850
+#: my-evolution/Locations.h:1849
 msgid "Rapid City-Ellsworth AFB"
 msgstr "Rapid City-Ellsworth AFB"
 
-#: my-evolution/Locations.h:1851
+#: my-evolution/Locations.h:1850
 msgid "Ras Al Khaimah"
 msgstr "Ras Al Khaimah"
 
-#: my-evolution/Locations.h:1852
+#: my-evolution/Locations.h:1851
 msgid "Rawlins"
 msgstr "Rawlins"
 
-#: my-evolution/Locations.h:1853
+#: my-evolution/Locations.h:1852
 msgid "Reading"
 msgstr "Reading"
 
-#: my-evolution/Locations.h:1854
+#: my-evolution/Locations.h:1853
 msgid "Rebun Island"
 msgstr "Rebun Island"
 
-#: my-evolution/Locations.h:1855
+#: my-evolution/Locations.h:1854
 msgid "Recife"
 msgstr "Recife"
 
-#: my-evolution/Locations.h:1856
+#: my-evolution/Locations.h:1855
 msgid "Red Bluff"
 msgstr "Red Bluff"
 
-#: my-evolution/Locations.h:1857
+#: my-evolution/Locations.h:1856
 msgid "Redding"
 msgstr "Redding"
 
-#: my-evolution/Locations.h:1858
+#: my-evolution/Locations.h:1857
 msgid "Redig"
 msgstr "Redig"
 
-#: my-evolution/Locations.h:1859
+#: my-evolution/Locations.h:1858
 msgid "Redmond"
 msgstr "Redmond"
 
-#: my-evolution/Locations.h:1860
+#: my-evolution/Locations.h:1859
 msgid "Red Oak"
 msgstr "Red Oak"
 
-#: my-evolution/Locations.h:1861
+#: my-evolution/Locations.h:1860
 msgid "Redwood Falls"
 msgstr "Redwood Falls"
 
-#: my-evolution/Locations.h:1862
+#: my-evolution/Locations.h:1861
 msgid "Reggio Calabria"
 msgstr "Reggio Calabria"
 
-#: my-evolution/Locations.h:1863
+#: my-evolution/Locations.h:1862
 msgid "Regina"
 msgstr "Regina"
 
-#: my-evolution/Locations.h:1864
+#: my-evolution/Locations.h:1863
 msgid "Reims-Champagne"
 msgstr "Reims-Champagne"
 
-#: my-evolution/Locations.h:1865
+#: my-evolution/Locations.h:1864
 msgid "Rennes"
 msgstr "Rennes"
 
-#: my-evolution/Locations.h:1866
+#: my-evolution/Locations.h:1865
 msgid "Reno"
 msgstr "Reno"
 
-#: my-evolution/Locations.h:1867
+#: my-evolution/Locations.h:1866
 msgid "Renton"
 msgstr "Renton"
 
-#: my-evolution/Locations.h:1868
+#: my-evolution/Locations.h:1867
 msgid "Resistencia"
 msgstr "Resistencia"
 
-#: my-evolution/Locations.h:1869
+#: my-evolution/Locations.h:1868
 msgid "Reus"
 msgstr "Reus"
 
-#: my-evolution/Locations.h:1870
+#: my-evolution/Locations.h:1869
 msgid "Reyes"
 msgstr "Reyes"
 
-#: my-evolution/Locations.h:1871
+#: my-evolution/Locations.h:1870
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
-#: my-evolution/Locations.h:1872
+#: my-evolution/Locations.h:1871
 msgid "Reynosa"
 msgstr "Reynosa"
 
-#: my-evolution/Locations.h:1873
+#: my-evolution/Locations.h:1872
 msgid "Rhinelander"
 msgstr "Rhinelander"
 
-#: my-evolution/Locations.h:1874
+#: my-evolution/Locations.h:1873
 msgid "Rhode Island"
 msgstr "Rhode Island"
 
-#: my-evolution/Locations.h:1875
+#: my-evolution/Locations.h:1874
 msgid "Riberalta"
 msgstr "Riberalta"
 
-#: my-evolution/Locations.h:1876
+#: my-evolution/Locations.h:1875
 msgid "Richmond"
 msgstr "Richmond"
 
-#: my-evolution/Locations.h:1877
+#: my-evolution/Locations.h:1876
 msgid "Rickenbacker"
 msgstr "Rickenbacker"
 
-#: my-evolution/Locations.h:1878
+#: my-evolution/Locations.h:1877
 msgid "Rieti"
 msgstr "Rieti"
 
-#: my-evolution/Locations.h:1879
+#: my-evolution/Locations.h:1878
 msgid "Rifle"
 msgstr "Rifle"
 
-#: my-evolution/Locations.h:1880
+#: my-evolution/Locations.h:1879
 msgid "Rijeka"
 msgstr "Rijeka"
 
-#: my-evolution/Locations.h:1881
+#: my-evolution/Locations.h:1880
 msgid "Rimini"
 msgstr "Rimini"
 
-#: my-evolution/Locations.h:1882
+#: my-evolution/Locations.h:1881
 msgid "Rio De Janeiro"
 msgstr "Rio De Janeiro"
 
-#: my-evolution/Locations.h:1883
+#: my-evolution/Locations.h:1882
 msgid "Rio Gallegos"
 msgstr "Rio Gallegos"
 
-#: my-evolution/Locations.h:1884
+#: my-evolution/Locations.h:1883
 msgid "Rio Grande"
 msgstr "Rio Grande"
 
-#: my-evolution/Locations.h:1885
+#: my-evolution/Locations.h:1884
 msgid "Rioja"
 msgstr "Rioja"
 
-#: my-evolution/Locations.h:1886
+#: my-evolution/Locations.h:1885
 msgid "Rio / Jacarepagua"
 msgstr "Rio / Jacarepagua"
 
-#: my-evolution/Locations.h:1887
+#: my-evolution/Locations.h:1886
 msgid "Rionegro/J.M.Cordova"
 msgstr "Rionegro/J.M.Cordova"
 
-#: my-evolution/Locations.h:1888
+#: my-evolution/Locations.h:1887
 msgid "Rishiri Island"
 msgstr "Rishiri Island"
 
-#: my-evolution/Locations.h:1889
+#: my-evolution/Locations.h:1888
 msgid "Rivas"
 msgstr "Rivas"
 
-#: my-evolution/Locations.h:1890
+#: my-evolution/Locations.h:1889
 msgid "Rivera"
 msgstr "Rivera"
 
-#: my-evolution/Locations.h:1891
+#: my-evolution/Locations.h:1890
 msgid "Riverside"
 msgstr "Riverside"
 
-#: my-evolution/Locations.h:1892
+#: my-evolution/Locations.h:1891
 msgid "Riverside/March AFB"
 msgstr "Riverside/March AFB"
 
-#: my-evolution/Locations.h:1893
+#: my-evolution/Locations.h:1892
 msgid "Riverton"
 msgstr "Riverton"
 
-#: my-evolution/Locations.h:1894
+#: my-evolution/Locations.h:1893
 msgid "Rivne"
 msgstr "Rivne"
 
-#: my-evolution/Locations.h:1895
+#: my-evolution/Locations.h:1894
 msgid "Rivolto"
 msgstr "Rivolto"
 
-#: my-evolution/Locations.h:1896
+#: my-evolution/Locations.h:1895
 msgid "Riyadh"
 msgstr "Riyadh"
 
-#: my-evolution/Locations.h:1897
+#: my-evolution/Locations.h:1896
 msgid "Roanoke"
 msgstr "Roanoke"
 
-#: my-evolution/Locations.h:1898
+#: my-evolution/Locations.h:1897
 msgid "Roatan"
 msgstr "Rostan"
 
-#: my-evolution/Locations.h:1899
+#: my-evolution/Locations.h:1898
 msgid "Robore"
 msgstr "Robore"
 
-#: my-evolution/Locations.h:1900
+#: my-evolution/Locations.h:1899
 msgid "Rochester"
 msgstr "Rochester"
 
-#: my-evolution/Locations.h:1901
+#: my-evolution/Locations.h:1900
 msgid "Rockford"
 msgstr "Rockford"
 
-#: my-evolution/Locations.h:1902
+#: my-evolution/Locations.h:1901
 msgid "Rockland"
 msgstr "Rockland"
 
-#: my-evolution/Locations.h:1903
+#: my-evolution/Locations.h:1902
 msgid "Rockport"
 msgstr "Rockport"
 
-#: my-evolution/Locations.h:1904
+#: my-evolution/Locations.h:1903
 msgid "Rock Springs"
 msgstr "Rock Springs"
 
-#: my-evolution/Locations.h:1905
+#: my-evolution/Locations.h:1904
 msgid "Rocky Mount"
 msgstr "Rocky Mount"
 
-#: my-evolution/Locations.h:1906
+#: my-evolution/Locations.h:1905
 msgid "Rodos"
 msgstr "Rodos"
 
-#: my-evolution/Locations.h:1907
+#: my-evolution/Locations.h:1906
 msgid "Rogers"
 msgstr "Rogers"
 
-#: my-evolution/Locations.h:1908
+#: my-evolution/Locations.h:1907
 msgid "Roma/Ciampino"
 msgstr "Roma/Ciampino"
 
-#: my-evolution/Locations.h:1909
+#: my-evolution/Locations.h:1908
 msgid "Roma/Fiumicino"
 msgstr "Roma/Fiumicino"
 
-#: my-evolution/Locations.h:1911
+#: my-evolution/Locations.h:1910
 msgid "Roma/Urbe"
 msgstr "Roma/Urbe"
 
-#: my-evolution/Locations.h:1912
+#: my-evolution/Locations.h:1911
 msgid "Rome-Russell"
 msgstr "Rome-Russel"
 
-#: my-evolution/Locations.h:1913
+#: my-evolution/Locations.h:1912
 msgid "Ronchi de' Legionari"
 msgstr "Ronchi de' Legionari"
 
-#: my-evolution/Locations.h:1914
+#: my-evolution/Locations.h:1913
 msgid "Ronneby"
 msgstr "Rønneby"
 
-#: my-evolution/Locations.h:1915
+#: my-evolution/Locations.h:1914
 msgid "Roosevelt"
 msgstr "Roosevelt"
 
-#: my-evolution/Locations.h:1916
+#: my-evolution/Locations.h:1915
 msgid "Roros"
 msgstr "Røros"
 
-#: my-evolution/Locations.h:1917
+#: my-evolution/Locations.h:1916
 msgid "Rorvik/Ryum"
 msgstr "Rørvik/Ryum"
 
-#: my-evolution/Locations.h:1918
+#: my-evolution/Locations.h:1917
 msgid "Rosario"
 msgstr "Rosario"
 
-#: my-evolution/Locations.h:1919
+#: my-evolution/Locations.h:1918
 msgid "Roseburg"
 msgstr "Roseburg"
 
-#: my-evolution/Locations.h:1920
+#: my-evolution/Locations.h:1919
 msgid "Roseglen"
 msgstr "Roseglen"
 
-#: my-evolution/Locations.h:1921
+#: my-evolution/Locations.h:1920
 msgid "Rost"
 msgstr "Røst"
 
-#: my-evolution/Locations.h:1922
+#: my-evolution/Locations.h:1921
 msgid "Rostov-Na-Donu"
 msgstr "Rostov-Na-Donu"
 
-#: my-evolution/Locations.h:1923
+#: my-evolution/Locations.h:1922
 msgid "Roswell"
 msgstr "Roswell"
 
-#: my-evolution/Locations.h:1924
+#: my-evolution/Locations.h:1923
 msgid "Rotterdam"
 msgstr "Rotterdam"
 
-#: my-evolution/Locations.h:1925
+#: my-evolution/Locations.h:1924
 msgid "Rouen-Valle de Seine"
 msgstr "Rouen-Valle de Seine"
 
-#: my-evolution/Locations.h:1926
+#: my-evolution/Locations.h:1925
 msgid "Ruidoso-Sierra Blanca"
 msgstr "Ruidoso-Sierra Blanca"
 
-#: my-evolution/Locations.h:1927
+#: my-evolution/Locations.h:1926
 msgid "Rurrenabaque"
 msgstr "Rurrenabaque"
 
-#: my-evolution/Locations.h:1928
+#: my-evolution/Locations.h:1927
 msgid "Russell"
 msgstr "Russell"
 
-#: my-evolution/Locations.h:1929
+#: my-evolution/Locations.h:1928
 msgid "Russia"
 msgstr "Russland"
 
-#: my-evolution/Locations.h:1930
+#: my-evolution/Locations.h:1929
 msgid "Rutland"
 msgstr "Rutland"
 
-#: my-evolution/Locations.h:1931
+#: my-evolution/Locations.h:1930
 msgid "Rygge"
 msgstr "Rygge"
 
-#: my-evolution/Locations.h:1932
+#: my-evolution/Locations.h:1931
 msgid "Rzeszow"
 msgstr "Rzeszow"
 
-#: my-evolution/Locations.h:1933
+#: my-evolution/Locations.h:1932
 msgid "Saarbrucken"
 msgstr "Saarbrücken"
 
-#: my-evolution/Locations.h:1934
+#: my-evolution/Locations.h:1933
 msgid "Sabine Pass"
 msgstr "Sabine Pass"
 
-#: my-evolution/Locations.h:1935
+#: my-evolution/Locations.h:1934
 msgid "Sacramento"
 msgstr "Sacramento"
 
-#: my-evolution/Locations.h:1936
+#: my-evolution/Locations.h:1935
 msgid "Sacramento-Woodland"
 msgstr "Sacramento-Woodland"
 
-#: my-evolution/Locations.h:1937
+#: my-evolution/Locations.h:1936
 msgid "Safford-Municipal Airport"
 msgstr "Safford kommunale flyplass"
 
-#: my-evolution/Locations.h:1938
+#: my-evolution/Locations.h:1937
 msgid "Saginaw"
 msgstr "Saginaw"
 
-#: my-evolution/Locations.h:1939
+#: my-evolution/Locations.h:1938
 msgid "Saint Anthony"
 msgstr "Saint Anthony"
 
-#: my-evolution/Locations.h:1940
+#: my-evolution/Locations.h:1939
 msgid "Saint-Brieuc-Armor"
 msgstr "Saint-Brieuc-Armor"
 
-#: my-evolution/Locations.h:1941
+#: my-evolution/Locations.h:1940
 msgid "Saint-Dizier-Robinson"
 msgstr "Saint-Dizier-Robinson"
 
-#: my-evolution/Locations.h:1942
+#: my-evolution/Locations.h:1941
 msgid "Saint-Etienne-Boutheon"
 msgstr "Saint-Etienne-Boutheon"
 
-#: my-evolution/Locations.h:1943
+#: my-evolution/Locations.h:1942
 msgid "Saint Mary's"
 msgstr "Saint Mary's"
 
-#: my-evolution/Locations.h:1944
+#: my-evolution/Locations.h:1943
 msgid "Saint Mawgan"
 msgstr "Saint Mawgan"
 
-#: my-evolution/Locations.h:1945
+#: my-evolution/Locations.h:1944
 msgid "Saint-Nazaire-Montoir"
 msgstr "Saint-Nazaire-Montoir"
 
-#: my-evolution/Locations.h:1946
+#: my-evolution/Locations.h:1945
 msgid "Saint Paul"
 msgstr "Saint Paul"
 
-#: my-evolution/Locations.h:1947
+#: my-evolution/Locations.h:1946
 msgid "Saiq"
 msgstr "Saiq"
 
-#: my-evolution/Locations.h:1948
+#: my-evolution/Locations.h:1947
 msgid "Salalah"
 msgstr "Salalah"
 
-#: my-evolution/Locations.h:1949
+#: my-evolution/Locations.h:1948
 msgid "Salem"
 msgstr "Salem"
 
-#: my-evolution/Locations.h:1950
+#: my-evolution/Locations.h:1949
 msgid "Salida"
 msgstr "Salida"
 
-#: my-evolution/Locations.h:1951
+#: my-evolution/Locations.h:1950
 msgid "Salida-Harriet"
 msgstr "Salida-Harriet"
 
-#: my-evolution/Locations.h:1952
+#: my-evolution/Locations.h:1951
 msgid "Salina"
 msgstr "Salina"
 
-#: my-evolution/Locations.h:1953
+#: my-evolution/Locations.h:1952
 msgid "Salinas"
 msgstr "Salinas"
 
-#: my-evolution/Locations.h:1954
+#: my-evolution/Locations.h:1953
 msgid "Salisbury"
 msgstr "Salisbury"
 
-#: my-evolution/Locations.h:1955
+#: my-evolution/Locations.h:1954
 msgid "Salmon"
 msgstr "Salmon"
 
-#: my-evolution/Locations.h:1956
+#: my-evolution/Locations.h:1955
 msgid "Salmon (2)"
 msgstr "Salmon (2)"
 
-#: my-evolution/Locations.h:1957
+#: my-evolution/Locations.h:1956
 msgid "Salta"
 msgstr "Salta"
 
-#: my-evolution/Locations.h:1958
+#: my-evolution/Locations.h:1957
 msgid "Saltillo"
 msgstr "Saltillo"
 
-#: my-evolution/Locations.h:1959
+#: my-evolution/Locations.h:1958
 msgid "Salt Lake City"
 msgstr "Salt Lake City"
 
-#: my-evolution/Locations.h:1960
+#: my-evolution/Locations.h:1959
 msgid "Salto"
 msgstr "Salto"
 
-#: my-evolution/Locations.h:1961
+#: my-evolution/Locations.h:1960
 msgid "Salt point"
 msgstr "Salt point"
 
-#: my-evolution/Locations.h:1962
+#: my-evolution/Locations.h:1961
 msgid "Salvador"
 msgstr "Salvador"
 
-#: my-evolution/Locations.h:1963
+#: my-evolution/Locations.h:1962
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: my-evolution/Locations.h:1964
+#: my-evolution/Locations.h:1963
 msgid "Samara"
 msgstr "Samara"
 
-#: my-evolution/Locations.h:1965
+#: my-evolution/Locations.h:1964
 msgid "Samos"
 msgstr "Samos"
 
-#: my-evolution/Locations.h:1966
+#: my-evolution/Locations.h:1965
 msgid "Samsun"
 msgstr "Samsun"
 
-#: my-evolution/Locations.h:1967
+#: my-evolution/Locations.h:1966
 msgid "Sana'A"
 msgstr "Sana'A"
 
-#: my-evolution/Locations.h:1968
+#: my-evolution/Locations.h:1967
 msgid "San Andres Isla/Sesquicentenario"
 msgstr "San Andres Isla/Sesquicentenario"
 
-#: my-evolution/Locations.h:1969
+#: my-evolution/Locations.h:1968
 msgid "San Angelo"
 msgstr "San Angelo"
 
-#: my-evolution/Locations.h:1970
+#: my-evolution/Locations.h:1969
 msgid "San Antonio"
 msgstr "San Antonio"
 
-#: my-evolution/Locations.h:1971
+#: my-evolution/Locations.h:1970
 msgid "San Antonio Del Tachira"
 msgstr "San Antonio Del Tachira"
 
-#: my-evolution/Locations.h:1972
+#: my-evolution/Locations.h:1971
 msgid "San Antonio-Kelly AFB"
 msgstr "San Antonio-Kelly AFB"
 
-#: my-evolution/Locations.h:1973
+#: my-evolution/Locations.h:1972
 msgid "San Antonio-Stinson"
 msgstr "San Antonio-Stinson"
 
-#: my-evolution/Locations.h:1974
+#: my-evolution/Locations.h:1973
 msgid "San Carlos"
 msgstr "San Carlos"
 
-#: my-evolution/Locations.h:1975
+#: my-evolution/Locations.h:1974
 msgid "Sandane"
 msgstr "Sandane"
 
-#: my-evolution/Locations.h:1976
+#: my-evolution/Locations.h:1975
 msgid "Sandberg"
 msgstr "Sandberg"
 
-#: my-evolution/Locations.h:1977
+#: my-evolution/Locations.h:1976
 msgid "Sanderson"
 msgstr "Sanderson"
 
-#: my-evolution/Locations.h:1978
+#: my-evolution/Locations.h:1977
 msgid "San Diego"
 msgstr "San Diego"
 
-#: my-evolution/Locations.h:1979
+#: my-evolution/Locations.h:1978
 msgid "San Diego-Brown"
 msgstr "San Diego-Brown"
 
-#: my-evolution/Locations.h:1980
+#: my-evolution/Locations.h:1979
 msgid "San Diego-Miramar"
 msgstr "San Diego-Miramar"
 
-#: my-evolution/Locations.h:1981
+#: my-evolution/Locations.h:1980
 msgid "San Diego-Montgomery"
 msgstr "San Diego-Montgomery"
 
-#: my-evolution/Locations.h:1982
+#: my-evolution/Locations.h:1981
 msgid "San Diego-North Island"
 msgstr "San Diego-North Island"
 
-#: my-evolution/Locations.h:1983
+#: my-evolution/Locations.h:1982
 msgid "San Diego-Santee"
 msgstr "San Diego-Santee"
 
-#: my-evolution/Locations.h:1984
+#: my-evolution/Locations.h:1983
 msgid "Sandnessjoen/Stokka"
 msgstr "Sandnessjøen/Stokka"
 
-#: my-evolution/Locations.h:1985
+#: my-evolution/Locations.h:1984
 msgid "Sand Point"
 msgstr "Sand Point"
 
-#: my-evolution/Locations.h:1986
+#: my-evolution/Locations.h:1985
 msgid "San Fernando De Apure"
 msgstr "San Fernando De Apure"
 
-#: my-evolution/Locations.h:1987
+#: my-evolution/Locations.h:1986
 msgid "Sanford"
 msgstr "Sanford"
 
-#: my-evolution/Locations.h:1988
+#: my-evolution/Locations.h:1987
 msgid "San Francisco"
 msgstr "San Fransisco"
 
-#: my-evolution/Locations.h:1989
+#: my-evolution/Locations.h:1988
 msgid "Sangju"
 msgstr "Sangju"
 
-#: my-evolution/Locations.h:1990
+#: my-evolution/Locations.h:1989
 msgid "San Ignacio De Velasco"
 msgstr "San Ignacio De Velasco"
 
-#: my-evolution/Locations.h:1991
+#: my-evolution/Locations.h:1990
 msgid "San Joaquin"
 msgstr "San Joaquin"
 
-#: my-evolution/Locations.h:1992
+#: my-evolution/Locations.h:1991
 msgid "San Jose"
 msgstr "San José"
 
-#: my-evolution/Locations.h:1993
+#: my-evolution/Locations.h:1992
 msgid "San Jose De Chiquitos"
 msgstr "San José De Chiquitos"
 
-#: my-evolution/Locations.h:1994
+#: my-evolution/Locations.h:1993
 msgid "San Jose del Cabo"
 msgstr "San José del Cabo"
 
-#: my-evolution/Locations.h:1995
+#: my-evolution/Locations.h:1994
 msgid "San Jose-Santa Clara"
 msgstr "San José-Santa Clara"
 
-#: my-evolution/Locations.h:1996
+#: my-evolution/Locations.h:1995
 msgid "San Juan"
 msgstr "San Juan"
 
-#: my-evolution/Locations.h:1997
+#: my-evolution/Locations.h:1996
 msgid "Sankt-Peterburg"
 msgstr "St. Petersburg"
 
-#: my-evolution/Locations.h:1998
+#: my-evolution/Locations.h:1997
 msgid "Sanliurfa"
 msgstr "Sanliurfa"
 
-#: my-evolution/Locations.h:1999
+#: my-evolution/Locations.h:1998
 msgid "San Luis Obispo"
 msgstr "San Luis Obispo"
 
-#: my-evolution/Locations.h:2000
+#: my-evolution/Locations.h:1999
 msgid "San Luis Potosi"
 msgstr "San Luis Potosi"
 
-#: my-evolution/Locations.h:2001
+#: my-evolution/Locations.h:2000
 msgid "San Miguel"
 msgstr "San Miguel"
 
-#: my-evolution/Locations.h:2002
+#: my-evolution/Locations.h:2001
 msgid "San Nicholas Island"
 msgstr "San Nicholas Island"
 
-#: my-evolution/Locations.h:2003
+#: my-evolution/Locations.h:2002
 msgid "San Salvador"
 msgstr "San Salvador"
 
-#: my-evolution/Locations.h:2004
+#: my-evolution/Locations.h:2003
 msgid "San Sebastian"
 msgstr "San Sebastian"
 
-#: my-evolution/Locations.h:2005
+#: my-evolution/Locations.h:2004
 msgid "Santa Ana"
 msgstr "Santa Ana"
 
-#: my-evolution/Locations.h:2006
+#: my-evolution/Locations.h:2005
 msgid "Santa Barbara"
 msgstr "Santa Barbara"
 
-#: my-evolution/Locations.h:2007
+#: my-evolution/Locations.h:2006
 msgid "Santa Cruz"
 msgstr "Santa Cruz"
 
-#: my-evolution/Locations.h:2008
+#: my-evolution/Locations.h:2007
 msgid "Santa Fe"
 msgstr "Santa Fe"
 
-#: my-evolution/Locations.h:2009
+#: my-evolution/Locations.h:2008
 msgid "Santa Maria"
 msgstr "Santa Maria"
 
-#: my-evolution/Locations.h:2010
+#: my-evolution/Locations.h:2009
 msgid "Santa Marta/Simon Bolivar"
 msgstr "Santa Marta/Simon Bolivar"
 
-#: my-evolution/Locations.h:2011
+#: my-evolution/Locations.h:2010
 msgid "Santa Monica"
 msgstr "Santa Monica"
 
-#: my-evolution/Locations.h:2012
+#: my-evolution/Locations.h:2011
 msgid "Santander"
 msgstr "Santander"
 
-#: my-evolution/Locations.h:2013
+#: my-evolution/Locations.h:2012
 msgid "Santarem"
 msgstr "Santarem"
 
-#: my-evolution/Locations.h:2014
+#: my-evolution/Locations.h:2013
 msgid "Santa Rosa"
 msgstr "Santa Rosa"
 
-#: my-evolution/Locations.h:2015
+#: my-evolution/Locations.h:2014
 msgid "Santa Rosa de Copan"
 msgstr "Santa Rosa de Copan"
 
-#: my-evolution/Locations.h:2016
+#: my-evolution/Locations.h:2015
 msgid "Santiago"
 msgstr "Santiago"
 
-#: my-evolution/Locations.h:2017
+#: my-evolution/Locations.h:2016
 msgid "Santiago de Cuba"
 msgstr "Santiago de Cuba"
 
-#: my-evolution/Locations.h:2018
+#: my-evolution/Locations.h:2017
 msgid "Santiago Del Estero"
 msgstr "Santiago Del Estero"
 
-#: my-evolution/Locations.h:2019
+#: my-evolution/Locations.h:2018
 msgid "Santorini"
 msgstr "Santorini"
 
-#: my-evolution/Locations.h:2020
+#: my-evolution/Locations.h:2019
 msgid "Santos"
 msgstr "Santos"
 
-#: my-evolution/Locations.h:2021
+#: my-evolution/Locations.h:2020
 msgid "Sao Jose Dos Campo"
 msgstr "San José Dos Campo"
 
-#: my-evolution/Locations.h:2022
+#: my-evolution/Locations.h:2021
 msgid "Sao Luiz"
 msgstr "Sao Luiz"
 
-#: my-evolution/Locations.h:2023
+#: my-evolution/Locations.h:2022
 msgid "Sao Paulo"
 msgstr "Sao Paulo"
 
-#: my-evolution/Locations.h:2024
+#: my-evolution/Locations.h:2023
 msgid "Sapporo Ab"
 msgstr "Sapporo Ab"
 
-#: my-evolution/Locations.h:2025
+#: my-evolution/Locations.h:2024
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
-#: my-evolution/Locations.h:2026
+#: my-evolution/Locations.h:2025
 msgid "Saranac Lake"
 msgstr "Saranac Lake"
 
-#: my-evolution/Locations.h:2027
+#: my-evolution/Locations.h:2026
 msgid "Sarasota"
 msgstr "Sarasota"
 
-#: my-evolution/Locations.h:2028
+#: my-evolution/Locations.h:2027
 msgid "Saratov"
 msgstr "Saratov"
 
-#: my-evolution/Locations.h:2029
+#: my-evolution/Locations.h:2028
 msgid "Sarzana"
 msgstr "Sarzana"
 
-#: my-evolution/Locations.h:2030
+#: my-evolution/Locations.h:2029
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
-#: my-evolution/Locations.h:2031
+#: my-evolution/Locations.h:2030
 msgid "Saskatoon"
 msgstr "Saskatoon"
 
-#: my-evolution/Locations.h:2032
+#: my-evolution/Locations.h:2031
 msgid "Sauce Viejo"
 msgstr "Sauce Viejo"
 
-#: my-evolution/Locations.h:2034
+#: my-evolution/Locations.h:2033
 msgid "Sault Ste Marie"
 msgstr "Sault Ste Marie"
 
-#: my-evolution/Locations.h:2035
+#: my-evolution/Locations.h:2034
 msgid "Savannah"
 msgstr "Savannah"
 
-#: my-evolution/Locations.h:2036
+#: my-evolution/Locations.h:2035
 msgid "Savannah-Hunter AAF"
 msgstr "Savannah-Hunter AAF"
 
-#: my-evolution/Locations.h:2037
+#: my-evolution/Locations.h:2036
 msgid "Sawyer AFB"
 msgstr "Sawyer AFB"
 
-#: my-evolution/Locations.h:2038
+#: my-evolution/Locations.h:2037
 msgid "Sayun"
 msgstr "Sayun"
 
-#: my-evolution/Locations.h:2039
+#: my-evolution/Locations.h:2038
 msgid "Scatsta"
 msgstr "Scatsta"
 
-#: my-evolution/Locations.h:2040
+#: my-evolution/Locations.h:2039
 msgid "Schaffen"
 msgstr "Schaffen"
 
-#: my-evolution/Locations.h:2041
+#: my-evolution/Locations.h:2040
 msgid "Schenectady"
 msgstr "Schenectady"
 
-#: my-evolution/Locations.h:2042
+#: my-evolution/Locations.h:2041
 msgid "Scilly Isles"
 msgstr "Scilly Isles"
 
-#: my-evolution/Locations.h:2043
+#: my-evolution/Locations.h:2042
 msgid "Scottsbluff"
 msgstr "Scottsbluff"
 
-#: my-evolution/Locations.h:2044
+#: my-evolution/Locations.h:2043
 msgid "Scottsdale"
 msgstr "Scottsdale"
 
-#: my-evolution/Locations.h:2045
+#: my-evolution/Locations.h:2044
 msgid "Scranton"
 msgstr "Scranton"
 
-#: my-evolution/Locations.h:2046
+#: my-evolution/Locations.h:2045
 msgid "Seattle"
 msgstr "Seattle"
 
-#: my-evolution/Locations.h:2047
+#: my-evolution/Locations.h:2046
 msgid "Seattle-Boeing"
 msgstr "Seattle-Boeing"
 
-#: my-evolution/Locations.h:2048
+#: my-evolution/Locations.h:2047
 msgid "Sedalia"
 msgstr "Sedalia"
 
-#: my-evolution/Locations.h:2049
+#: my-evolution/Locations.h:2048
 msgid "Seeb"
 msgstr "Seeb"
 
-#: my-evolution/Locations.h:2050
+#: my-evolution/Locations.h:2049
 msgid "Selanik"
 msgstr "Selanik"
 
-#: my-evolution/Locations.h:2051
+#: my-evolution/Locations.h:2050
 msgid "Sendai Airport"
 msgstr "Sendai flyplass"
 
-#: my-evolution/Locations.h:2052
+#: my-evolution/Locations.h:2051
 msgid "Seoul E Ab"
 msgstr "Seoul E Ab"
 
-#: my-evolution/Locations.h:2053
+#: my-evolution/Locations.h:2052
 msgid "Seoul/Kimp'O International Airport"
 msgstr "Seoul/Kimp'O internasjonale flyplass"
 
-#: my-evolution/Locations.h:2054
+#: my-evolution/Locations.h:2053
 msgid "Seoul/Yongdungp'O Rokaf Wc"
 msgstr "Seoul/Yongdungp'O Rokaf Wc"
 
-#: my-evolution/Locations.h:2055
+#: my-evolution/Locations.h:2054
 msgid "Sept-Iles"
 msgstr "Sept-Iles"
 
-#: my-evolution/Locations.h:2056
+#: my-evolution/Locations.h:2055
 msgid "Seul Choix Pt"
 msgstr "Seul Choix Pt"
 
-#: my-evolution/Locations.h:2057
+#: my-evolution/Locations.h:2056
 msgid "Sevilla"
 msgstr "Sevilla"
 
-#: my-evolution/Locations.h:2058
+#: my-evolution/Locations.h:2057
 msgid "Seward"
 msgstr "Seward"
 
-#: my-evolution/Locations.h:2059
+#: my-evolution/Locations.h:2058
 msgid "Sexton Summit"
 msgstr "Sexton Summit"
 
-#: my-evolution/Locations.h:2060
+#: my-evolution/Locations.h:2059
 msgid "Shanghai"
 msgstr "Shanghai"
 
-#: my-evolution/Locations.h:2061
+#: my-evolution/Locations.h:2060
 msgid "Shannon"
 msgstr "Shannon"
 
-#: my-evolution/Locations.h:2062
+#: my-evolution/Locations.h:2061
 msgid "Sharjah"
 msgstr "Sharjah"
 
-#: my-evolution/Locations.h:2063
+#: my-evolution/Locations.h:2062
 msgid "Sharm El Sheikhintl"
 msgstr "Sharm El Sheik internasjonale"
 
-#: my-evolution/Locations.h:2064
+#: my-evolution/Locations.h:2063
 msgid "Sharurah"
 msgstr "Sharurah"
 
-#: my-evolution/Locations.h:2065
+#: my-evolution/Locations.h:2064
 msgid "Shawbury"
 msgstr "Shawbury"
 
-#: my-evolution/Locations.h:2066
+#: my-evolution/Locations.h:2065
 msgid "Shearwater"
 msgstr "Shearwater"
 
-#: my-evolution/Locations.h:2067
+#: my-evolution/Locations.h:2066
 msgid "Sheboygan"
 msgstr "Sheboygan"
 
-#: my-evolution/Locations.h:2068
+#: my-evolution/Locations.h:2067
 msgid "Sheldon"
 msgstr "Sheldon"
 
-#: my-evolution/Locations.h:2069
+#: my-evolution/Locations.h:2068
 msgid "Shelter Cove"
 msgstr "Shelter Cove"
 
-#: my-evolution/Locations.h:2070
+#: my-evolution/Locations.h:2069
 msgid "Shelton"
 msgstr "Shelton"
 
-#: my-evolution/Locations.h:2071
+#: my-evolution/Locations.h:2070
 msgid "Shenandoah"
 msgstr "Shenandoah"
 
-#: my-evolution/Locations.h:2072
+#: my-evolution/Locations.h:2071
 msgid "Sheridan"
 msgstr "Sheridan"
 
-#: my-evolution/Locations.h:2073
+#: my-evolution/Locations.h:2072
 msgid "Sherman-Denison"
 msgstr "Sherman-Denison"
 
-#: my-evolution/Locations.h:2074
+#: my-evolution/Locations.h:2073
 msgid "Shimofusa Ab"
 msgstr "Shimofusa Ab"
 
-#: my-evolution/Locations.h:2075
+#: my-evolution/Locations.h:2074
 msgid "Shingle Point"
 msgstr "Shingle Point"
 
-#: my-evolution/Locations.h:2076
+#: my-evolution/Locations.h:2075
 msgid "Shiraz"
 msgstr "Shiraz"
 
-#: my-evolution/Locations.h:2077
+#: my-evolution/Locations.h:2076
 msgid "Shishmaref"
 msgstr "Shishmaref"
 
-#: my-evolution/Locations.h:2078
+#: my-evolution/Locations.h:2077
 msgid "Shizuhama Ab"
 msgstr "Shizuhama Ab"
 
-#: my-evolution/Locations.h:2079
+#: my-evolution/Locations.h:2078
 msgid "Shoreham"
 msgstr "Shoreham"
 
-#: my-evolution/Locations.h:2080
+#: my-evolution/Locations.h:2079
 msgid "Show Low"
 msgstr "Show Low"
 
-#: my-evolution/Locations.h:2081
+#: my-evolution/Locations.h:2080
 msgid "Shreveport Downtown"
 msgstr "Shreveport sentrum"
 
-#: my-evolution/Locations.h:2082
+#: my-evolution/Locations.h:2081
 msgid "Shreveport Regional"
 msgstr "Shreveport regionale"
 
-#: my-evolution/Locations.h:2083
+#: my-evolution/Locations.h:2082
 msgid "Sidney"
 msgstr "Sidney"
 
-#: my-evolution/Locations.h:2084
+#: my-evolution/Locations.h:2083
 msgid "Sigonella"
 msgstr "Sigonella"
 
-#: my-evolution/Locations.h:2085
+#: my-evolution/Locations.h:2084
 msgid "Siloam Springs"
 msgstr "Siloam Springs"
 
-#: my-evolution/Locations.h:2086
+#: my-evolution/Locations.h:2085
 msgid "Silver City"
 msgstr "Silver City"
 
-#: my-evolution/Locations.h:2087
+#: my-evolution/Locations.h:2086
 msgid "Sindal"
 msgstr "Sindal"
 
-#: my-evolution/Locations.h:2089
+#: my-evolution/Locations.h:2088
 msgid "Sioux City"
 msgstr "Sioux City"
 
-#: my-evolution/Locations.h:2090
+#: my-evolution/Locations.h:2089
 msgid "Sioux Falls"
 msgstr "Sioux Falls"
 
-#: my-evolution/Locations.h:2091
+#: my-evolution/Locations.h:2090
 msgid "Sitka"
 msgstr "Sitka"
 
-#: my-evolution/Locations.h:2092
+#: my-evolution/Locations.h:2091
 msgid "Sivas"
 msgstr "Sivas"
 
-#: my-evolution/Locations.h:2093
+#: my-evolution/Locations.h:2092
 msgid "Sivrihisar"
 msgstr "Sivrihisar"
 
-#: my-evolution/Locations.h:2094
+#: my-evolution/Locations.h:2093
 msgid "Skagway"
 msgstr "Skagway"
 
-#: my-evolution/Locations.h:2095
+#: my-evolution/Locations.h:2094
 msgid "Skiathos"
 msgstr "Skiathos"
 
-#: my-evolution/Locations.h:2096
+#: my-evolution/Locations.h:2095
 msgid "Skien/Geiteryggen"
 msgstr "Skien/Geiteryggen"
 
-#: my-evolution/Locations.h:2097
+#: my-evolution/Locations.h:2096
 msgid "Skive"
 msgstr "Skive"
 
-#: my-evolution/Locations.h:2098
+#: my-evolution/Locations.h:2097
 msgid "Skopje"
 msgstr "Skopje"
 
-#: my-evolution/Locations.h:2099
+#: my-evolution/Locations.h:2098
 msgid "Skwentna"
 msgstr "Skwentna"
 
-#: my-evolution/Locations.h:2100
+#: my-evolution/Locations.h:2099
 msgid "Slana"
 msgstr "Slana"
 
-#: my-evolution/Locations.h:2103
+#: my-evolution/Locations.h:2102
 msgid "Smithers"
 msgstr "Smithers"
 
-#: my-evolution/Locations.h:2104
+#: my-evolution/Locations.h:2103
 msgid "Smyrna"
 msgstr "Smyrna"
 
-#: my-evolution/Locations.h:2105
+#: my-evolution/Locations.h:2104
 msgid "Snowshoe Lake"
 msgstr "Snowshoe Lake"
 
-#: my-evolution/Locations.h:2106
+#: my-evolution/Locations.h:2105
 msgid "Sochi"
 msgstr "Sochi"
 
-#: my-evolution/Locations.h:2107
+#: my-evolution/Locations.h:2106
 msgid "Socorro"
 msgstr "Socorro"
 
-#: my-evolution/Locations.h:2108
+#: my-evolution/Locations.h:2107
 msgid "Socotra"
 msgstr "Socotra"
 
-#: my-evolution/Locations.h:2109
+#: my-evolution/Locations.h:2108
 msgid "Soda Springs"
 msgstr "Soda Springs"
 
-#: my-evolution/Locations.h:2110
+#: my-evolution/Locations.h:2109
 msgid "Sofia"
 msgstr "Sofia"
 
-#: my-evolution/Locations.h:2111
+#: my-evolution/Locations.h:2110
 msgid "Sogndal"
 msgstr "Sogndal"
 
-#: my-evolution/Locations.h:2112
+#: my-evolution/Locations.h:2111
 msgid "Soldotna"
 msgstr "Soldotna"
 
-#: my-evolution/Locations.h:2113
+#: my-evolution/Locations.h:2112
 msgid "Somerset"
 msgstr "Somerset"
 
-#: my-evolution/Locations.h:2114
+#: my-evolution/Locations.h:2113
 msgid "Sonderborg"
 msgstr "Sønderborg"
 
-#: my-evolution/Locations.h:2115
+#: my-evolution/Locations.h:2114
 msgid "Songmu Ab"
 msgstr "Songmu Ab"
 
-#: my-evolution/Locations.h:2116
+#: my-evolution/Locations.h:2115
 msgid "Sorkjosen"
 msgstr "Sørkjosen"
 
-#: my-evolution/Locations.h:2118
+#: my-evolution/Locations.h:2117
 msgid "Southampton"
 msgstr "Southampton"
 
-#: my-evolution/Locations.h:2119
+#: my-evolution/Locations.h:2118
 msgid "South Bend"
 msgstr "South Bend"
 
-#: my-evolution/Locations.h:2120
+#: my-evolution/Locations.h:2119
 msgid "South Carolina"
 msgstr "South Carolina"
 
-#: my-evolution/Locations.h:2121
+#: my-evolution/Locations.h:2120
 msgid "South Dakota"
 msgstr "South Dakota"
 
-#: my-evolution/Locations.h:2122
+#: my-evolution/Locations.h:2121
 msgid "Southend"
 msgstr "Southend"
 
-#: my-evolution/Locations.h:2123
+#: my-evolution/Locations.h:2122
 msgid "South Marsh Island"
 msgstr "South Marsh Island"
 
-#: my-evolution/Locations.h:2124
+#: my-evolution/Locations.h:2123
 msgid "South Timbalier"
 msgstr "Timbalier syd"
 
-#: my-evolution/Locations.h:2126
+#: my-evolution/Locations.h:2125
 msgid "Sparrevohn"
 msgstr "Sparrevohn"
 
-#: my-evolution/Locations.h:2127
+#: my-evolution/Locations.h:2126
 msgid "Spencer"
 msgstr "Spencer"
 
-#: my-evolution/Locations.h:2128
+#: my-evolution/Locations.h:2127
 msgid "Spickard"
 msgstr "Spickard"
 
-#: my-evolution/Locations.h:2129
+#: my-evolution/Locations.h:2128
 msgid "Split"
 msgstr "Split"
 
-#: my-evolution/Locations.h:2130
+#: my-evolution/Locations.h:2129
 msgid "Spokane"
 msgstr "Spokane"
 
-#: my-evolution/Locations.h:2131
+#: my-evolution/Locations.h:2130
 msgid "Spokane-Parkwater"
 msgstr "Spokane-Parkwater"
 
-#: my-evolution/Locations.h:2132
+#: my-evolution/Locations.h:2131
 msgid "Springbok"
 msgstr "Springbok"
 
-#: my-evolution/Locations.h:2133
+#: my-evolution/Locations.h:2132
 msgid "Springfield"
 msgstr "Springfield"
 
-#: my-evolution/Locations.h:2134
+#: my-evolution/Locations.h:2133
 msgid "Stampede Pass"
 msgstr "Stampede Pass"
 
-#: my-evolution/Locations.h:2135
+#: my-evolution/Locations.h:2134
 msgid "State College"
 msgstr "State College"
 
-#: my-evolution/Locations.h:2136
+#: my-evolution/Locations.h:2135
 msgid "Stauning"
 msgstr "Stauning"
 
-#: my-evolution/Locations.h:2137
+#: my-evolution/Locations.h:2136
 msgid "Staunton"
 msgstr "Staunton"
 
-#: my-evolution/Locations.h:2138
+#: my-evolution/Locations.h:2137
 msgid "Stavanger/Sola"
 msgstr "Stavanger/Sola"
 
-#: my-evolution/Locations.h:2139
+#: my-evolution/Locations.h:2138
 msgid "Staverton"
 msgstr "Staverton:"
 
-#: my-evolution/Locations.h:2140
+#: my-evolution/Locations.h:2139
 msgid "Stavropol"
 msgstr "Stavropol"
 
-#: my-evolution/Locations.h:2141
+#: my-evolution/Locations.h:2140
 msgid "St Cloud"
 msgstr "St Cloud"
 
-#: my-evolution/Locations.h:2142
+#: my-evolution/Locations.h:2141
 msgid "Steamboat Springs"
 msgstr "Steamboat Springs"
 
-#: my-evolution/Locations.h:2143
+#: my-evolution/Locations.h:2142
 msgid "Stephenville"
 msgstr "Stephenville"
 
-#: my-evolution/Locations.h:2144
+#: my-evolution/Locations.h:2143
 msgid "St. George"
 msgstr "St. George"
 
-#: my-evolution/Locations.h:2145
+#: my-evolution/Locations.h:2144
 msgid "Stillwater"
 msgstr "Stillwater"
 
-#: my-evolution/Locations.h:2146
+#: my-evolution/Locations.h:2145
 msgid "St. John's"
 msgstr "St. John's"
 
-#: my-evolution/Locations.h:2147
+#: my-evolution/Locations.h:2146
 msgid "St Johnsbury"
 msgstr "St Johnsbury"
 
-#: my-evolution/Locations.h:2148
+#: my-evolution/Locations.h:2147
 msgid "St Joseph"
 msgstr "St Joseph"
 
-#: my-evolution/Locations.h:2149
+#: my-evolution/Locations.h:2148
 msgid "St Louis"
 msgstr "St Louis"
 
-#: my-evolution/Locations.h:2150
+#: my-evolution/Locations.h:2149
 msgid "St Louis-Spirit"
 msgstr "St. Louis-Spirit"
 
-#: my-evolution/Locations.h:2151
+#: my-evolution/Locations.h:2150
 msgid "Stockholm (Arlanda)"
 msgstr "Stockholm (Arlanda)"
 
-#: my-evolution/Locations.h:2152
+#: my-evolution/Locations.h:2151
 msgid "Stockholm (Bromma)"
 msgstr "Stockholm (Bromma)"
 
-#: my-evolution/Locations.h:2153
+#: my-evolution/Locations.h:2152
 msgid "Stockton"
 msgstr "Stockton"
 
-#: my-evolution/Locations.h:2154
+#: my-evolution/Locations.h:2153
 msgid "Stokmarknes/Skagen"
 msgstr "Stokmarknes/Skagen"
 
-#: my-evolution/Locations.h:2155
+#: my-evolution/Locations.h:2154
 msgid "Stord/Sorstokken"
 msgstr "Stord/Sørstokken"
 
-#: my-evolution/Locations.h:2156
+#: my-evolution/Locations.h:2155
 msgid "Storm Lake"
 msgstr "Storm Lake"
 
-#: my-evolution/Locations.h:2157
+#: my-evolution/Locations.h:2156
 msgid "Stornoway"
 msgstr "Stornoway"
 
-#: my-evolution/Locations.h:2158
+#: my-evolution/Locations.h:2157
 msgid "St Paul"
 msgstr "St Paul"
 
-#: my-evolution/Locations.h:2159
+#: my-evolution/Locations.h:2158
 msgid "St Petersburg"
 msgstr "St Petersburg"
 
-#: my-evolution/Locations.h:2160
+#: my-evolution/Locations.h:2159
 msgid "St Petersburg / Clearwater"
 msgstr "St Petersburg / Clearwater"
 
-#: my-evolution/Locations.h:2161
+#: my-evolution/Locations.h:2160
 msgid "Strasbourg"
 msgstr "Strasbourg"
 
-#: my-evolution/Locations.h:2162
+#: my-evolution/Locations.h:2161
 msgid "Strevell"
 msgstr "Strevell"
 
-#: my-evolution/Locations.h:2163
+#: my-evolution/Locations.h:2162
 msgid "St Simon's Island"
 msgstr "St Simon's Island"
 
-#: my-evolution/Locations.h:2164
+#: my-evolution/Locations.h:2163
 msgid "Stumpy Point"
 msgstr "Stumpy Point"
 
-#: my-evolution/Locations.h:2165
+#: my-evolution/Locations.h:2164
 msgid "Sturgeon Bay"
 msgstr "Sturgeon Bay"
 
-#: my-evolution/Locations.h:2166
+#: my-evolution/Locations.h:2165
 msgid "Stuttgart"
 msgstr "Stuttgart"
 
-#: my-evolution/Locations.h:2167
+#: my-evolution/Locations.h:2166
 msgid "Sucre"
 msgstr "Sucre"
 
-#: my-evolution/Locations.h:2168
+#: my-evolution/Locations.h:2167
 msgid "Sumburgh"
 msgstr "Sumburgh"
 
-#: my-evolution/Locations.h:2169
+#: my-evolution/Locations.h:2168
 msgid "Sumter"
 msgstr "Sumter"
 
-#: my-evolution/Locations.h:2170
+#: my-evolution/Locations.h:2169
 msgid "Sumter (2)"
 msgstr "Sumter (2)"
 
-#: my-evolution/Locations.h:2171
+#: my-evolution/Locations.h:2170
 msgid "Sundsvall-Harnosand"
 msgstr "Sundsvall-Harnosand"
 
-#: my-evolution/Locations.h:2172
+#: my-evolution/Locations.h:2171
 msgid "Sungshan/Taipei"
 msgstr "Sungshan/Taipei"
 
-#: my-evolution/Locations.h:2173
+#: my-evolution/Locations.h:2172
 msgid "Superior"
 msgstr "Superior"
 
-#: my-evolution/Locations.h:2175
+#: my-evolution/Locations.h:2174
 msgid "Sutton"
 msgstr "Sutton"
 
-#: my-evolution/Locations.h:2176
+#: my-evolution/Locations.h:2175
 msgid "Suwon Ab"
 msgstr "Suwon Ab"
 
-#: my-evolution/Locations.h:2177
+#: my-evolution/Locations.h:2176
 msgid "Svalbard"
 msgstr "Svalbard"
 
-#: my-evolution/Locations.h:2178
+#: my-evolution/Locations.h:2177
 msgid "Svolvaer/Helle"
 msgstr "Svolvær/Helle"
 
-#: my-evolution/Locations.h:2180
+#: my-evolution/Locations.h:2179
 msgid "Swift Current"
 msgstr "Swift Current"
 
-#: my-evolution/Locations.h:2182
+#: my-evolution/Locations.h:2181
 msgid "Sydney"
 msgstr "Sydney"
 
-#: my-evolution/Locations.h:2183
+#: my-evolution/Locations.h:2182
 msgid "Syktyvkar"
 msgstr "Syktyvkar"
 
-#: my-evolution/Locations.h:2184
+#: my-evolution/Locations.h:2183
 msgid "Sympheropol"
 msgstr "Sympheropol"
 
-#: my-evolution/Locations.h:2185
+#: my-evolution/Locations.h:2184
 msgid "Syracuse"
 msgstr "Syracuse"
 
-#: my-evolution/Locations.h:2186
+#: my-evolution/Locations.h:2185
 msgid "Szczecin"
 msgstr "Szczecin"
 
-#: my-evolution/Locations.h:2187
+#: my-evolution/Locations.h:2186
 msgid "Szombathely"
 msgstr "Szombathely"
 
-#: my-evolution/Locations.h:2188
+#: my-evolution/Locations.h:2187
 msgid "Tabatinga"
 msgstr "Tabatinga"
 
-#: my-evolution/Locations.h:2189
+#: my-evolution/Locations.h:2188
 msgid "Tabriz"
 msgstr "Tabriz"
 
-#: my-evolution/Locations.h:2190
+#: my-evolution/Locations.h:2189
 msgid "Tabuk"
 msgstr "Tabuk"
 
-#: my-evolution/Locations.h:2191
+#: my-evolution/Locations.h:2190
 msgid "Tachikawa Ab"
 msgstr "Tachikawa Ab"
 
-#: my-evolution/Locations.h:2192
+#: my-evolution/Locations.h:2191
 msgid "Tacna"
 msgstr "Tacna"
 
-#: my-evolution/Locations.h:2193
+#: my-evolution/Locations.h:2192
 msgid "Tacoma"
 msgstr "Tacoma"
 
-#: my-evolution/Locations.h:2194
+#: my-evolution/Locations.h:2193
 msgid "Tacoma-Lakewood"
 msgstr "Tacoma-Lakewood"
 
-#: my-evolution/Locations.h:2195
+#: my-evolution/Locations.h:2194
 msgid "Tacuarembo"
 msgstr "Tacuarembo"
 
-#: my-evolution/Locations.h:2196
+#: my-evolution/Locations.h:2195
 msgid "Taegu"
 msgstr "Taegu"
 
-#: my-evolution/Locations.h:2197
+#: my-evolution/Locations.h:2196
 msgid "Taegu Ab"
 msgstr "Taegu Ab"
 
-#: my-evolution/Locations.h:2198
+#: my-evolution/Locations.h:2197
 msgid "Taejon"
 msgstr "Taejon"
 
-#: my-evolution/Locations.h:2199
+#: my-evolution/Locations.h:2198
 msgid "Tahoe Valley"
 msgstr "Tahoe Valley"
 
-#: my-evolution/Locations.h:2200
+#: my-evolution/Locations.h:2199
 msgid "Taichung"
 msgstr "Taichung"
 
-#: my-evolution/Locations.h:2201
+#: my-evolution/Locations.h:2200
 msgid "Taif"
 msgstr "Taif"
 
-#: my-evolution/Locations.h:2202
+#: my-evolution/Locations.h:2201
 msgid "Tainan"
 msgstr "Tainan"
 
-#: my-evolution/Locations.h:2204
+#: my-evolution/Locations.h:2203
 msgid "Taiyuan"
 msgstr "Taiyuan"
 
-#: my-evolution/Locations.h:2205
+#: my-evolution/Locations.h:2204
 msgid "Taiz"
 msgstr "Taiz"
 
-#: my-evolution/Locations.h:2206
+#: my-evolution/Locations.h:2205
 msgid "Tajima"
 msgstr "Tajima"
 
-#: my-evolution/Locations.h:2207
+#: my-evolution/Locations.h:2206
 msgid "Takamatsu Airport"
 msgstr "Takamatsu flyplass"
 
-#: my-evolution/Locations.h:2208
+#: my-evolution/Locations.h:2207
 msgid "Talara"
 msgstr "Talara"
 
-#: my-evolution/Locations.h:2209
+#: my-evolution/Locations.h:2208
 msgid "Talkeetna"
 msgstr "Talkeetna"
 
-#: my-evolution/Locations.h:2210
+#: my-evolution/Locations.h:2209
 msgid "Tallahassee"
 msgstr "Tallahassee"
 
-#: my-evolution/Locations.h:2211
+#: my-evolution/Locations.h:2210
 msgid "Tallinn"
 msgstr "Tallinn"
 
-#: my-evolution/Locations.h:2212
+#: my-evolution/Locations.h:2211
 msgid "Tamanrasset"
 msgstr "Tamanrasset"
 
-#: my-evolution/Locations.h:2213
+#: my-evolution/Locations.h:2212
 msgid "Tamanrasset/Aguenna"
 msgstr "Tamanrasset/Aguenna"
 
-#: my-evolution/Locations.h:2214
+#: my-evolution/Locations.h:2213
 msgid "Tampa"
 msgstr "Tampa"
 
-#: my-evolution/Locations.h:2215
+#: my-evolution/Locations.h:2214
 msgid "Tampa-Macdill AFB"
 msgstr "Tampa-Macdill AFB"
 
-#: my-evolution/Locations.h:2216
+#: my-evolution/Locations.h:2215
 msgid "Tampere"
 msgstr "Tampere"
 
-#: my-evolution/Locations.h:2217
+#: my-evolution/Locations.h:2216
 msgid "Tampico"
 msgstr "Tampico"
 
-#: my-evolution/Locations.h:2218
+#: my-evolution/Locations.h:2217
 msgid "Tanana"
 msgstr "Tanana"
 
-#: my-evolution/Locations.h:2219
+#: my-evolution/Locations.h:2218
 msgid "Tanegashima Airport"
 msgstr "Tanegashima flyplass"
 
-#: my-evolution/Locations.h:2220
+#: my-evolution/Locations.h:2219
 msgid "Taos"
 msgstr "Taos"
 
-#: my-evolution/Locations.h:2221
+#: my-evolution/Locations.h:2220
 msgid "Taoyuan"
 msgstr "Taoyuan"
 
-#: my-evolution/Locations.h:2222
+#: my-evolution/Locations.h:2221
 msgid "Tapachula"
 msgstr "Tapachula"
 
-#: my-evolution/Locations.h:2223
+#: my-evolution/Locations.h:2222
 msgid "Taranto"
 msgstr "Taranto"
 
-#: my-evolution/Locations.h:2224
+#: my-evolution/Locations.h:2223
 msgid "Tarbes"
 msgstr "Tarbes"
 
-#: my-evolution/Locations.h:2225
+#: my-evolution/Locations.h:2224
 msgid "Tarija"
 msgstr "Tarija"
 
-#: my-evolution/Locations.h:2226
+#: my-evolution/Locations.h:2225
 msgid "Tarvisio"
 msgstr "Tarvisio"
 
-#: my-evolution/Locations.h:2227
+#: my-evolution/Locations.h:2226
 msgid "Tatalina"
 msgstr "Tatalina"
 
-#: my-evolution/Locations.h:2228
+#: my-evolution/Locations.h:2227
 msgid "Tateyama Ab"
 msgstr "Tateyama Ab"
 
-#: my-evolution/Locations.h:2229
+#: my-evolution/Locations.h:2228
 msgid "Taunton"
 msgstr "Taunton"
 
-#: my-evolution/Locations.h:2230
+#: my-evolution/Locations.h:2229
 msgid "Tebessa"
 msgstr "Tebessa"
 
-#: my-evolution/Locations.h:2231
+#: my-evolution/Locations.h:2230
 msgid "Tees-Side"
 msgstr "Tees-Side"
 
-#: my-evolution/Locations.h:2232
+#: my-evolution/Locations.h:2231
 msgid "Tegucigalpa"
 msgstr "Tegucigalpa"
 
-#: my-evolution/Locations.h:2233
+#: my-evolution/Locations.h:2232
 msgid "Tehran-Mehrabad"
 msgstr "Teheran-Mehrabad"
 
-#: my-evolution/Locations.h:2234
+#: my-evolution/Locations.h:2233
 msgid "Tela"
 msgstr "Tela"
 
-#: my-evolution/Locations.h:2235
+#: my-evolution/Locations.h:2234
 msgid "Temple"
 msgstr "Temple"
 
-#: my-evolution/Locations.h:2236
+#: my-evolution/Locations.h:2235
 msgid "Tennessee"
 msgstr "Tennessee"
 
-#: my-evolution/Locations.h:2237
+#: my-evolution/Locations.h:2236
 msgid "Tepic"
 msgstr "Tepic"
 
-#: my-evolution/Locations.h:2238
+#: my-evolution/Locations.h:2237
 msgid "Teresina"
 msgstr "Teresina"
 
-#: my-evolution/Locations.h:2239
+#: my-evolution/Locations.h:2238
 msgid "Terre Haute"
 msgstr "Terre Haute"
 
-#: my-evolution/Locations.h:2240
+#: my-evolution/Locations.h:2239
 msgid "Terrell"
 msgstr "Terrell"
 
-#: my-evolution/Locations.h:2241
+#: my-evolution/Locations.h:2240
 msgid "Teterboro"
 msgstr "Teterboro"
 
-#: my-evolution/Locations.h:2242
+#: my-evolution/Locations.h:2241
 msgid "Texarkana"
 msgstr "Texarkana"
 
-#: my-evolution/Locations.h:2243
+#: my-evolution/Locations.h:2242
 msgid "Texas"
 msgstr "Texas"
 
-#: my-evolution/Locations.h:2244
+#: my-evolution/Locations.h:2243
 msgid "The Dalles"
 msgstr "The Dalles"
 
-#: my-evolution/Locations.h:2245
+#: my-evolution/Locations.h:2244
 msgid "Thessaloniki"
 msgstr "Thessaloniki"
 
-#: my-evolution/Locations.h:2246
+#: my-evolution/Locations.h:2245
 msgid "Thief River Falls"
 msgstr "Thief River Falls"
 
-#: my-evolution/Locations.h:2247
+#: my-evolution/Locations.h:2246
 msgid "Thiruvananthapuram"
 msgstr "Thiruvananthapuram"
 
-#: my-evolution/Locations.h:2248
+#: my-evolution/Locations.h:2247
 msgid "Thisted"
 msgstr "Thisted"
 
-#: my-evolution/Locations.h:2249
+#: my-evolution/Locations.h:2248
 msgid "Thompson Falls"
 msgstr "Thompson Falls"
 
-#: my-evolution/Locations.h:2250
+#: my-evolution/Locations.h:2249
 msgid "Thumrait"
 msgstr "Thumrait"
 
-#: my-evolution/Locations.h:2251
+#: my-evolution/Locations.h:2250
 msgid "Tianjin"
 msgstr "Tianjin"
 
-#: my-evolution/Locations.h:2252
+#: my-evolution/Locations.h:2251
 msgid "Tijuana"
 msgstr "Tijuana"
 
-#: my-evolution/Locations.h:2253
+#: my-evolution/Locations.h:2252
 msgid "Timisoara"
 msgstr "Timisoara"
 
-#: my-evolution/Locations.h:2254
+#: my-evolution/Locations.h:2253
 msgid "Tin City"
 msgstr "Tin City"
 
-#: my-evolution/Locations.h:2255
+#: my-evolution/Locations.h:2254
 msgid "Tirana"
 msgstr "Tirana"
 
-#: my-evolution/Locations.h:2256
+#: my-evolution/Locations.h:2255
 msgid "Tiree"
 msgstr "Tiree"
 
-#: my-evolution/Locations.h:2257
+#: my-evolution/Locations.h:2256
 msgid "Tirgu Mures"
 msgstr "Tirgu Mures"
 
-#: my-evolution/Locations.h:2258
+#: my-evolution/Locations.h:2257
 msgid "Tiruchchirapalli"
 msgstr "Tiruchchirapalli"
 
-#: my-evolution/Locations.h:2259
+#: my-evolution/Locations.h:2258
 msgid "Titusville"
 msgstr "Titusville"
 
-#: my-evolution/Locations.h:2260
+#: my-evolution/Locations.h:2259
 msgid "Tivat"
 msgstr "Tivat"
 
-#: my-evolution/Locations.h:2261
+#: my-evolution/Locations.h:2260
 msgid "Tlemcen Zenata"
 msgstr "Tlemcen Zenata"
 
-#: my-evolution/Locations.h:2262
+#: my-evolution/Locations.h:2261
 msgid "Tobias Bolanos"
 msgstr "Tobias Bolanos"
 
-#: my-evolution/Locations.h:2263
+#: my-evolution/Locations.h:2262
 msgid "Tocumen"
 msgstr "Tocumen"
 
-#: my-evolution/Locations.h:2264
+#: my-evolution/Locations.h:2263
 msgid "Togiak Village"
 msgstr "Togiak Village"
 
-#: my-evolution/Locations.h:2265
+#: my-evolution/Locations.h:2264
 msgid "Tokachi GSDF"
 msgstr "Tokachi GSDF"
 
-#: my-evolution/Locations.h:2266
+#: my-evolution/Locations.h:2265
 msgid "Tokunoshima Island"
 msgstr "Tokunoshima Island"
 
-#: my-evolution/Locations.h:2267
+#: my-evolution/Locations.h:2266
 msgid "Tokushima Ab"
 msgstr "Tokushima Ab"
 
-#: my-evolution/Locations.h:2268
+#: my-evolution/Locations.h:2267
 msgid "Tokyo Heliport"
 msgstr "Tokyo heliport"
 
-#: my-evolution/Locations.h:2269
+#: my-evolution/Locations.h:2268
 msgid "Tokyo International Airport"
 msgstr "Tokyi internasjonale flyplass"
 
-#: my-evolution/Locations.h:2270
+#: my-evolution/Locations.h:2269
 msgid "Tokyo New International Airport"
 msgstr "Tokyo nye internasjonale flyplass"
 
-#: my-evolution/Locations.h:2271
+#: my-evolution/Locations.h:2270
 msgid "Toledo"
 msgstr "Toledo"
 
-#: my-evolution/Locations.h:2272
+#: my-evolution/Locations.h:2271
 msgid "Toluca"
 msgstr "Toluca"
 
-#: my-evolution/Locations.h:2273
+#: my-evolution/Locations.h:2272
 msgid "Tonopah"
 msgstr "Tonopah"
 
-#: my-evolution/Locations.h:2274
+#: my-evolution/Locations.h:2273
 msgid "Topeka"
 msgstr "Topeka"
 
-#: my-evolution/Locations.h:2275
+#: my-evolution/Locations.h:2274
 msgid "Topeka-Forbes Field"
 msgstr "Topeka-Forbes Field"
 
-#: my-evolution/Locations.h:2276
+#: my-evolution/Locations.h:2275
 msgid "Torino/Bric Della Croce"
 msgstr "Torino/Bric Della Croce"
 
-#: my-evolution/Locations.h:2277
+#: my-evolution/Locations.h:2276
 msgid "Torino/Caselle"
 msgstr "Torino/Caselle"
 
-#: my-evolution/Locations.h:2278
+#: my-evolution/Locations.h:2277
 msgid "Toronto"
 msgstr "Toronto"
 
-#: my-evolution/Locations.h:2279
+#: my-evolution/Locations.h:2278
 msgid "Torp"
 msgstr "Torp"
 
-#: my-evolution/Locations.h:2280
+#: my-evolution/Locations.h:2279
 msgid "Torrance"
 msgstr "Torrance"
 
-#: my-evolution/Locations.h:2281
+#: my-evolution/Locations.h:2280
 msgid "Torreon"
 msgstr "Torreon"
 
-#: my-evolution/Locations.h:2282
+#: my-evolution/Locations.h:2281
 msgid "Tottori Airport"
 msgstr "Tottori flyplass"
 
-#: my-evolution/Locations.h:2283
+#: my-evolution/Locations.h:2282
 msgid "Toulouse"
 msgstr "Toulouse"
 
-#: my-evolution/Locations.h:2284
+#: my-evolution/Locations.h:2283
 msgid "Toul-Rosieres"
 msgstr "Toul-Rosieres"
 
-#: my-evolution/Locations.h:2285
+#: my-evolution/Locations.h:2284
 msgid "Tours-St-Symphorien"
 msgstr "Tours-St-Symphorien"
 
-#: my-evolution/Locations.h:2286
+#: my-evolution/Locations.h:2285
 msgid "Toussus-Le Noble"
 msgstr "Toussus-Le Noble"
 
-#: my-evolution/Locations.h:2287
+#: my-evolution/Locations.h:2286
 msgid "Townsville"
 msgstr "Townsville"
 
-#: my-evolution/Locations.h:2288
+#: my-evolution/Locations.h:2287
 msgid "Toyama Airport"
 msgstr "Toyama flyplass"
 
-#: my-evolution/Locations.h:2289
+#: my-evolution/Locations.h:2288
 msgid "Trabzon"
 msgstr "Trabzon"
 
-#: my-evolution/Locations.h:2290
+#: my-evolution/Locations.h:2289
 msgid "Trapani"
 msgstr "Trapani"
 
-#: my-evolution/Locations.h:2291
+#: my-evolution/Locations.h:2290
 msgid "Traverse City"
 msgstr "Traverse City"
 
-#: my-evolution/Locations.h:2292
+#: my-evolution/Locations.h:2291
 msgid "Trelew"
 msgstr "Trelew"
 
-#: my-evolution/Locations.h:2293
+#: my-evolution/Locations.h:2292
 msgid "Trenton"
 msgstr "Trenton"
 
-#: my-evolution/Locations.h:2294
+#: my-evolution/Locations.h:2293
 msgid "Trevico"
 msgstr "Trevico"
 
-#: my-evolution/Locations.h:2295
+#: my-evolution/Locations.h:2294
 msgid "Treviso/Istrana"
 msgstr "Treviso/Istrana"
 
-#: my-evolution/Locations.h:2296
+#: my-evolution/Locations.h:2295
 msgid "Treviso/S.Angelo"
 msgstr "Treviso/S.Angelo"
 
-#: my-evolution/Locations.h:2297
+#: my-evolution/Locations.h:2296
 msgid "Trieste"
 msgstr "Trieste"
 
-#: my-evolution/Locations.h:2298
+#: my-evolution/Locations.h:2297
 msgid "Trinidad"
 msgstr "Trinidad"
 
-#: my-evolution/Locations.h:2299
+#: my-evolution/Locations.h:2298
 msgid "Tripoli"
 msgstr "Tripoli"
 
-#: my-evolution/Locations.h:2300
+#: my-evolution/Locations.h:2299
 msgid "Tromso/Langnes"
 msgstr "Tromsø/Langnes"
 
-#: my-evolution/Locations.h:2301
+#: my-evolution/Locations.h:2300
 msgid "Trondheim/Vaernes"
 msgstr "Trondheim/Værnes"
 
-#: my-evolution/Locations.h:2302
+#: my-evolution/Locations.h:2301
 msgid "Troutdale"
 msgstr "Troutdale"
 
-#: my-evolution/Locations.h:2303
+#: my-evolution/Locations.h:2302
 msgid "Troyes/Barberey"
 msgstr "Troyes/Barberey"
 
-#: my-evolution/Locations.h:2304
+#: my-evolution/Locations.h:2303
 msgid "Truckee"
 msgstr "Truckee"
 
-#: my-evolution/Locations.h:2305
+#: my-evolution/Locations.h:2304
 msgid "Truth or Consequences"
 msgstr "Truth or Consequences"
 
-#: my-evolution/Locations.h:2306
+#: my-evolution/Locations.h:2305
 msgid "Tsuiki Ab"
 msgstr "Tsuiki Ab"
 
-#: my-evolution/Locations.h:2307
+#: my-evolution/Locations.h:2306
 msgid "Tsushima Airport"
 msgstr "Tsushima flyplass"
 
-#: my-evolution/Locations.h:2308
+#: my-evolution/Locations.h:2307
 msgid "Tucson"
 msgstr "Tucson"
 
-#: my-evolution/Locations.h:2309
+#: my-evolution/Locations.h:2308
 msgid "Tucson-Davis AFB"
 msgstr "Tucson-Davis AFB"
 
-#: my-evolution/Locations.h:2310
+#: my-evolution/Locations.h:2309
 msgid "Tucuman"
 msgstr "Tucuman"
 
-#: my-evolution/Locations.h:2311
+#: my-evolution/Locations.h:2310
 msgid "Tucumcari"
 msgstr "Tucumcari"
 
-#: my-evolution/Locations.h:2312
+#: my-evolution/Locations.h:2311
 msgid "Tucurui"
 msgstr "Tucurui"
 
-#: my-evolution/Locations.h:2313
+#: my-evolution/Locations.h:2312
 msgid "Tulancingo"
 msgstr "Tulancingo"
 
-#: my-evolution/Locations.h:2314
+#: my-evolution/Locations.h:2313
 msgid "Tulcea"
 msgstr "Tulcea"
 
-#: my-evolution/Locations.h:2315
+#: my-evolution/Locations.h:2314
 msgid "Tulsa"
 msgstr "Tulsa"
 
-#: my-evolution/Locations.h:2316
+#: my-evolution/Locations.h:2315
 msgid "Tupelo"
 msgstr "Tupelo"
 
-#: my-evolution/Locations.h:2317
+#: my-evolution/Locations.h:2316
 msgid "Turaif"
 msgstr "Turaif"
 
-#: my-evolution/Locations.h:2318
+#: my-evolution/Locations.h:2317
 msgid "Turin"
 msgstr "Turin"
 
-#: my-evolution/Locations.h:2320
+#: my-evolution/Locations.h:2319
 msgid "Turku"
 msgstr "Turku"
 
-#: my-evolution/Locations.h:2321
+#: my-evolution/Locations.h:2320
 msgid "Tuscaloosa"
 msgstr "Tuscaloosa"
 
-#: my-evolution/Locations.h:2322
+#: my-evolution/Locations.h:2321
 msgid "Tuxtla Gutierrez"
 msgstr "Tuxtla Gutierrez"
 
-#: my-evolution/Locations.h:2323
+#: my-evolution/Locations.h:2322
 msgid "Twenthe"
 msgstr "Twenthe"
 
-#: my-evolution/Locations.h:2324
+#: my-evolution/Locations.h:2323
 msgid "Twentynine Palms"
 msgstr "Twentynine Palms"
 
-#: my-evolution/Locations.h:2325
+#: my-evolution/Locations.h:2324
 msgid "Twin Falls"
 msgstr "Twin Falls"
 
-#: my-evolution/Locations.h:2326
+#: my-evolution/Locations.h:2325
 msgid "Tyler"
 msgstr "Tyler"
 
-#: my-evolution/Locations.h:2327
+#: my-evolution/Locations.h:2326
 msgid "Tyndall AFB"
 msgstr "Tyndall AFB"
 
-#: my-evolution/Locations.h:2328
+#: my-evolution/Locations.h:2327
 msgid "Tyumen"
 msgstr "Tyumen"
 
-#: my-evolution/Locations.h:2329
+#: my-evolution/Locations.h:2328
 msgid "Uberaba"
 msgstr "Uberaba"
 
-#: my-evolution/Locations.h:2330
+#: my-evolution/Locations.h:2329
 msgid "Ufa"
 msgstr "Ufa"
 
-#: my-evolution/Locations.h:2331
+#: my-evolution/Locations.h:2330
 msgid "Ukiah"
 msgstr "Ukiah"
 
-#: my-evolution/Locations.h:2333
+#: my-evolution/Locations.h:2332
 msgid "Ulan-Ude"
 msgstr "Ulan-Ude"
 
-#: my-evolution/Locations.h:2334
+#: my-evolution/Locations.h:2333
 msgid "Ulsan"
 msgstr "Ulsan"
 
-#: my-evolution/Locations.h:2335
+#: my-evolution/Locations.h:2334
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-#: my-evolution/Locations.h:2336
+#: my-evolution/Locations.h:2335
 msgid "Umea"
 msgstr "Umeå"
 
-#: my-evolution/Locations.h:2337
+#: my-evolution/Locations.h:2336
 msgid "Umiat"
 msgstr "Umiat"
 
-#: my-evolution/Locations.h:2338
+#: my-evolution/Locations.h:2337
 msgid "Unalakleet"
 msgstr "Unalakleet"
 
-#: my-evolution/Locations.h:2339
+#: my-evolution/Locations.h:2338
 msgid "United Arab Emirates "
 msgstr "De forente arabiske emirater"
 
-#: my-evolution/Locations.h:2342
+#: my-evolution/Locations.h:2341
 msgid "Unst"
 msgstr "Unst"
 
-#: my-evolution/Locations.h:2343
+#: my-evolution/Locations.h:2342
 msgid "Upington"
 msgstr "Upington"
 
-#: my-evolution/Locations.h:2344
+#: my-evolution/Locations.h:2343
 msgid "Uruapan"
 msgstr "Uruapan"
 
-#: my-evolution/Locations.h:2345
+#: my-evolution/Locations.h:2344
 msgid "Uruguaiana"
 msgstr "Uruguay"
 
-#: my-evolution/Locations.h:2347
+#: my-evolution/Locations.h:2346
 msgid "Urumqi"
 msgstr "Urumqi"
 
-#: my-evolution/Locations.h:2348
+#: my-evolution/Locations.h:2347
 msgid "Utah"
 msgstr "Utah"
 
-#: my-evolution/Locations.h:2349
+#: my-evolution/Locations.h:2348
 msgid "Utica"
 msgstr "Utica"
 
-#: my-evolution/Locations.h:2350
+#: my-evolution/Locations.h:2349
 msgid "Utrecht/Soesterberg"
 msgstr "Utrecht/Sösterberg"
 
-#: my-evolution/Locations.h:2351
+#: my-evolution/Locations.h:2350
 msgid "Utsunomiya Ab"
 msgstr "Utsunomiya Ab"
 
-#: my-evolution/Locations.h:2352
+#: my-evolution/Locations.h:2351
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
-#: my-evolution/Locations.h:2353
+#: my-evolution/Locations.h:2352
 msgid "Vadso"
 msgstr "Vadsø"
 
-#: my-evolution/Locations.h:2354
+#: my-evolution/Locations.h:2353
 msgid "Vaerlose"
 msgstr "Værløse"
 
-#: my-evolution/Locations.h:2355
+#: my-evolution/Locations.h:2354
 msgid "Vagar"
 msgstr "Vagar"
 
-#: my-evolution/Locations.h:2356
+#: my-evolution/Locations.h:2355
 msgid "Valdez 2"
 msgstr "Valdez 2"
 
-#: my-evolution/Locations.h:2357
+#: my-evolution/Locations.h:2356
 msgid "Valdosta"
 msgstr "Valdosta"
 
-#: my-evolution/Locations.h:2358
+#: my-evolution/Locations.h:2357
 msgid "Valdosta-Moody AFB"
 msgstr "Valdosta-Moody AFB"
 
-#: my-evolution/Locations.h:2359
+#: my-evolution/Locations.h:2358
 msgid "Valencia"
 msgstr "Valencia"
 
-#: my-evolution/Locations.h:2360
+#: my-evolution/Locations.h:2359
 msgid "Valentine"
 msgstr "Valentine"
 
-#: my-evolution/Locations.h:2361
+#: my-evolution/Locations.h:2360
 msgid "Valera*"
 msgstr "Valera*"
 
-#: my-evolution/Locations.h:2362
+#: my-evolution/Locations.h:2361
 msgid "Valkenburg"
 msgstr "Valkenburg"
 
-#: my-evolution/Locations.h:2363
+#: my-evolution/Locations.h:2362
 msgid "Valley"
 msgstr "Valley"
 
-#: my-evolution/Locations.h:2364
+#: my-evolution/Locations.h:2363
 msgid "Valparaiso"
 msgstr "Valparaiso"
 
-#: my-evolution/Locations.h:2365
+#: my-evolution/Locations.h:2364
 msgid "Valparaiso-Eglin AFB"
 msgstr "Valparaiso-Eglin AFB"
 
-#: my-evolution/Locations.h:2366
+#: my-evolution/Locations.h:2365
 msgid "Van"
 msgstr "Van"
 
-#: my-evolution/Locations.h:2367
+#: my-evolution/Locations.h:2366
 msgid "Vancouver"
 msgstr "Vancouver"
 
-#: my-evolution/Locations.h:2368
+#: my-evolution/Locations.h:2367
 msgid "Vandel"
 msgstr "Vandel"
 
-#: my-evolution/Locations.h:2369
+#: my-evolution/Locations.h:2368
 msgid "Vandenberg AFB"
 msgstr "Vandenberg AFB"
 
-#: my-evolution/Locations.h:2370
+#: my-evolution/Locations.h:2369
 msgid "Vandenberg Range"
 msgstr "Vandenberg Range"
 
-#: my-evolution/Locations.h:2371
+#: my-evolution/Locations.h:2370
 msgid "Van Nuys"
 msgstr "Van Nuys"
 
-#: my-evolution/Locations.h:2372
+#: my-evolution/Locations.h:2371
 msgid "Varadero"
 msgstr "Varadero"
 
-#: my-evolution/Locations.h:2373
+#: my-evolution/Locations.h:2372
 msgid "Varanasi/Babatpur"
 msgstr "Varanasi/Babatpur"
 
-#: my-evolution/Locations.h:2374
+#: my-evolution/Locations.h:2373
 msgid "Varna"
 msgstr "Varna"
 
-#: my-evolution/Locations.h:2375
+#: my-evolution/Locations.h:2374
 msgid "Vasteras"
 msgstr "Västerås"
 
-#: my-evolution/Locations.h:2376
+#: my-evolution/Locations.h:2375
 msgid "Vaxjo"
 msgstr "Vaxjo"
 
-#: my-evolution/Locations.h:2377
+#: my-evolution/Locations.h:2376
 msgid "Venezia"
 msgstr "Venezia"
 
-#: my-evolution/Locations.h:2379
+#: my-evolution/Locations.h:2378
 msgid "Venice"
 msgstr "Venice"
 
-#: my-evolution/Locations.h:2380
+#: my-evolution/Locations.h:2379
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: my-evolution/Locations.h:2381
+#: my-evolution/Locations.h:2380
 msgid "Vermillion"
 msgstr "Vermillion"
 
-#: my-evolution/Locations.h:2382
+#: my-evolution/Locations.h:2381
 msgid "Vermont"
 msgstr "Vermont"
 
-#: my-evolution/Locations.h:2383
+#: my-evolution/Locations.h:2382
 msgid "Vernal"
 msgstr "Vernal"
 
-#: my-evolution/Locations.h:2384
+#: my-evolution/Locations.h:2383
 msgid "Vero Beach"
 msgstr "Vero Beach"
 
-#: my-evolution/Locations.h:2385
+#: my-evolution/Locations.h:2384
 msgid "Vicenza"
 msgstr "Vicenza"
 
-#: my-evolution/Locations.h:2386
+#: my-evolution/Locations.h:2385
 msgid "Vichy-Charmeil"
 msgstr "Vichy-Charmeil"
 
-#: my-evolution/Locations.h:2387
+#: my-evolution/Locations.h:2386
 msgid "Vichy-Rolla"
 msgstr "Vichy-Rolla"
 
-#: my-evolution/Locations.h:2388
+#: my-evolution/Locations.h:2387
 msgid "Vicksburg"
 msgstr "Vicksburg"
 
-#: my-evolution/Locations.h:2389
+#: my-evolution/Locations.h:2388
 msgid "Victoria"
 msgstr "Victoria"
 
-#: my-evolution/Locations.h:2391
+#: my-evolution/Locations.h:2390
 msgid "Vigo"
 msgstr "Vigo"
 
-#: my-evolution/Locations.h:2392
+#: my-evolution/Locations.h:2391
 msgid "Vilhena"
 msgstr "Vilhena"
 
-#: my-evolution/Locations.h:2393
+#: my-evolution/Locations.h:2392
 msgid "Villacoublay"
 msgstr "Villacoublay"
 
-#: my-evolution/Locations.h:2394
+#: my-evolution/Locations.h:2393
 msgid "Villafranca"
 msgstr "Villafranca"
 
-#: my-evolution/Locations.h:2395
+#: my-evolution/Locations.h:2394
 msgid "Villahermosa"
 msgstr "Villahermosa"
 
-#: my-evolution/Locations.h:2396
+#: my-evolution/Locations.h:2395
 msgid "Villamontes"
 msgstr "Villamontes"
 
-#: my-evolution/Locations.h:2397
+#: my-evolution/Locations.h:2396
 msgid "Villa Reynolds"
 msgstr "Villa Reynolds"
 
-#: my-evolution/Locations.h:2398
+#: my-evolution/Locations.h:2397
 msgid "Vilnius"
 msgstr "Vilnius"
 
-#: my-evolution/Locations.h:2399
+#: my-evolution/Locations.h:2398
 msgid "Virginia"
 msgstr "Virginia"
 
-#: my-evolution/Locations.h:2400
+#: my-evolution/Locations.h:2399
 msgid "Virginia Beach"
 msgstr "Virginia Beach"
 
-#: my-evolution/Locations.h:2401
+#: my-evolution/Locations.h:2400
 msgid "Virginia Tech Airport"
 msgstr "Virginia tekniske flyplass"
 
-#: my-evolution/Locations.h:2402
+#: my-evolution/Locations.h:2401
 msgid "Viru-Viru"
 msgstr "Viru-Viru"
 
-#: my-evolution/Locations.h:2403
+#: my-evolution/Locations.h:2402
 msgid "Visalia"
 msgstr "Visalia"
 
-#: my-evolution/Locations.h:2404
+#: my-evolution/Locations.h:2403
 msgid "Visby"
 msgstr "Visby"
 
-#: my-evolution/Locations.h:2405
+#: my-evolution/Locations.h:2404
 msgid "Viterbo"
 msgstr "Viterbo"
 
-#: my-evolution/Locations.h:2406
+#: my-evolution/Locations.h:2405
 msgid "Vitoria"
 msgstr "Vitoria"
 
-#: my-evolution/Locations.h:2407
+#: my-evolution/Locations.h:2406
 msgid "Vladikavkaz"
 msgstr "Vladikavkaz"
 
-#: my-evolution/Locations.h:2408
+#: my-evolution/Locations.h:2407
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
-#: my-evolution/Locations.h:2409
+#: my-evolution/Locations.h:2408
 msgid "Vlieland"
 msgstr "Vlieland"
 
-#: my-evolution/Locations.h:2410
+#: my-evolution/Locations.h:2409
 msgid "Vojens/Skrydstrup"
 msgstr "Vojens/Skrydstrup"
 
-#: my-evolution/Locations.h:2411
+#: my-evolution/Locations.h:2410
 msgid "Volgograd"
 msgstr "Volgograd"
 
-#: my-evolution/Locations.h:2412
+#: my-evolution/Locations.h:2411
 msgid "Volkel"
 msgstr "Volkel"
 
-#: my-evolution/Locations.h:2413
+#: my-evolution/Locations.h:2412
 msgid "Volk Field"
 msgstr "Volk Field"
 
-#: my-evolution/Locations.h:2414
+#: my-evolution/Locations.h:2413
 msgid "Voronezh"
 msgstr "Voronezh"
 
-#: my-evolution/Locations.h:2415
+#: my-evolution/Locations.h:2414
 msgid "Voslau"
 msgstr "Voslau"
 
-#: my-evolution/Locations.h:2416
+#: my-evolution/Locations.h:2415
 msgid "Waco"
 msgstr "Waco"
 
-#: my-evolution/Locations.h:2417
+#: my-evolution/Locations.h:2416
 msgid "Wadi Al Dawasser Airport"
 msgstr "Wadi Al Dawasser flyplass"
 
-#: my-evolution/Locations.h:2418
+#: my-evolution/Locations.h:2417
 msgid "Wainwright"
 msgstr "Wainwright"
 
-#: my-evolution/Locations.h:2419
+#: my-evolution/Locations.h:2418
 msgid "Wakefield"
 msgstr "Wakesfield"
 
-#: my-evolution/Locations.h:2420
+#: my-evolution/Locations.h:2419
 msgid "Wakkanai Airport"
 msgstr "Wakkanai flyplass"
 
-#: my-evolution/Locations.h:2421
+#: my-evolution/Locations.h:2420
 msgid "Walla Walla"
 msgstr "Walla Walla"
 
-#: my-evolution/Locations.h:2422
+#: my-evolution/Locations.h:2421
 msgid "Wallops Island"
 msgstr "Wallops Island"
 
-#: my-evolution/Locations.h:2423
+#: my-evolution/Locations.h:2422
 msgid "Walnut Ridge"
 msgstr "Walnut Ridge"
 
-#: my-evolution/Locations.h:2424
+#: my-evolution/Locations.h:2423
 msgid "Warner Robins"
 msgstr "Warner Robins"
 
-#: my-evolution/Locations.h:2425
+#: my-evolution/Locations.h:2424
 msgid "Warroad"
 msgstr "Warroad"
 
-#: my-evolution/Locations.h:2426
+#: my-evolution/Locations.h:2425
 msgid "Warszawa"
 msgstr "Warshava"
 
-#: my-evolution/Locations.h:2427
+#: my-evolution/Locations.h:2426
 msgid "Washington"
 msgstr "Washington"
 
-#: my-evolution/Locations.h:2428
+#: my-evolution/Locations.h:2427
 msgid "Washington/Dulles"
 msgstr "Washington/Dulles"
 
-#: my-evolution/Locations.h:2429
+#: my-evolution/Locations.h:2428
 msgid "Waterbury"
 msgstr "Waterbury"
 
-#: my-evolution/Locations.h:2430
+#: my-evolution/Locations.h:2429
 msgid "Waterloo"
 msgstr "Waterloo"
 
-#: my-evolution/Locations.h:2431
+#: my-evolution/Locations.h:2430
 msgid "Watertown"
 msgstr "Watertown"
 
-#: my-evolution/Locations.h:2432
+#: my-evolution/Locations.h:2431
 msgid "Waterville"
 msgstr "Waterville"
 
-#: my-evolution/Locations.h:2433
+#: my-evolution/Locations.h:2432
 msgid "Waukesha"
 msgstr "Waukesha"
 
-#: my-evolution/Locations.h:2434
+#: my-evolution/Locations.h:2433
 msgid "Wausau"
 msgstr "Wausau"
 
-#: my-evolution/Locations.h:2435
+#: my-evolution/Locations.h:2434
 msgid "Waycross"
 msgstr "Waycross"
 
-#: my-evolution/Locations.h:2436
+#: my-evolution/Locations.h:2435
 msgid "Waynesboro"
 msgstr "Waynesboro"
 
-#: my-evolution/Locations.h:2437
+#: my-evolution/Locations.h:2436
 msgid "Webster City"
 msgstr "Webster City"
 
-#: my-evolution/Locations.h:2438
+#: my-evolution/Locations.h:2437
 msgid "Wejh"
 msgstr "Wejh"
 
-#: my-evolution/Locations.h:2439
+#: my-evolution/Locations.h:2438
 msgid "Wellington"
 msgstr "Wellington"
 
-#: my-evolution/Locations.h:2440
+#: my-evolution/Locations.h:2439
 msgid "Wenatchee"
 msgstr "Wenatchee"
 
-#: my-evolution/Locations.h:2441
+#: my-evolution/Locations.h:2440
 msgid "Wendover"
 msgstr "Wendover"
 
-#: my-evolution/Locations.h:2442
+#: my-evolution/Locations.h:2441
 msgid "West Atlanta"
 msgstr "West Atlanta"
 
-#: my-evolution/Locations.h:2443
+#: my-evolution/Locations.h:2442
 msgid "West Burke"
 msgstr "West Burke"
 
-#: my-evolution/Locations.h:2444
+#: my-evolution/Locations.h:2443
 msgid "Westerland"
 msgstr "Westerland"
 
-#: my-evolution/Locations.h:2445
+#: my-evolution/Locations.h:2444
 msgid "Westfield"
 msgstr "Westfield"
 
-#: my-evolution/Locations.h:2446
+#: my-evolution/Locations.h:2445
 msgid "Westhampton"
 msgstr "Westhampton"
 
-#: my-evolution/Locations.h:2447
+#: my-evolution/Locations.h:2446
 msgid "West Palm Beach"
 msgstr "West Palm Beach"
 
-#: my-evolution/Locations.h:2448
+#: my-evolution/Locations.h:2447
 msgid "West Virginia"
 msgstr "West Virginia"
 
-#: my-evolution/Locations.h:2449
+#: my-evolution/Locations.h:2448
 msgid "West Yellowstone"
 msgstr "West Yellowstone"
 
-#: my-evolution/Locations.h:2450
+#: my-evolution/Locations.h:2449
 msgid "West Yellowstone (2)"
 msgstr "West Yellowstone (2)"
 
-#: my-evolution/Locations.h:2451
+#: my-evolution/Locations.h:2450
 msgid "Wheeling"
 msgstr "Wheeling"
 
-#: my-evolution/Locations.h:2452
+#: my-evolution/Locations.h:2451
 msgid "Whidbey Island"
 msgstr "Whidbey Island"
 
-#: my-evolution/Locations.h:2453
+#: my-evolution/Locations.h:2452
 msgid "Whitefield"
 msgstr "Whitefield"
 
-#: my-evolution/Locations.h:2454
+#: my-evolution/Locations.h:2453
 msgid "White Plains"
 msgstr "White Plains"
 
-#: my-evolution/Locations.h:2455
+#: my-evolution/Locations.h:2454
 msgid "White Sulphur"
 msgstr "White Sulphur"
 
-#: my-evolution/Locations.h:2456
+#: my-evolution/Locations.h:2455
 msgid "Whittier"
 msgstr "Whittier"
 
-#: my-evolution/Locations.h:2457
+#: my-evolution/Locations.h:2456
 msgid "Wichita"
 msgstr "Wichita"
 
-#: my-evolution/Locations.h:2458
+#: my-evolution/Locations.h:2457
 msgid "Wichita Falls"
 msgstr "Wichita Falls"
 
-#: my-evolution/Locations.h:2459
+#: my-evolution/Locations.h:2458
 msgid "Wichita-Jabara"
 msgstr "Wichita-Jabara"
 
-#: my-evolution/Locations.h:2460
+#: my-evolution/Locations.h:2459
 msgid "Wichita-McConnell AFB"
 msgstr "Wichita-McConnell AFB"
 
-#: my-evolution/Locations.h:2461
+#: my-evolution/Locations.h:2460
 msgid "Wick"
 msgstr "Wick"
 
-#: my-evolution/Locations.h:2462
+#: my-evolution/Locations.h:2461
 msgid "Wien"
 msgstr "Wien"
 
-#: my-evolution/Locations.h:2463
+#: my-evolution/Locations.h:2462
 msgid "Wildwood"
 msgstr "Wildwood"
 
-#: my-evolution/Locations.h:2464
+#: my-evolution/Locations.h:2463
 msgid "Wilkes - Barre"
 msgstr "Wilkes - Barre"
 
-#: my-evolution/Locations.h:2465
+#: my-evolution/Locations.h:2464
 msgid "Williams Field"
 msgstr "Williams Field"
 
-#: my-evolution/Locations.h:2466
+#: my-evolution/Locations.h:2465
 msgid "Williamsport"
 msgstr "Williamsport"
 
-#: my-evolution/Locations.h:2467
+#: my-evolution/Locations.h:2466
 msgid "Williston"
 msgstr "Williston"
 
-#: my-evolution/Locations.h:2468
+#: my-evolution/Locations.h:2467
 msgid "Willoughby"
 msgstr "Willoughby"
 
-#: my-evolution/Locations.h:2469
+#: my-evolution/Locations.h:2468
 msgid "Willow Airport"
 msgstr "Willow Airport"
 
-#: my-evolution/Locations.h:2470
+#: my-evolution/Locations.h:2469
 msgid "Wilmington"
 msgstr "Wilmington"
 
-#: my-evolution/Locations.h:2471
+#: my-evolution/Locations.h:2470
 msgid "Winchester"
 msgstr "Winchester"
 
-#: my-evolution/Locations.h:2472
+#: my-evolution/Locations.h:2471
 msgid "Windsor"
 msgstr "Windsor"
 
-#: my-evolution/Locations.h:2473
+#: my-evolution/Locations.h:2472
 msgid "Windsor Locks"
 msgstr "Windsor Locks"
 
-#: my-evolution/Locations.h:2474
+#: my-evolution/Locations.h:2473
 msgid "Wink"
 msgstr "Wink"
 
-#: my-evolution/Locations.h:2475
+#: my-evolution/Locations.h:2474
 msgid "Winnemucca"
 msgstr "Winnemucca"
 
-#: my-evolution/Locations.h:2476
+#: my-evolution/Locations.h:2475
 msgid "Winnipeg"
 msgstr "Winnipeg"
 
-#: my-evolution/Locations.h:2477
+#: my-evolution/Locations.h:2476
 msgid "Winslow"
 msgstr "Winslow"
 
-#: my-evolution/Locations.h:2478
+#: my-evolution/Locations.h:2477
 msgid "Winston-Salem"
 msgstr "Winston-Salem"
 
-#: my-evolution/Locations.h:2479
+#: my-evolution/Locations.h:2478
 msgid "Winter Haven"
 msgstr "Winter Haven"
 
-#: my-evolution/Locations.h:2480
+#: my-evolution/Locations.h:2479
 msgid "Winter Park"
 msgstr "Winter Park"
 
-#: my-evolution/Locations.h:2481
+#: my-evolution/Locations.h:2480
 msgid "Wiscasset"
 msgstr "Wiscasset"
 
-#: my-evolution/Locations.h:2482
+#: my-evolution/Locations.h:2481
 msgid "Wisconsin"
 msgstr "Wisconsin"
 
-#: my-evolution/Locations.h:2483
+#: my-evolution/Locations.h:2482
 msgid "Wisconsin Rapids"
 msgstr "Wisconsin Rapids"
 
-#: my-evolution/Locations.h:2484
+#: my-evolution/Locations.h:2483
 msgid "Wise"
 msgstr "Wise"
 
-#: my-evolution/Locations.h:2485
+#: my-evolution/Locations.h:2484
 msgid "Woensdrecht"
 msgstr "Woensdrecht"
 
-#: my-evolution/Locations.h:2486
+#: my-evolution/Locations.h:2485
 msgid "Wolf Point"
 msgstr "Wolf Point"
 
-#: my-evolution/Locations.h:2487
+#: my-evolution/Locations.h:2486
 msgid "Woong Cheon"
 msgstr "Woong Cheon"
 
-#: my-evolution/Locations.h:2488
+#: my-evolution/Locations.h:2487
 msgid "Wooster"
 msgstr "Wooster"
 
-#: my-evolution/Locations.h:2489
+#: my-evolution/Locations.h:2488
 msgid "Worcester"
 msgstr "Worcester"
 
-#: my-evolution/Locations.h:2490
+#: my-evolution/Locations.h:2489
 msgid "Worland"
 msgstr "Worland"
 
-#: my-evolution/Locations.h:2491
+#: my-evolution/Locations.h:2490
 msgid "Worthington"
 msgstr "Worthington"
 
-#: my-evolution/Locations.h:2492
+#: my-evolution/Locations.h:2491
 msgid "Wrangell"
 msgstr "Wrangell"
 
-#: my-evolution/Locations.h:2493
+#: my-evolution/Locations.h:2492
 msgid "Wrightstown / Mcguire AFB"
 msgstr "Wrightstown / Mcguire AFB"
 
-#: my-evolution/Locations.h:2494
+#: my-evolution/Locations.h:2493
 msgid "Wuchia Observatory"
 msgstr "Wuchia obervatorie"
 
-#: my-evolution/Locations.h:2495
+#: my-evolution/Locations.h:2494
 msgid "Wyoming"
 msgstr "Wyoming"
 
-#: my-evolution/Locations.h:2496
+#: my-evolution/Locations.h:2495
 msgid "Xiamen"
 msgstr "Xiamen"
 
-#: my-evolution/Locations.h:2497
+#: my-evolution/Locations.h:2496
 msgid "Yacuiba"
 msgstr "Yacuiba"
 
-#: my-evolution/Locations.h:2498
+#: my-evolution/Locations.h:2497
 msgid "Yakima"
 msgstr "Yakima"
 
-#: my-evolution/Locations.h:2499
+#: my-evolution/Locations.h:2498
 msgid "Yakushima"
 msgstr "Yakushima"
 
-#: my-evolution/Locations.h:2500
+#: my-evolution/Locations.h:2499
 msgid "Yakutat"
 msgstr "Yakutat"
 
-#: my-evolution/Locations.h:2501
+#: my-evolution/Locations.h:2500
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
-#: my-evolution/Locations.h:2502
+#: my-evolution/Locations.h:2501
 msgid "Yamagata Airport"
 msgstr "Yamagata flyplass"
 
-#: my-evolution/Locations.h:2503
+#: my-evolution/Locations.h:2502
 msgid "Yamaguchi Ube Airport"
 msgstr "Yamaguchi Ube flyplass"
 
-#: my-evolution/Locations.h:2504
+#: my-evolution/Locations.h:2503
 msgid "Yankton"
 msgstr "Yankton"
 
-#: my-evolution/Locations.h:2505
+#: my-evolution/Locations.h:2504
 msgid "Yao Airport"
 msgstr "Yao flyplass"
 
-#: my-evolution/Locations.h:2506
+#: my-evolution/Locations.h:2505
 msgid "Yechon Ab"
 msgstr "Yechon Ab"
 
-#: my-evolution/Locations.h:2507
+#: my-evolution/Locations.h:2506
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
-#: my-evolution/Locations.h:2508
+#: my-evolution/Locations.h:2507
 msgid "Yellowknife"
 msgstr "Yellowknife"
 
-#: my-evolution/Locations.h:2509
+#: my-evolution/Locations.h:2508
 msgid "Yellowstone"
 msgstr "Yellowstone"
 
-#: my-evolution/Locations.h:2511
+#: my-evolution/Locations.h:2510
 msgid "Yenbo"
 msgstr "Yenbo"
 
-#: my-evolution/Locations.h:2512
+#: my-evolution/Locations.h:2511
 msgid "Yeoju Range"
 msgstr "Yeoju Range"
 
-#: my-evolution/Locations.h:2513
+#: my-evolution/Locations.h:2512
 msgid "Yeonpyeungdo"
 msgstr "Yeinpyeungdo"
 
-#: my-evolution/Locations.h:2514
+#: my-evolution/Locations.h:2513
 msgid "Yeovilton"
 msgstr "Yeovilton"
 
-#: my-evolution/Locations.h:2515
+#: my-evolution/Locations.h:2514
 msgid "Yokosuka Fwf"
 msgstr "Yokosuka Fwf"
 
-#: my-evolution/Locations.h:2516
+#: my-evolution/Locations.h:2515
 msgid "Yokota Ab"
 msgstr "Yokota Ab"
 
-#: my-evolution/Locations.h:2517
+#: my-evolution/Locations.h:2516
 msgid "Yongsan/H-208 Hp"
 msgstr "Yongsan/H-208 Hp"
 
-#: my-evolution/Locations.h:2518
+#: my-evolution/Locations.h:2517
 msgid "Yoro"
 msgstr "Yoro"
 
-#: my-evolution/Locations.h:2519
+#: my-evolution/Locations.h:2518
 msgid "Yosu"
 msgstr "Yosu"
 
-#: my-evolution/Locations.h:2520
+#: my-evolution/Locations.h:2519
 msgid "Youngstown"
 msgstr "Youngstown"
 
-#: my-evolution/Locations.h:2521
+#: my-evolution/Locations.h:2520
 msgid "Ypsilanti"
 msgstr "Ypsilanti"
 
-#: my-evolution/Locations.h:2523
+#: my-evolution/Locations.h:2522
 msgid "Yukon"
 msgstr "Yukon"
 
-#: my-evolution/Locations.h:2524
+#: my-evolution/Locations.h:2523
 msgid "Yuma MCAS"
 msgstr "Yuma MCAS"
 
-#: my-evolution/Locations.h:2525
+#: my-evolution/Locations.h:2524
 msgid "Yurimaguas"
 msgstr "Yurimaguas"
 
-#: my-evolution/Locations.h:2526
+#: my-evolution/Locations.h:2525
 msgid "Yuzhno-Sakhalinsk"
 msgstr "Yuzhno-Sakhalinsk"
 
-#: my-evolution/Locations.h:2527
+#: my-evolution/Locations.h:2526
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: my-evolution/Locations.h:2528
+#: my-evolution/Locations.h:2527
 msgid "Zadar"
 msgstr "Zadar"
 
-#: my-evolution/Locations.h:2529
+#: my-evolution/Locations.h:2528
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#: my-evolution/Locations.h:2530
+#: my-evolution/Locations.h:2529
 msgid "Zakinthos"
 msgstr "Zakinthos"
 
-#: my-evolution/Locations.h:2531
+#: my-evolution/Locations.h:2530
 msgid "Zama Airfield"
 msgstr "Zama flyplass"
 
-#: my-evolution/Locations.h:2532
+#: my-evolution/Locations.h:2531
 msgid "Zanesville"
 msgstr "Zanesville"
 
-#: my-evolution/Locations.h:2533
+#: my-evolution/Locations.h:2532
 msgid "Zaragoza"
 msgstr "Zaragoza"
 
-#: my-evolution/Locations.h:2534
+#: my-evolution/Locations.h:2533
 msgid "Zell Am See"
 msgstr "Zell Am See"
 
-#: my-evolution/Locations.h:2535
+#: my-evolution/Locations.h:2534
 msgid "Zuni Pueblo"
 msgstr "Zuni Pueblo"
 
-#: my-evolution/Locations.h:2536
+#: my-evolution/Locations.h:2535
 msgid "Zurich"
 msgstr "Zurich"
 
-#: my-evolution/component-factory.c:51
+#: my-evolution/component-factory.c:56
 msgid "Folder containing the Evolution Summary"
 msgstr "Mappe som inneholder Evolution sammendrag"
 
-#: my-evolution/e-summary-calendar.c:381 my-evolution/e-summary-calendar.c:401
+#: my-evolution/e-summary-calendar.c:380
 msgid "Appointments"
 msgstr "Avtaler"
 
-#: my-evolution/e-summary-calendar.c:382
-msgid "No appointments"
-msgstr "Ingen avtaler"
+#: my-evolution/e-summary-calendar.c:388
+msgid "No appointments."
+msgstr "Ingen avtaler."
 
-#: my-evolution/e-summary-calendar.c:418
+#: my-evolution/e-summary-calendar.c:405
 msgid "%k:%M %d %B"
 msgstr "%k:%M %d %B"
 
-#: my-evolution/e-summary-calendar.c:420
+#: my-evolution/e-summary-calendar.c:407
 msgid "%l:%M %d %B"
 msgstr "%l: %M %d %B"
 
-#: my-evolution/e-summary-calendar.c:438
+#: my-evolution/e-summary-calendar.c:425
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: my-evolution/e-summary-mail.c:153
+#: my-evolution/e-summary-mail.c:156
 msgid "Mail summary"
 msgstr "E-post sammendrag"
 
 #: my-evolution/e-summary-mail.c:411 my-evolution/e-summary-mail.c:735
-#: shell/e-local-storage.c:1102
+#: shell/e-local-storage.c:1119
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#. translators: Put a list of codes for locations you want to see in
-#. My Evolution by default here. You can find the list of all
-#. stations and their codes in Evolution sources.
-#. (evolution/my-evolution/Locations)
-#. Codes are seperated with : eg. "KBOS:EGAA"
-#: my-evolution/e-summary-preferences.c:108
-#: my-evolution/e-summary-weather.c:591
-msgid "KBOS"
-msgstr "KBOS"
-
-#: my-evolution/e-summary-preferences.c:584
+#: my-evolution/e-summary-preferences.c:356
 msgid "Dictionary.com Word of the Day"
 msgstr "Dictionary.com Ord for dagen"
 
-#: my-evolution/e-summary-preferences.c:602
+#: my-evolution/e-summary-preferences.c:374
 msgid "Quotes of the Day"
 msgstr "Dagens sitat"
 
-#: my-evolution/e-summary-preferences.c:840
+#: my-evolution/e-summary-preferences.c:615
 msgid "Add a news feed"
 msgstr "Legg til news-tjener"
 
-#: my-evolution/e-summary-preferences.c:848
+#: my-evolution/e-summary-preferences.c:621
 msgid "Enter the URL of the news feed you wish to add"
 msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 
@@ -23404,1234 +23730,1238 @@ msgstr "Skriv inn URL for nyhetsstedet du vil legge til"
 msgid "Error downloading RDF"
 msgstr "Feil under nedlasting av RDF"
 
-#: my-evolution/e-summary-rdf.c:446
+#: my-evolution/e-summary-rdf.c:447
 msgid "News Feed"
 msgstr "Nyhetstjenester"
 
-#: my-evolution/e-summary-shown.c:519
+#: my-evolution/e-summary-shown.c:518
 msgid "All"
 msgstr "Alle"
 
 #. Fixme: nice GFX version
-#: my-evolution/e-summary-shown.c:531
+#: my-evolution/e-summary-shown.c:530
 msgid "Add"
 msgstr "Legg til"
 
-#: my-evolution/e-summary-shown.c:546 my-evolution/e-summary-table.c:58
+#: my-evolution/e-summary-shown.c:543 my-evolution/e-summary-table.c:58
 msgid "Shown"
 msgstr "Vist"
 
-#: my-evolution/e-summary-tasks.c:328
+#: my-evolution/e-summary-tasks.c:327
 msgid "No tasks"
 msgstr "Ingen oppgaver"
 
-#: my-evolution/e-summary-tasks.c:372
+#: my-evolution/e-summary-tasks.c:371
 msgid "(No Description)"
 msgstr "(Ingen beskrivelse)"
 
-#: my-evolution/e-summary-weather.c:72
+#: my-evolution/e-summary-weather.c:73
 msgid "My Weather"
 msgstr "Min værmelding"
 
-#: my-evolution/e-summary-weather.c:268
+#: my-evolution/e-summary-weather.c:269
 msgid "There was an error downloading data for"
 msgstr "Det oppsto en feil under nedlasting av data for"
 
-#: my-evolution/e-summary-weather.c:489
+#: my-evolution/e-summary-weather.c:490
 msgid "Weather"
 msgstr "Vær"
 
-#: my-evolution/e-summary.c:188
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:594
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:197
 msgid "%A, %B %e %Y"
-msgstr "%A, %B %e %Y"
+msgstr "%A, %e %B %Y"
 
-#: my-evolution/e-summary.c:504
+#: my-evolution/e-summary.c:523
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: my-evolution/e-summary.c:594 ui/my-evolution.xml.h:2
+#: my-evolution/e-summary.c:591 ui/my-evolution.xml.h:2
 msgid "Print Summary"
 msgstr "Skriv ut sammendrag"
 
-#: my-evolution/e-summary.c:640
+#: my-evolution/e-summary.c:625
 msgid "Printing of Summary failed"
 msgstr "Feil under utskrift av sammendrag"
 
-#: my-evolution/main.c:68
-msgid "Executive summary component could not initialize Bonobo.\n"
-msgstr "Executive summary komponent kunne ikke initiere Bonobo.\n"
-
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " F"
 msgstr " F"
 
-#: my-evolution/metar.c:29
+#: my-evolution/metar.c:30
 msgid " C"
 msgstr " C"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "knots"
 msgstr "knop"
 
-#: my-evolution/metar.c:33
+#: my-evolution/metar.c:34
 msgid "kph"
 msgstr "kpt"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "inHg"
 msgstr "inHg"
 
-#: my-evolution/metar.c:38
+#: my-evolution/metar.c:39
 msgid "mmHg"
 msgstr "mmHg"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "miles"
 msgstr "engelske mil"
 
-#: my-evolution/metar.c:41
+#: my-evolution/metar.c:42
 msgid "kilometers"
 msgstr "kilometer"
 
-#: my-evolution/metar.c:44
+#: my-evolution/metar.c:45
 msgid "Clear sky"
 msgstr "Klar himmel"
 
-#: my-evolution/metar.c:45
+#: my-evolution/metar.c:46
 msgid "Broken clouds"
 msgstr "Brutte skyer"
 
-#: my-evolution/metar.c:46
+#: my-evolution/metar.c:47
 msgid "Scattered clouds"
 msgstr "Spredte skyer"
 
-#: my-evolution/metar.c:47
+#: my-evolution/metar.c:48
 msgid "Few clouds"
 msgstr "Få skyer"
 
-#: my-evolution/metar.c:48
+#: my-evolution/metar.c:49
 msgid "Overcast"
 msgstr "Overskyet"
 
-#: my-evolution/metar.c:56 my-evolution/metar.c:74 my-evolution/metar.c:485
+#: my-evolution/metar.c:57 my-evolution/metar.c:75 my-evolution/metar.c:486
 msgid "Invalid"
 msgstr "Ugyldig"
 
-#: my-evolution/metar.c:63
+#: my-evolution/metar.c:64
 msgid "Variable"
 msgstr "Variabel"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North"
 msgstr "Nord"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "North - NorthEast"
 msgstr "Nord - nordøst"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "Northeast"
 msgstr "Nordøst"
 
-#: my-evolution/metar.c:64
+#: my-evolution/metar.c:65
 msgid "East - NorthEast"
 msgstr "Øst - nordøst"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East"
 msgstr "Øst"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "East - Southeast"
 msgstr "Øst - sørøst"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "Southeast"
 msgstr "Sørøst"
 
-#: my-evolution/metar.c:65
+#: my-evolution/metar.c:66
 msgid "South - Southeast"
 msgstr "Sør - sørøst"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South"
 msgstr "Sør"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "South - Southwest"
 msgstr "Sør - sørvest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "Southwest"
 msgstr "Sørvest"
 
-#: my-evolution/metar.c:66
+#: my-evolution/metar.c:67
 msgid "West - Southwest"
 msgstr "Vest - sørvest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West"
 msgstr "Vest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "West - Northwest"
 msgstr "Vest - nordvest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "Northwest"
 msgstr "Nordvest"
 
-#: my-evolution/metar.c:67
+#: my-evolution/metar.c:68
 msgid "North - Northwest"
 msgstr "Nord - nordvest"
 
 #. DRIZZLE
-#: my-evolution/metar.c:127
+#: my-evolution/metar.c:128
 msgid "Drizzle"
 msgstr "Småregn"
 
-#: my-evolution/metar.c:128
+#: my-evolution/metar.c:129
 msgid "Drizzle in the vicinity"
 msgstr "Småregn i omegnen"
 
-#: my-evolution/metar.c:129
+#: my-evolution/metar.c:130
 msgid "Light drizzle"
 msgstr "Lett småregn"
 
-#: my-evolution/metar.c:130
+#: my-evolution/metar.c:131
 msgid "Moderate drizzle"
 msgstr "Moderat småregn"
 
-#: my-evolution/metar.c:131
+#: my-evolution/metar.c:132
 msgid "Heavy drizzle"
 msgstr "Tungt småregn"
 
-#: my-evolution/metar.c:132
+#: my-evolution/metar.c:133
 msgid "Shallow drizzle"
 msgstr "Tynt småregn"
 
-#: my-evolution/metar.c:133
+#: my-evolution/metar.c:134
 msgid "Patches of drizzle"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:134
+#: my-evolution/metar.c:135
 msgid "Partial drizzle"
 msgstr "Delvis småregn"
 
-#: my-evolution/metar.c:135 my-evolution/metar.c:150
+#: my-evolution/metar.c:136 my-evolution/metar.c:151
 msgid "Thunderstorm"
 msgstr "Tordenstorm"
 
-#: my-evolution/metar.c:136
+#: my-evolution/metar.c:137
 msgid "Windy drizzle"
 msgstr "Småregn med vind"
 
-#: my-evolution/metar.c:137
+#: my-evolution/metar.c:138
 msgid "Showers"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:138
+#: my-evolution/metar.c:139
 msgid "Drifting drizzle"
 msgstr "Drivende småregn"
 
-#: my-evolution/metar.c:139
+#: my-evolution/metar.c:140
 msgid "Freezing drizzle"
 msgstr "Frysende småregn"
 
 #. RAIN
-#: my-evolution/metar.c:142
+#: my-evolution/metar.c:143
 msgid "Rain"
 msgstr "Regn"
 
-#: my-evolution/metar.c:143
+#: my-evolution/metar.c:144
 msgid "Rain in the vicinity"
 msgstr "Regn i omegnen"
 
-#: my-evolution/metar.c:144
+#: my-evolution/metar.c:145
 msgid "Light rain"
 msgstr "Lett regn"
 
-#: my-evolution/metar.c:145
+#: my-evolution/metar.c:146
 msgid "Moderate rain"
 msgstr "Moderat regn"
 
-#: my-evolution/metar.c:146
+#: my-evolution/metar.c:147
 msgid "Heavy rain"
 msgstr "Tungt regn"
 
-#: my-evolution/metar.c:147
+#: my-evolution/metar.c:148
 msgid "Shallow rain"
 msgstr "Tynt regn"
 
-#: my-evolution/metar.c:148
+#: my-evolution/metar.c:149
 msgid "Patches of rain"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:149
+#: my-evolution/metar.c:150
 msgid "Partial rainfall"
 msgstr "Delvis regn"
 
-#: my-evolution/metar.c:151
+#: my-evolution/metar.c:152
 msgid "Blowing rainfall"
 msgstr "Regn med vind"
 
-#: my-evolution/metar.c:152
+#: my-evolution/metar.c:153
 msgid "Rain showers"
 msgstr "Regnbyger"
 
-#: my-evolution/metar.c:153
+#: my-evolution/metar.c:154
 msgid "Drifting rain"
 msgstr "Drivende regn"
 
-#: my-evolution/metar.c:154
+#: my-evolution/metar.c:155
 msgid "Freezing rain"
 msgstr "Frysende regn"
 
 #. SNOW
-#: my-evolution/metar.c:157
+#: my-evolution/metar.c:158
 msgid "Snow"
 msgstr "Snø"
 
-#: my-evolution/metar.c:158
+#: my-evolution/metar.c:159
 msgid "Snow in the vicinity"
 msgstr "Snø i omegnen"
 
-#: my-evolution/metar.c:159
+#: my-evolution/metar.c:160
 msgid "Light snow"
 msgstr "Lett snø"
 
-#: my-evolution/metar.c:160
+#: my-evolution/metar.c:161
 msgid "Moderate snow"
 msgstr "Moderat snø"
 
-#: my-evolution/metar.c:161
+#: my-evolution/metar.c:162
 msgid "Heavy snow"
 msgstr "Tung snø"
 
-#: my-evolution/metar.c:162
+#: my-evolution/metar.c:163
 msgid "Shallow snow"
 msgstr "Grunn snø"
 
-#: my-evolution/metar.c:163
+#: my-evolution/metar.c:164
 msgid "Patches of snow"
 msgstr "Snøbyger"
 
-#: my-evolution/metar.c:164
+#: my-evolution/metar.c:165
 msgid "Partial snowfall"
 msgstr "Delvis snøfall"
 
-#: my-evolution/metar.c:165 my-evolution/metar.c:180
+#: my-evolution/metar.c:166 my-evolution/metar.c:181
 msgid "Snowstorm"
 msgstr "Snøstorm"
 
-#: my-evolution/metar.c:166
+#: my-evolution/metar.c:167
 msgid "Blowing snowfall"
 msgstr "Snø og vind"
 
-#: my-evolution/metar.c:167
+#: my-evolution/metar.c:168
 msgid "Snow showers"
 msgstr "Snøbyger"
 
-#: my-evolution/metar.c:168
+#: my-evolution/metar.c:169
 msgid "Drifting snow"
 msgstr "Drivende snø"
 
-#: my-evolution/metar.c:169
+#: my-evolution/metar.c:170
 msgid "Freezing snow"
 msgstr "Frysende snø"
 
 #. SNOW_GRAINS
-#: my-evolution/metar.c:172
+#: my-evolution/metar.c:173
 msgid "Snow grains"
 msgstr "Snøkorn"
 
-#: my-evolution/metar.c:173
+#: my-evolution/metar.c:174
 msgid "Snow grains in the vicinity"
 msgstr "Snøkorn i omegnen"
 
-#: my-evolution/metar.c:174
+#: my-evolution/metar.c:175
 msgid "Light snow grains"
 msgstr "Lette snøkorn"
 
-#: my-evolution/metar.c:175
+#: my-evolution/metar.c:176
 msgid "Moderate snow grains"
 msgstr "Moderate snøkorn"
 
-#: my-evolution/metar.c:176
+#: my-evolution/metar.c:177
 msgid "Heavy snow grains"
 msgstr "Tunge snøkorn"
 
-#: my-evolution/metar.c:177
+#: my-evolution/metar.c:178
 msgid "Shallow snow grains"
 msgstr "Tynne snøkorn"
 
-#: my-evolution/metar.c:178
+#: my-evolution/metar.c:179
 msgid "Patches of snow grains"
 msgstr "Områder med snøkorn"
 
-#: my-evolution/metar.c:179
+#: my-evolution/metar.c:180
 msgid "Partial snow grains"
 msgstr "Delvise snøkorn"
 
-#: my-evolution/metar.c:181
+#: my-evolution/metar.c:182
 msgid "Blowing snow grains"
 msgstr "Blåsende snøkorn"
 
-#: my-evolution/metar.c:182
+#: my-evolution/metar.c:183
 msgid "Snow grain showers"
 msgstr "Byger med snøkorn"
 
-#: my-evolution/metar.c:183
+#: my-evolution/metar.c:184
 msgid "Drifting snow grains"
 msgstr "Drivende snøkorn"
 
-#: my-evolution/metar.c:184
+#: my-evolution/metar.c:185
 msgid "Freezing snow grains"
 msgstr "Frysende snøkorn"
 
 #. ICE_CRYSTALS
-#: my-evolution/metar.c:187
+#: my-evolution/metar.c:188
 msgid "Ice crystals"
 msgstr "Iskrystaller"
 
-#: my-evolution/metar.c:188
+#: my-evolution/metar.c:189
 msgid "Ice crystals in the vicinity"
 msgstr "Iskrystaller i omegnen"
 
-#: my-evolution/metar.c:189
+#: my-evolution/metar.c:190
 msgid "Few ice crystals"
 msgstr "Noen iskrystaller"
 
-#: my-evolution/metar.c:190
+#: my-evolution/metar.c:191
 msgid "Moderate ice crystals"
 msgstr "Moderat med iskrystaller"
 
-#: my-evolution/metar.c:191
+#: my-evolution/metar.c:192
 msgid "Heavy ice crystals"
 msgstr "Tungt med iskrystaller"
 
-#: my-evolution/metar.c:193
+#: my-evolution/metar.c:194
 msgid "Patches of ice crystals"
 msgstr "Områder med iskrystaller"
 
-#: my-evolution/metar.c:194
+#: my-evolution/metar.c:195
 msgid "Partial ice crystals"
 msgstr "Delvise iskrystaller"
 
-#: my-evolution/metar.c:195
+#: my-evolution/metar.c:196
 msgid "Ice crystal storm"
 msgstr "Storm med iskrystaller"
 
-#: my-evolution/metar.c:196
+#: my-evolution/metar.c:197
 msgid "Blowing ice crystals"
 msgstr "Blåsende iskrystaller"
 
-#: my-evolution/metar.c:197
+#: my-evolution/metar.c:198
 msgid "Showers of ice crystals"
 msgstr "Byger med iskrystaller"
 
-#: my-evolution/metar.c:198
+#: my-evolution/metar.c:199
 msgid "Drifting ice crystals"
 msgstr "Drivende iskrystaller"
 
-#: my-evolution/metar.c:199
+#: my-evolution/metar.c:200
 msgid "Freezing ice crystals"
 msgstr "Frysende iskrystaller"
 
 #. ICE_PELLETS
-#: my-evolution/metar.c:202
+#: my-evolution/metar.c:203
 msgid "Ice pellets"
 msgstr "Is-pellets"
 
-#: my-evolution/metar.c:203
+#: my-evolution/metar.c:204
 msgid "Ice pellets in the vicinity"
 msgstr "Is-pellets i området"
 
-#: my-evolution/metar.c:204
+#: my-evolution/metar.c:205
 msgid "Few ice pellets"
 msgstr "Få is-pellets"
 
-#: my-evolution/metar.c:205
+#: my-evolution/metar.c:206
 msgid "Moderate ice pellets"
 msgstr "Moderate is-pellets"
 
-#: my-evolution/metar.c:206
+#: my-evolution/metar.c:207
 msgid "Heavy ice pellets"
 msgstr "Kraftige is-pellets"
 
-#: my-evolution/metar.c:207
+#: my-evolution/metar.c:208
 msgid "Shallow ice pellets"
 msgstr "Tynne is-pellets"
 
-#: my-evolution/metar.c:208
+#: my-evolution/metar.c:209
 msgid "Patches of ice pellets"
 msgstr "Områder med is-pellets"
 
-#: my-evolution/metar.c:209
+#: my-evolution/metar.c:210
 msgid "Partial ice pellets"
 msgstr "Delvis is-pellets"
 
-#: my-evolution/metar.c:210
+#: my-evolution/metar.c:211
 msgid "Ice pellet storm"
 msgstr "Is-pellets storm"
 
-#: my-evolution/metar.c:211
+#: my-evolution/metar.c:212
 msgid "Blowing ice pellets"
 msgstr "Blåsende is-pellets"
 
-#: my-evolution/metar.c:212
+#: my-evolution/metar.c:213
 msgid "Showers of ice pellets"
 msgstr "Dusjer med is-pellets"
 
-#: my-evolution/metar.c:213
+#: my-evolution/metar.c:214
 msgid "Drifting ice pellets"
 msgstr "Drivende is-pellets"
 
-#: my-evolution/metar.c:214
+#: my-evolution/metar.c:215
 msgid "Freezing ice pellets"
 msgstr "Frysende is-pellets"
 
-#: my-evolution/metar.c:218
+#: my-evolution/metar.c:219
 msgid "Hail in the vicinity"
 msgstr "Hagl i omegnen"
 
-#: my-evolution/metar.c:219 my-evolution/metar.c:234
+#: my-evolution/metar.c:220 my-evolution/metar.c:235
 msgid "Light hail"
 msgstr "Lett hagl"
 
-#: my-evolution/metar.c:220
+#: my-evolution/metar.c:221
 msgid "Moderate hail"
 msgstr "Moderat hagl"
 
-#: my-evolution/metar.c:221
+#: my-evolution/metar.c:222
 msgid "Heavy hail"
 msgstr "Tungt hagl"
 
-#: my-evolution/metar.c:222
+#: my-evolution/metar.c:223
 msgid "Shallow hail"
 msgstr "Lett hagl"
 
-#: my-evolution/metar.c:223
+#: my-evolution/metar.c:224
 msgid "Patches of hail"
 msgstr "Områder med hagl"
 
-#: my-evolution/metar.c:224
+#: my-evolution/metar.c:225
 msgid "Partial hail"
 msgstr "Delvis hagl"
 
-#: my-evolution/metar.c:225
+#: my-evolution/metar.c:226
 msgid "Hailstorm"
 msgstr "Haglstorm"
 
-#: my-evolution/metar.c:226
+#: my-evolution/metar.c:227
 msgid "Blowing hail"
 msgstr "Hagl med vind"
 
-#: my-evolution/metar.c:227
+#: my-evolution/metar.c:228
 msgid "Hail showers"
 msgstr "Haglbyger"
 
-#: my-evolution/metar.c:228
+#: my-evolution/metar.c:229
 msgid "Drifting hail"
 msgstr "Drivende hagl"
 
-#: my-evolution/metar.c:229
+#: my-evolution/metar.c:230
 msgid "Freezing hail"
 msgstr "Frysende hagl"
 
 #. SMALL_HAIL
-#: my-evolution/metar.c:232
+#: my-evolution/metar.c:233
 msgid "Small hail"
 msgstr "Småhagl"
 
-#: my-evolution/metar.c:233
+#: my-evolution/metar.c:234
 msgid "Small hail in the vicinity"
 msgstr "Småhagl i omegnen"
 
-#: my-evolution/metar.c:235
+#: my-evolution/metar.c:236
 msgid "Moderate small hail"
 msgstr "Moderat småhagl"
 
-#: my-evolution/metar.c:236
+#: my-evolution/metar.c:237
 msgid "Heavy small hail"
 msgstr "Tungt småhagl"
 
-#: my-evolution/metar.c:237
+#: my-evolution/metar.c:238
 msgid "Shallow small hail"
 msgstr "Lett småhagl"
 
-#: my-evolution/metar.c:238
+#: my-evolution/metar.c:239
 msgid "Patches of small hail"
 msgstr "Områder med småhagl"
 
-#: my-evolution/metar.c:239
+#: my-evolution/metar.c:240
 msgid "Partial small hail"
 msgstr "Delvis småhagl"
 
-#: my-evolution/metar.c:240
+#: my-evolution/metar.c:241
 msgid "Small hailstorm"
 msgstr "Liten haglstorm"
 
-#: my-evolution/metar.c:241
+#: my-evolution/metar.c:242
 msgid "Blowing small hail"
 msgstr "Småhagl med vind"
 
-#: my-evolution/metar.c:242
+#: my-evolution/metar.c:243
 msgid "Showers of small hail"
 msgstr "Byger med småhagl"
 
-#: my-evolution/metar.c:243
+#: my-evolution/metar.c:244
 msgid "Drifting small hail"
 msgstr "Drivende småhagl"
 
-#: my-evolution/metar.c:244
+#: my-evolution/metar.c:245
 msgid "Freezing small hail"
 msgstr "Frysende småhagl"
 
 #. PRECIPITATION
-#: my-evolution/metar.c:247
+#: my-evolution/metar.c:248
 msgid "Unknown precipitation"
 msgstr "Ukjent nedbør"
 
-#: my-evolution/metar.c:248
+#: my-evolution/metar.c:249
 msgid "Precipitation in the vicinity"
 msgstr "Nedbør i området"
 
-#: my-evolution/metar.c:249
+#: my-evolution/metar.c:250
 msgid "Light precipitation"
 msgstr "Lett nedbør"
 
-#: my-evolution/metar.c:250
+#: my-evolution/metar.c:251
 msgid "Moderate precipitation"
 msgstr "Moderat nedbør"
 
-#: my-evolution/metar.c:251
+#: my-evolution/metar.c:252
 msgid "Heavy precipitation"
 msgstr "Kraftig nedbør"
 
-#: my-evolution/metar.c:252
+#: my-evolution/metar.c:253
 msgid "Shallow precipitation"
 msgstr "Tynt nedbør"
 
-#: my-evolution/metar.c:253
+#: my-evolution/metar.c:254
 msgid "Patches of precipitation"
 msgstr "Områder med nedbør"
 
-#: my-evolution/metar.c:254
+#: my-evolution/metar.c:255
 msgid "Partial precipitation"
 msgstr "Delvis nedbør"
 
-#: my-evolution/metar.c:255
+#: my-evolution/metar.c:256
 msgid "Unknown thunderstorm"
 msgstr "Ukjent tordenstorm"
 
-#: my-evolution/metar.c:256
+#: my-evolution/metar.c:257
 msgid "Blowing precipitation"
 msgstr "Blåsende nedbør"
 
-#: my-evolution/metar.c:257
+#: my-evolution/metar.c:258
 msgid "Showers, type unknown"
 msgstr "Byger, type ukjent"
 
-#: my-evolution/metar.c:258
+#: my-evolution/metar.c:259
 msgid "Drifting precipitation"
 msgstr "Drivende nedbør"
 
-#: my-evolution/metar.c:259
+#: my-evolution/metar.c:260
 msgid "Freezing precipitation"
 msgstr "Frysende nedbør"
 
 #. MIST
-#: my-evolution/metar.c:262
+#: my-evolution/metar.c:263
 msgid "Mist"
 msgstr "Tåke"
 
-#: my-evolution/metar.c:263
+#: my-evolution/metar.c:264
 msgid "Mist in the vicinity"
 msgstr "Tåke i omegnen"
 
-#: my-evolution/metar.c:264
+#: my-evolution/metar.c:265
 msgid "Light mist"
 msgstr "Lett tåke"
 
-#: my-evolution/metar.c:265
+#: my-evolution/metar.c:266
 msgid "Moderate mist"
 msgstr "Moderat tåke"
 
-#: my-evolution/metar.c:266
+#: my-evolution/metar.c:267
 msgid "Thick mist"
 msgstr "Tykk tåke"
 
-#: my-evolution/metar.c:267
+#: my-evolution/metar.c:268
 msgid "Shallow mist"
 msgstr "Lett tåke"
 
-#: my-evolution/metar.c:268
+#: my-evolution/metar.c:269
 msgid "Patches of mist"
 msgstr "Områder med tåke"
 
-#: my-evolution/metar.c:269
+#: my-evolution/metar.c:270
 msgid "Partial mist"
 msgstr "Delvis tåke"
 
-#: my-evolution/metar.c:271
+#: my-evolution/metar.c:272
 msgid "Mist with wind"
 msgstr "Tåke med vind"
 
-#: my-evolution/metar.c:273
+#: my-evolution/metar.c:274
 msgid "Drifting mist"
 msgstr "Drivende tåke"
 
-#: my-evolution/metar.c:274
+#: my-evolution/metar.c:275
 msgid "Freezing mist"
 msgstr "Tåke og frost"
 
 #. FOG
-#: my-evolution/metar.c:277
+#: my-evolution/metar.c:278
 msgid "Fog"
 msgstr "Dis"
 
-#: my-evolution/metar.c:278
+#: my-evolution/metar.c:279
 msgid "Fog in the vicinity"
 msgstr "Dis i området"
 
-#: my-evolution/metar.c:279
+#: my-evolution/metar.c:280
 msgid "Light fog"
 msgstr "Lett dis"
 
-#: my-evolution/metar.c:280
+#: my-evolution/metar.c:281
 msgid "Moderate fog"
 msgstr "Moderat dis"
 
-#: my-evolution/metar.c:281
+#: my-evolution/metar.c:282
 msgid "Thick fog"
 msgstr "Tykk dis"
 
-#: my-evolution/metar.c:282
+#: my-evolution/metar.c:283
 msgid "Shallow fog"
 msgstr "Grunn dis"
 
-#: my-evolution/metar.c:283
+#: my-evolution/metar.c:284
 msgid "Patches of fog"
 msgstr "Områder med dis"
 
-#: my-evolution/metar.c:284
+#: my-evolution/metar.c:285
 msgid "Partial fog"
 msgstr "Delvis dis"
 
-#: my-evolution/metar.c:286
+#: my-evolution/metar.c:287
 msgid "Fog with wind"
 msgstr "Dis med vind"
 
-#: my-evolution/metar.c:288
+#: my-evolution/metar.c:289
 msgid "Drifting fog"
 msgstr "Drivende dis"
 
-#: my-evolution/metar.c:289
+#: my-evolution/metar.c:290
 msgid "Freezing fog"
 msgstr "Frysende dis"
 
 #. SMOKE
-#: my-evolution/metar.c:292
+#: my-evolution/metar.c:293
 msgid "Smoke"
 msgstr "Røyk"
 
-#: my-evolution/metar.c:293
+#: my-evolution/metar.c:294
 msgid "Smoke in the vicinity"
 msgstr "Røyk i omegnen"
 
-#: my-evolution/metar.c:294
+#: my-evolution/metar.c:295
 msgid "Thin smoke"
 msgstr "Tynn røyk"
 
-#: my-evolution/metar.c:295
+#: my-evolution/metar.c:296
 msgid "Moderate smoke"
 msgstr "Moderat røyk"
 
-#: my-evolution/metar.c:296
+#: my-evolution/metar.c:297
 msgid "Thick smoke"
 msgstr "Tykk røyk"
 
-#: my-evolution/metar.c:297
+#: my-evolution/metar.c:298
 msgid "Shallow smoke"
 msgstr "Lett røyk"
 
-#: my-evolution/metar.c:298
+#: my-evolution/metar.c:299
 msgid "Patches of smoke"
 msgstr "Områder med røyk"
 
-#: my-evolution/metar.c:299
+#: my-evolution/metar.c:300
 msgid "Partial smoke"
 msgstr "Delvis røyk"
 
-#: my-evolution/metar.c:300
+#: my-evolution/metar.c:301
 msgid "Thunderous smoke"
 msgstr "Tordnende røyk"
 
-#: my-evolution/metar.c:301
+#: my-evolution/metar.c:302
 msgid "Smoke with wind"
 msgstr "Røyk med vind"
 
-#: my-evolution/metar.c:303
+#: my-evolution/metar.c:304
 msgid "Drifting smoke"
 msgstr "Drivende røyk"
 
 #. VOLCANIC_ASH
-#: my-evolution/metar.c:307
+#: my-evolution/metar.c:308
 msgid "Volcanic ash"
 msgstr "Vulkansk aske"
 
-#: my-evolution/metar.c:308
+#: my-evolution/metar.c:309
 msgid "Volcanic ash in the vicinity"
 msgstr "Vulkansk aske i omegnen"
 
-#: my-evolution/metar.c:310
+#: my-evolution/metar.c:311
 msgid "Moderate volcanic ash"
 msgstr "Moderat vulkansk aske"
 
-#: my-evolution/metar.c:311
+#: my-evolution/metar.c:312
 msgid "Thick volcanic ash"
 msgstr "Tykk vulkansk aske"
 
-#: my-evolution/metar.c:312
+#: my-evolution/metar.c:313
 msgid "Shallow volcanic ash"
 msgstr "Lett vulkansk aske"
 
-#: my-evolution/metar.c:313
+#: my-evolution/metar.c:314
 msgid "Patches of volcanic ash"
 msgstr "Områder med vulkansk aske"
 
-#: my-evolution/metar.c:314
+#: my-evolution/metar.c:315
 msgid "Partial volcanic ash"
 msgstr "Delvis vulkansk aske"
 
-#: my-evolution/metar.c:315
+#: my-evolution/metar.c:316
 msgid "Thunderous volcanic ash"
 msgstr "Tordnende vulkansk aske"
 
-#: my-evolution/metar.c:316
+#: my-evolution/metar.c:317
 msgid "Blowing volcanic ash"
 msgstr "Blåsende vulkansk aske"
 
-#: my-evolution/metar.c:317
+#: my-evolution/metar.c:318
 msgid "Showers of volcanic ash"
 msgstr "Byger med vulkansk aske"
 
-#: my-evolution/metar.c:318
+#: my-evolution/metar.c:319
 msgid "Drifting volcanic ash"
 msgstr "Drivende vulkansk aske"
 
-#: my-evolution/metar.c:319
+#: my-evolution/metar.c:320
 msgid "Freezing volcanic ash"
 msgstr "Frysende vulkansk aske"
 
 #. SAND
-#: my-evolution/metar.c:322
+#: my-evolution/metar.c:323
 msgid "Sand"
 msgstr "Sand"
 
-#: my-evolution/metar.c:323
+#: my-evolution/metar.c:324
 msgid "Sand in the vicinity"
 msgstr "Sand i omegnen"
 
-#: my-evolution/metar.c:324
+#: my-evolution/metar.c:325
 msgid "Light sand"
 msgstr "Lett sand"
 
-#: my-evolution/metar.c:325
+#: my-evolution/metar.c:326
 msgid "Moderate sand"
 msgstr "Moderat sand"
 
-#: my-evolution/metar.c:326
+#: my-evolution/metar.c:327
 msgid "Heavy sand"
 msgstr "Tung sand"
 
-#: my-evolution/metar.c:328
+#: my-evolution/metar.c:329
 msgid "Patches of sand"
 msgstr "Områder med sand"
 
-#: my-evolution/metar.c:329
+#: my-evolution/metar.c:330
 msgid "Partial sand"
 msgstr "Delvis sand"
 
-#: my-evolution/metar.c:331
+#: my-evolution/metar.c:332
 msgid "Blowing sand"
 msgstr "Blåsende sand"
 
-#: my-evolution/metar.c:333
+#: my-evolution/metar.c:334
 msgid "Drifting sand"
 msgstr "Drivende sand"
 
 #. HAZE
-#: my-evolution/metar.c:337
+#: my-evolution/metar.c:338
 msgid "Haze"
 msgstr "Dis"
 
-#: my-evolution/metar.c:338
+#: my-evolution/metar.c:339
 msgid "Haze in the vicinity"
 msgstr "Dis i området"
 
-#: my-evolution/metar.c:339
+#: my-evolution/metar.c:340
 msgid "Light haze"
 msgstr "Lett dis"
 
-#: my-evolution/metar.c:340
+#: my-evolution/metar.c:341
 msgid "Moderate haze"
 msgstr "Moderat dis"
 
-#: my-evolution/metar.c:341
+#: my-evolution/metar.c:342
 msgid "Thick haze"
 msgstr "Tykk dis"
 
-#: my-evolution/metar.c:342
+#: my-evolution/metar.c:343
 msgid "Shallow haze"
 msgstr "Tynn dis"
 
-#: my-evolution/metar.c:343
+#: my-evolution/metar.c:344
 msgid "Patches of haze"
 msgstr "Områder med dis"
 
-#: my-evolution/metar.c:344
+#: my-evolution/metar.c:345
 msgid "Partial haze"
 msgstr "Delvis dis"
 
-#: my-evolution/metar.c:346
+#: my-evolution/metar.c:347
 msgid "Haze with wind"
 msgstr "Dis med vind"
 
-#: my-evolution/metar.c:348
+#: my-evolution/metar.c:349
 msgid "Drifting haze"
 msgstr "Drivende dis"
 
-#: my-evolution/metar.c:349
+#: my-evolution/metar.c:350
 msgid "Freezing haze"
 msgstr "Frysende dis"
 
 #. SPRAY
-#: my-evolution/metar.c:352
+#: my-evolution/metar.c:353
 msgid "Spray"
 msgstr "Yr"
 
-#: my-evolution/metar.c:353
+#: my-evolution/metar.c:354
 msgid "Spray in the vicinity"
 msgstr "Yr i området"
 
-#: my-evolution/metar.c:354
+#: my-evolution/metar.c:355
 msgid "Light spray"
 msgstr "Lett yr"
 
-#: my-evolution/metar.c:355
+#: my-evolution/metar.c:356
 msgid "Moderate spray"
 msgstr "Moderat yr"
 
-#: my-evolution/metar.c:356
+#: my-evolution/metar.c:357
 msgid "Heavy spray"
 msgstr "Kraftig yr"
 
-#: my-evolution/metar.c:357
+#: my-evolution/metar.c:358
 msgid "Shallow spray"
 msgstr "Tynt yr"
 
-#: my-evolution/metar.c:358
+#: my-evolution/metar.c:359
 msgid "Patches of spray"
 msgstr "Områder med yr"
 
-#: my-evolution/metar.c:359
+#: my-evolution/metar.c:360
 msgid "Partial spray"
 msgstr "Delvis yr"
 
-#: my-evolution/metar.c:361
+#: my-evolution/metar.c:362
 msgid "Blowing spray"
 msgstr "Blåsende yr"
 
-#: my-evolution/metar.c:363
+#: my-evolution/metar.c:364
 msgid "Drifting spray"
 msgstr "Drivende yr"
 
-#: my-evolution/metar.c:364
+#: my-evolution/metar.c:365
 msgid "Freezing spray"
 msgstr "Frysende yr"
 
 #. DUST
-#: my-evolution/metar.c:367
+#: my-evolution/metar.c:368
 msgid "Dust"
 msgstr "Støv"
 
-#: my-evolution/metar.c:368
+#: my-evolution/metar.c:369
 msgid "Dust in the vicinity"
 msgstr "Støv i omegnen"
 
-#: my-evolution/metar.c:369
+#: my-evolution/metar.c:370
 msgid "Light dust"
 msgstr "Lett støv"
 
-#: my-evolution/metar.c:370
+#: my-evolution/metar.c:371
 msgid "Moderate dust"
 msgstr "Moderat støv"
 
-#: my-evolution/metar.c:371
+#: my-evolution/metar.c:372
 msgid "Heavy dust"
 msgstr "Tungt støv"
 
-#: my-evolution/metar.c:373
+#: my-evolution/metar.c:374
 msgid "Patches of dust"
 msgstr "Områder med støv"
 
-#: my-evolution/metar.c:374
+#: my-evolution/metar.c:375
 msgid "Partial dust"
 msgstr "Delvis støv"
 
-#: my-evolution/metar.c:376
+#: my-evolution/metar.c:377
 msgid "Blowing dust"
 msgstr "Blåsende støv"
 
-#: my-evolution/metar.c:378
+#: my-evolution/metar.c:379
 msgid "Drifting dust"
 msgstr "Drivende støv"
 
 #. SQUALL
-#: my-evolution/metar.c:382
+#: my-evolution/metar.c:383
 msgid "Squall"
 msgstr "Bygekast"
 
-#: my-evolution/metar.c:383
+#: my-evolution/metar.c:384
 msgid "Squall in the vicinity"
 msgstr "Bygekast i området"
 
-#: my-evolution/metar.c:384
+#: my-evolution/metar.c:385
 msgid "Light squall"
 msgstr "Lette bygekast"
 
-#: my-evolution/metar.c:385
+#: my-evolution/metar.c:386
 msgid "Moderate squall"
 msgstr "Moderate bygekast"
 
-#: my-evolution/metar.c:386
+#: my-evolution/metar.c:387
 msgid "Heavy squall"
 msgstr "Kraftige bygekast"
 
-#: my-evolution/metar.c:389
+#: my-evolution/metar.c:390
 msgid "Partial squall"
 msgstr "Delvise bygekast"
 
-#: my-evolution/metar.c:390
+#: my-evolution/metar.c:391
 msgid "Thunderous squall"
 msgstr "Tordnende bygekast"
 
-#: my-evolution/metar.c:391
+#: my-evolution/metar.c:392
 msgid "Blowing squall"
 msgstr "Blåsende bygekast"
 
-#: my-evolution/metar.c:393
+#: my-evolution/metar.c:394
 msgid "Drifting squall"
 msgstr "Drivende bygekast"
 
-#: my-evolution/metar.c:394
+#: my-evolution/metar.c:395
 msgid "Freezing squall"
 msgstr "Frysende bygekast"
 
 #. SANDSTORM
-#: my-evolution/metar.c:397
+#: my-evolution/metar.c:398
 msgid "Sandstorm"
 msgstr "Sandstorm"
 
-#: my-evolution/metar.c:398
+#: my-evolution/metar.c:399
 msgid "Sandstorm in the vicinity"
 msgstr "Sandstorm i omegnen"
 
-#: my-evolution/metar.c:399
+#: my-evolution/metar.c:400
 msgid "Light standstorm"
 msgstr "Lett sandstorm"
 
-#: my-evolution/metar.c:400
+#: my-evolution/metar.c:401
 msgid "Moderate sandstorm"
 msgstr "Moderat sandstorm"
 
-#: my-evolution/metar.c:401
+#: my-evolution/metar.c:402
 msgid "Heavy sandstorm"
 msgstr "Tung sandstorm"
 
-#: my-evolution/metar.c:402
+#: my-evolution/metar.c:403
 msgid "Shallow sandstorm"
 msgstr "Tynn sandstorm"
 
-#: my-evolution/metar.c:404
+#: my-evolution/metar.c:405
 msgid "Partial sandstorm"
 msgstr "Delvis sandstorm"
 
-#: my-evolution/metar.c:405
+#: my-evolution/metar.c:406
 msgid "Thunderous sandstorm"
 msgstr "Sandstorm med torden"
 
-#: my-evolution/metar.c:406
+#: my-evolution/metar.c:407
 msgid "Blowing sandstorm"
 msgstr "Blåsende sandstorm"
 
-#: my-evolution/metar.c:408
+#: my-evolution/metar.c:409
 msgid "Drifting sandstorm"
 msgstr "Drivende sandstorm"
 
-#: my-evolution/metar.c:409
+#: my-evolution/metar.c:410
 msgid "Freezing sandstorm"
 msgstr "Sandstorm med frost"
 
 #. DUSTSTORM
-#: my-evolution/metar.c:412
+#: my-evolution/metar.c:413
 msgid "Duststorm"
 msgstr "Støvstorm"
 
-#: my-evolution/metar.c:413
+#: my-evolution/metar.c:414
 msgid "Duststorm in the vicinity"
 msgstr "Støvstorm i omegnen"
 
-#: my-evolution/metar.c:414
+#: my-evolution/metar.c:415
 msgid "Light duststorm"
 msgstr "Lett støvstorm"
 
-#: my-evolution/metar.c:415
+#: my-evolution/metar.c:416
 msgid "Moderate duststorm"
 msgstr "Moderat støvstorm"
 
-#: my-evolution/metar.c:416
+#: my-evolution/metar.c:417
 msgid "Heavy duststorm"
 msgstr "Tung støvstorm"
 
-#: my-evolution/metar.c:417
+#: my-evolution/metar.c:418
 msgid "Shallow duststorm"
 msgstr "Tynn støvstorm"
 
-#: my-evolution/metar.c:419
+#: my-evolution/metar.c:420
 msgid "Partial duststorm"
 msgstr "Delvis støvstorm"
 
-#: my-evolution/metar.c:420
+#: my-evolution/metar.c:421
 msgid "Thunderous duststorm"
 msgstr "Støvstorm med torden"
 
-#: my-evolution/metar.c:421
+#: my-evolution/metar.c:422
 msgid "Blowing duststorm"
 msgstr "Blåsende støvstorm"
 
-#: my-evolution/metar.c:423
+#: my-evolution/metar.c:424
 msgid "Drifting duststorm"
 msgstr "Drivende støvstorm"
 
-#: my-evolution/metar.c:424
+#: my-evolution/metar.c:425
 msgid "Freezing duststorm"
 msgstr "Støvstorm med frost"
 
 #. FUNNEL_CLOUD
-#: my-evolution/metar.c:427
+#: my-evolution/metar.c:428
 msgid "Funnel cloud"
 msgstr "Røyksky"
 
-#: my-evolution/metar.c:428
+#: my-evolution/metar.c:429
 msgid "Funnel cloud in the vicinity"
 msgstr "Røyksky i området"
 
-#: my-evolution/metar.c:429
+#: my-evolution/metar.c:430
 msgid "Light funnel cloud"
 msgstr "Lett røyksky"
 
-#: my-evolution/metar.c:430
+#: my-evolution/metar.c:431
 msgid "Moderate funnel cloud"
 msgstr "Moderat røyksky"
 
-#: my-evolution/metar.c:431
+#: my-evolution/metar.c:432
 msgid "Thick funnel cloud"
 msgstr "Tykk røyksky"
 
-#: my-evolution/metar.c:432
+#: my-evolution/metar.c:433
 msgid "Shallow funnel cloud"
 msgstr "Tynn røyksky"
 
-#: my-evolution/metar.c:433
+#: my-evolution/metar.c:434
 msgid "Patches of funnel clouds"
 msgstr "Områder med røykskyer"
 
-#: my-evolution/metar.c:434
+#: my-evolution/metar.c:435
 msgid "Partial funnel clouds"
 msgstr "Delvise røykskyer"
 
-#: my-evolution/metar.c:436
+#: my-evolution/metar.c:437
 msgid "Funnel cloud w/ wind"
 msgstr "Røyksky med vind"
 
-#: my-evolution/metar.c:438
+#: my-evolution/metar.c:439
 msgid "Drifting funnel cloud"
 msgstr "Drivende røyksky"
 
 #. TORNADO
-#: my-evolution/metar.c:442 my-evolution/metar.c:451
+#: my-evolution/metar.c:443 my-evolution/metar.c:452
 msgid "Tornado"
 msgstr "Tornado"
 
-#: my-evolution/metar.c:443
+#: my-evolution/metar.c:444
 msgid "Tornado in the vicinity"
 msgstr "Tornado i omegnen"
 
-#: my-evolution/metar.c:445
+#: my-evolution/metar.c:446
 msgid "Moderate tornado"
 msgstr "Moderat tornado"
 
-#: my-evolution/metar.c:446
+#: my-evolution/metar.c:447
 msgid "Raging tornado"
 msgstr "Rasende tornado"
 
-#: my-evolution/metar.c:449
+#: my-evolution/metar.c:450
 msgid "Partial tornado"
 msgstr "Delvis tornado"
 
-#: my-evolution/metar.c:450
+#: my-evolution/metar.c:451
 msgid "Thunderous tornado"
 msgstr "Tornado med torden"
 
-#: my-evolution/metar.c:453
+#: my-evolution/metar.c:454
 msgid "Drifting tornado"
 msgstr "Drivende tornado"
 
-#: my-evolution/metar.c:454
+#: my-evolution/metar.c:455
 msgid "Freezing tornado"
 msgstr "Tornado med frost"
 
 #. DUST_WHIRLS
-#: my-evolution/metar.c:457
+#: my-evolution/metar.c:458
 msgid "Dust whirls"
 msgstr "Støvvirvler"
 
-#: my-evolution/metar.c:458
+#: my-evolution/metar.c:459
 msgid "Dust whirls in the vicinity"
 msgstr "Støvvirvler i omegnen"
 
-#: my-evolution/metar.c:459
+#: my-evolution/metar.c:460
 msgid "Light dust whirls"
 msgstr "Lette støvvirvler"
 
-#: my-evolution/metar.c:460
+#: my-evolution/metar.c:461
 msgid "Moderate dust whirls"
 msgstr "Moderate støvvirvler"
 
-#: my-evolution/metar.c:461
+#: my-evolution/metar.c:462
 msgid "Heavy dust whirls"
 msgstr "Tunge støvvirvler"
 
-#: my-evolution/metar.c:462
+#: my-evolution/metar.c:463
 msgid "Shallow dust whirls"
 msgstr "Tynne støvvirvler"
 
-#: my-evolution/metar.c:463
+#: my-evolution/metar.c:464
 msgid "Patches of dust whirls"
 msgstr "Områder med støvvirvler"
 
-#: my-evolution/metar.c:464
+#: my-evolution/metar.c:465
 msgid "Partial dust whirls"
 msgstr "Delvise støvvirvler"
 
-#: my-evolution/metar.c:466
+#: my-evolution/metar.c:467
 msgid "Blowing dust whirls"
 msgstr "Blåsende støvvirvler"
 
-#: my-evolution/metar.c:468
+#: my-evolution/metar.c:469
 msgid "Drifting dust whirls"
 msgstr "Drivende støvvirvler"
 
@@ -24727,31 +25057,31 @@ msgstr "_Sett av tid"
 msgid "_Weather"
 msgstr "_Vær"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Configuration control for Evolution folder settings."
 msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution."
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:2
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Configure special folders and offline folder behavior here"
 msgstr "Konfigurer spesielle mapper og oppførsel når du arbeider frakoblet her"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:3
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 msgid "Folder Settings"
 msgstr "Mappeinnstillinger"
 
-#: shell/GNOME_Evolution_Shell.oaf.in.h:4
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 msgid "The Evolution shell."
 msgstr "Evolution skallet."
 
-#: shell/e-activity-handler.c:162
+#: shell/e-activity-handler.c:164
 msgid "Show Details"
 msgstr "Vis detaljer"
 
-#: shell/e-activity-handler.c:164
+#: shell/e-activity-handler.c:166
 msgid "Cancel Operation"
 msgstr "Avlys operasjon"
 
-#: shell/e-folder-dnd-bridge.c:53
+#: shell/e-folder-dnd-bridge.c:55
 #, c-format
 msgid ""
 "Cannot transfer folder:\n"
@@ -24760,54 +25090,37 @@ msgstr ""
 "Kan ikke overføre mappe:\n"
 "%s"
 
-#: shell/e-folder-list.c:113 shell/evolution-folder-selector-button.c:121
+#: shell/e-folder-list.c:122 shell/evolution-folder-selector-button.c:127
 #, c-format
 msgid "\"%s\" in \"%s\""
 msgstr "«%s» i «%s»"
 
-#: shell/e-folder-list.c:312
+#: shell/e-folder-list.c:338
 msgid "Add a Folder"
 msgstr "Legg til en mappe"
 
-#: shell/e-local-storage.c:178
+#: shell/e-local-storage.c:179
 msgid "Drafts"
 msgstr "Skisser"
 
-#: shell/e-local-storage.c:179 shell/e-shell-view.c:400
-#: shell/e-shortcuts.c:1055
+#: shell/e-local-storage.c:180 shell/e-shell-view.c:495
+#: shell/e-shell-view.c:499 shell/e-shortcuts.c:1084
 msgid "Inbox"
 msgstr "Innboks"
 
-#: shell/e-local-storage.c:180
+#: shell/e-local-storage.c:181
 msgid "Outbox"
 msgstr "Utboks"
 
-#: shell/e-local-storage.c:181
+#: shell/e-local-storage.c:182
 msgid "Sent"
 msgstr "Sendt"
 
-#: shell/e-setup.c:126
-msgid "Evolution installation"
-msgstr "Evolution installasjon"
-
-#: shell/e-setup.c:130
-msgid ""
-"This new version of Evolution needs to install additional files\n"
-"into your personal Evolution directory"
-msgstr ""
-"Denne nye versjonen av Evolution må installere tilleggsfiler i\n"
-"din personlige Evolution-katalog"
-
-#: shell/e-setup.c:131
-msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr ""
-"Vennligst klikk «OK» for å installere filene, eller «Avbryt» for å avslutte."
-
-#: shell/e-setup.c:171
+#: shell/e-setup.c:147
 msgid "Could not update files correctly"
 msgstr "Kunne ikke oppdatere filene."
 
-#: shell/e-setup.c:194
+#: shell/e-setup.c:168
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -24818,7 +25131,7 @@ msgstr ""
 "%s\n"
 "Feil: %s"
 
-#: shell/e-setup.c:209
+#: shell/e-setup.c:179
 #, c-format
 msgid ""
 "An error occurred in copying files into\n"
@@ -24827,7 +25140,7 @@ msgstr ""
 "En feil oppsto under kopiering av filer til\n"
 "«%s»."
 
-#: shell/e-setup.c:282
+#: shell/e-setup.c:244
 #, c-format
 msgid ""
 "Evolution could not create directory\n"
@@ -24838,7 +25151,7 @@ msgstr ""
 "%s:\n"
 "%s"
 
-#: shell/e-setup.c:300
+#: shell/e-setup.c:262
 #, c-format
 msgid ""
 "Directory %s\n"
@@ -24849,7 +25162,7 @@ msgstr ""
 "har ikke korrekte rettigheter. Vennligst gjør den\n"
 "lesbar og kjørbar og start Evolution på nytt."
 
-#: shell/e-setup.c:306
+#: shell/e-setup.c:268
 #, c-format
 msgid ""
 "File %s\n"
@@ -24860,7 +25173,7 @@ msgstr ""
 "må fjernes for at Evolution skal fungere riktig.\n"
 "Vennligst fjern denne filen og start Evolution på nytt."
 
-#: shell/e-setup.c:329
+#: shell/e-setup.c:291
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -24871,21 +25184,7 @@ msgstr ""
 "Vennligst flytt denne for å tillate installasjon\n"
 "av Evolution's brukerfiler."
 
-#: shell/e-setup.c:343
-msgid ""
-"Evolution has detected an old\n"
-"Executive-Summary directory.\n"
-"This needs to be removed before\n"
-"Evolution will run.\n"
-"Do you want me to remove this directory?"
-msgstr ""
-"Evolution har funnet en gammel\n"
-"Executive-Summary katalog.\n"
-"Denne må fjernes før Evolution\n"
-"kan kjøre.\n"
-"Vil du fjerne denne katalogen?"
-
-#: shell/e-setup.c:368
+#: shell/e-setup.c:300
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -24900,27 +25199,27 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Etter mange timers slit av"
 
-#: shell/e-shell-config-autocompletion.c:106
+#: shell/e-shell-config-autocompletion.c:110
 msgid "Extra Completion folders"
 msgstr "Ekstra fullføringsmappe"
 
-#: shell/e-shell-config-default-folders.c:133
+#: shell/e-shell-config-default-folders.c:149
 msgid "Select Default Folder"
 msgstr "Velg forvalgt mappe"
 
-#: shell/e-shell-config-folder-settings.c:71
+#: shell/e-shell-config-folder-settings.c:70
 msgid "Default Folders"
 msgstr "Forvalgte mapper"
 
-#: shell/e-shell-config-folder-settings.c:74
+#: shell/e-shell-config-folder-settings.c:73
 msgid "Offline Folders"
 msgstr "Frakoblede mapper"
 
-#: shell/e-shell-config-folder-settings.c:77
+#: shell/e-shell-config-folder-settings.c:76
 msgid "Autocompletion Folders"
 msgstr "Autofullføringsmapper"
 
-#: shell/e-shell-folder-commands.c:140
+#: shell/e-shell-folder-commands.c:141
 #, c-format
 msgid "Cannot copy folder: %s"
 msgstr "Kan ikke kopiere mappe: %s"
@@ -24930,37 +25229,37 @@ msgstr "Kan ikke kopiere mappe: %s"
 msgid "Cannot move folder: %s"
 msgstr "Kunne ikke flytte mappe: %s"
 
-#: shell/e-shell-folder-commands.c:190
+#: shell/e-shell-folder-commands.c:189
 msgid "Cannot move a folder over itself."
 msgstr "Kan ikke flytte en mappe over seg selv."
 
-#: shell/e-shell-folder-commands.c:192
+#: shell/e-shell-folder-commands.c:191
 msgid "Cannot copy a folder over itself."
 msgstr "Kan ikke kopiere en mappe oppå seg selv."
 
-#: shell/e-shell-folder-commands.c:206
+#: shell/e-shell-folder-commands.c:205
 msgid "Cannot move a folder into one of its descendants."
 msgstr "Kan ikke flytte en mappe til en av sine egne undermapper."
 
-#: shell/e-shell-folder-commands.c:321
+#: shell/e-shell-folder-commands.c:320
 #, c-format
 msgid "Specify a folder to copy folder \"%s\" into:"
 msgstr "Spesifiser en mappe som mappen «%s» skal kopieres til:"
 
-#: shell/e-shell-folder-commands.c:325
+#: shell/e-shell-folder-commands.c:324
 msgid "Copy folder"
 msgstr "Kopier mappe"
 
-#: shell/e-shell-folder-commands.c:365
+#: shell/e-shell-folder-commands.c:364
 #, c-format
 msgid "Specify a folder to move folder \"%s\" into:"
 msgstr "Spesifiser en mappe å flytte mappen «%s» til:"
 
-#: shell/e-shell-folder-commands.c:369
+#: shell/e-shell-folder-commands.c:368
 msgid "Move folder"
 msgstr "Flytt mappe"
 
-#: shell/e-shell-folder-commands.c:393
+#: shell/e-shell-folder-commands.c:392
 #, c-format
 msgid ""
 "Cannot delete folder:\n"
@@ -24971,15 +25270,15 @@ msgstr ""
 
 #: shell/e-shell-folder-commands.c:406
 #, c-format
-msgid "Delete \"%s\""
-msgstr "Slett «%s»"
-
-#: shell/e-shell-folder-commands.c:407
-#, c-format
 msgid "Really delete folder \"%s\"?"
 msgstr "Vild du virkelig slette mappe «%s»?"
 
-#: shell/e-shell-folder-commands.c:488
+#: shell/e-shell-folder-commands.c:413
+#, c-format
+msgid "Delete \"%s\""
+msgstr "Slett «%s»"
+
+#: shell/e-shell-folder-commands.c:486
 #, c-format
 msgid ""
 "Cannot rename folder:\n"
@@ -24993,21 +25292,21 @@ msgstr ""
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: shell/e-shell-folder-commands.c:542
+#: shell/e-shell-folder-commands.c:541
 msgid "Rename folder"
 msgstr "Endre navn på mappe"
 
-#: shell/e-shell-folder-commands.c:552
-#: shell/e-shell-folder-creation-dialog.c:165
+#: shell/e-shell-folder-commands.c:550
+#: shell/e-shell-folder-creation-dialog.c:169
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Spesifisert mappenavn er ikke gyldig: %s"
 
-#: shell/e-shell-folder-commands.c:586
+#: shell/e-shell-folder-commands.c:584
 msgid "Selected folder does not belong to another user"
 msgstr "Valgt mappe tilhører ikke en annen bruker"
 
-#: shell/e-shell-folder-commands.c:589
+#: shell/e-shell-folder-commands.c:587
 #, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25016,7 +25315,7 @@ msgstr ""
 "Kan ikke fjerne mappe:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:122
+#: shell/e-shell-folder-creation-dialog.c:126
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -25025,23 +25324,19 @@ msgstr ""
 "Kan ikke opprette spesifisert katalog:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:288
+#: shell/e-shell-folder-creation-dialog.c:307
 msgid "Create New Folder"
 msgstr "Opprett ny mappe"
 
-#: shell/e-shell-folder-selection-dialog.c:393
-msgid "New..."
-msgstr "Ny..."
-
-#: shell/e-shell-folder-title-bar.c:635 shell/e-shell-folder-title-bar.c:636
+#: shell/e-shell-folder-title-bar.c:593 shell/e-shell-folder-title-bar.c:594
 msgid "(Untitled)"
 msgstr "(Uten navn)"
 
-#: shell/e-shell-importer.c:142
+#: shell/e-shell-importer.c:141
 msgid "Choose the type of importer to run:"
 msgstr "Velg type importerer som skal kjøres:"
 
-#: shell/e-shell-importer.c:145
+#: shell/e-shell-importer.c:144
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -25055,11 +25350,11 @@ 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:151 shell/e-shell-startup-wizard.c:809
+#: shell/e-shell-importer.c:150 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Vennligst velg informasjon du ønsker å importere:"
 
-#: shell/e-shell-importer.c:252 shell/e-shell-importer.c:283
+#: shell/e-shell-importer.c:247 shell/e-shell-importer.c:278
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25068,21 +25363,21 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring %d."
 
-#: shell/e-shell-importer.c:355
+#: shell/e-shell-importer.c:352
 msgid "Select importer"
 msgstr "Velg importerer"
 
-#: shell/e-shell-importer.c:487
+#: shell/e-shell-importer.c:492
 #, c-format
 msgid "File %s does not exist"
 msgstr "Filen %s eksisterer ikke"
 
-#: shell/e-shell-importer.c:488 shell/e-shell-importer.c:505
-#: shell/e-shell-importer.c:555
+#: shell/e-shell-importer.c:493 shell/e-shell-importer.c:510
+#: shell/e-shell-importer.c:557
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: shell/e-shell-importer.c:504
+#: shell/e-shell-importer.c:509
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25091,11 +25386,11 @@ msgstr ""
 "Ingen importerer som kan håndtere\n"
 "%s"
 
-#: shell/e-shell-importer.c:514
+#: shell/e-shell-importer.c:518
 msgid "Importing"
 msgstr "Importerer"
 
-#: shell/e-shell-importer.c:522
+#: shell/e-shell-importer.c:525
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25104,17 +25399,17 @@ msgstr ""
 "Importerer %s.\n"
 "Starter %s"
 
-#: shell/e-shell-importer.c:535
+#: shell/e-shell-importer.c:537
 #, c-format
 msgid "Error starting %s"
 msgstr "Feil under start av %s"
 
-#: shell/e-shell-importer.c:554
+#: shell/e-shell-importer.c:556
 #, c-format
 msgid "Error loading %s"
 msgstr "Feil under lasting av %s"
 
-#: shell/e-shell-importer.c:571
+#: shell/e-shell-importer.c:573
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25123,7 +25418,7 @@ msgstr ""
 "Importerer %s\n"
 "Importerer oppføring 1."
 
-#: shell/e-shell-importer.c:625
+#: shell/e-shell-importer.c:627
 msgid "Automatic"
 msgstr "Automatisk"
 
@@ -25135,19 +25430,19 @@ msgstr "Filnavn:"
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: shell/e-shell-importer.c:691
+#: shell/e-shell-importer.c:690
 msgid "File type:"
 msgstr "Filtype:"
 
-#: shell/e-shell-importer.c:716
+#: shell/e-shell-importer.c:715
 msgid "Import data and settings from older programs"
 msgstr "Importer data og innstillinger fra andre programmer"
 
-#: shell/e-shell-importer.c:720
+#: shell/e-shell-importer.c:719
 msgid "Import a single file"
 msgstr "Importer en enkelt fil"
 
-#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:638
+#: shell/e-shell-importer.c:785 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25155,32 +25450,32 @@ msgstr ""
 "Vennligst vent...\n"
 "Søker etter eksisterende oppsett"
 
-#: shell/e-shell-importer.c:788 shell/e-shell-startup-wizard.c:641
+#: shell/e-shell-importer.c:788
 msgid "Starting Intelligent Importers"
 msgstr "Starter intelligent import"
 
-#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:764
+#: shell/e-shell-importer.c:912 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "Fra %s:"
 
-#: shell/e-shell-importer.c:1080
+#: shell/e-shell-importer.c:1082
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: shell/e-shell-importer.c:1081
+#: shell/e-shell-importer.c:1083
 msgid "Select a destination folder for importing this data"
 msgstr "Velg en målmappe for å importere data"
 
-#: shell/e-shell-importer.c:1193 shell/importer/intelligent.c:193
+#: shell/e-shell-importer.c:1213 shell/importer/intelligent.c:191
 msgid "Import"
 msgstr "Importer"
 
-#: shell/e-shell-offline-handler.c:582
+#: shell/e-shell-offline-handler.c:588
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-offline-sync.c:161
+#: shell/e-shell-offline-sync.c:163
 #, c-format
 msgid ""
 "Error synchronizing \"%s\":\n"
@@ -25189,160 +25484,158 @@ msgstr ""
 "Feil under synkronisering av «%s»:\n"
 "%s"
 
-#: shell/e-shell-offline-sync.c:239
+#: shell/e-shell-offline-sync.c:232
 msgid "Syncing Folder"
 msgstr "Synkroniserer mappe"
 
 #. Prepare the dialog.
-#: shell/e-shell-offline-sync.c:317
+#: shell/e-shell-offline-sync.c:311
 #, c-format
 msgid "Synchronizing \"%s\" (%d of %d) ..."
 msgstr "Synkroniserer «%s» (%d av %d) ..."
 
-#: shell/e-shell-settings-dialog.c:326
+#: shell/e-shell-settings-dialog.c:346
 msgid "Evolution Settings"
 msgstr "Innstillinger for Evolution"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:357
+#. It would be nice to insensitivize the OK button appropriately
+#. instead of doing this, but unfortunately we can't do this for the
+#. Bonobo control.
+#: shell/e-shell-shared-folder-picker-dialog.c:281
+msgid "Please select a user."
+msgstr "Vennligst velg en bruker."
+
+#: shell/e-shell-shared-folder-picker-dialog.c:374
 msgid "Opening Folder"
 msgstr "Åpner mappe"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:364
+#: shell/e-shell-shared-folder-picker-dialog.c:380
 #, c-format
 msgid "Opening Folder \"%s\""
 msgstr "Åpner mappe «%s»"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:369
+#: shell/e-shell-shared-folder-picker-dialog.c:385
 #, c-format
 msgid "in \"%s\" ..."
 msgstr "i «%s» ..."
 
-#: shell/e-shell-shared-folder-picker-dialog.c:455
+#: shell/e-shell-shared-folder-picker-dialog.c:465
 #, c-format
 msgid "Could not open shared folder: %s."
 msgstr "Kunne ikke åpne delt mappe: %s"
 
-#: shell/e-shell-shared-folder-picker-dialog.c:513
+#: shell/e-shell-shared-folder-picker-dialog.c:518
 msgid "Cannot find the specified shared folder."
 msgstr "Kan ikke finne spesifisert delt mappe."
 
-#: shell/e-shell-startup-wizard.c:159
-#, c-format
-msgid ""
-"Could not start the Evolution Mailer Assistant interface\n"
-"(%s)"
-msgstr ""
-"Kunne ikke starte assistent-grensesnittet for Evolution\n"
-"(%s)"
-
-#: shell/e-shell-startup-wizard.c:169
-msgid "Could not start the Evolution Mailer Assistant interface\n"
-msgstr "Kunne ikke starte assistent-grensesnittet for Evolution\n"
-
-#: shell/e-shell-user-creatable-items-handler.c:579
-#: shell/e-shell-user-creatable-items-handler.c:633
-#: widgets/misc/e-charset-picker.c:104
+#: shell/e-shell-user-creatable-items-handler.c:582
+#: shell/e-shell-user-creatable-items-handler.c:636
+#: widgets/misc/e-charset-picker.c:106
 msgid "New"
 msgstr "Ny"
 
-#: shell/e-shell-utils.c:114
+#: shell/e-shell-utils.c:116
 msgid "No folder name specified."
 msgstr "Ingen mappenavn spesifisert."
 
-#: shell/e-shell-utils.c:121
+#: 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:127
-msgid "Folder name cannot contain slashes."
-msgstr "Mappenavn kan ikke inneholde skråstreker."
+#: 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
+msgid "Folder name cannot contain the character \"#\"."
+msgstr "Mappenavn kan ikke inneholde tegnet «#»."
 
-#: shell/e-shell-utils.c:133
+#: shell/e-shell-utils.c:141
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er reserverte mappenavn."
 
-#: shell/e-shell-view-menu.c:94
+#: shell/e-shell-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "GNOME pilot verktøyene ser ikke ut til å være installert på dette systemet."
 
-#: shell/e-shell-view-menu.c:102
+#: shell/e-shell-view-menu.c:97
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-view-menu.c:196
-msgid "Bug buddy was not found in your $PATH."
-msgstr "Bug buddy ble ikke funnet i din $PATH."
+#: shell/e-shell-view-menu.c:193
+msgid "Bug buddy is not installed."
+msgstr "Bug buddy er ikke installert."
 
-#: shell/e-shell-view-menu.c:204
+#: shell/e-shell-view-menu.c:201
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-view-menu.c:248
+#: shell/e-shell-view-menu.c:247
 msgid "About Ximian Evolution"
 msgstr "Om Ximian Evolution"
 
-#: shell/e-shell-view-menu.c:503
+#: shell/e-shell-view-menu.c:502
 msgid "Go to folder..."
 msgstr "Gå til mappe..."
 
-#: shell/e-shell-view-menu.c:504
+#: shell/e-shell-view-menu.c:503
 msgid "Select the folder that you want to open"
 msgstr "Velg mappen du ønsker å åpne"
 
-#: shell/e-shell-view-menu.c:625
+#: shell/e-shell-view-menu.c:617
 msgid "Create New Shortcut"
 msgstr "Opprett en ny snarvei"
 
-#: shell/e-shell-view-menu.c:626
+#: shell/e-shell-view-menu.c:618
 msgid "Select the folder you want the shortcut to point to:"
 msgstr "Velg mappen du ønsker snarveien skal peke til:"
 
-#: shell/e-shell-view-menu.c:788
+#: shell/e-shell-view-menu.c:778
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-view-menu.c:801 ui/evolution.xml.h:67
+#: shell/e-shell-view-menu.c:791 ui/evolution.xml.h:67
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-view-menu.c:814 ui/evolution.xml.h:42
+#: shell/e-shell-view-menu.c:804 ui/evolution.xml.h:42
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
-#: shell/e-shell-view.c:226
+#: shell/e-shell-view.c:262
 msgid "(No folder displayed)"
 msgstr "(Ingen mappe vist)"
 
-#: shell/e-shell-view.c:1861
+#: shell/e-shell-view.c:2054
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#: shell/e-shell-view.c:1863
+#: shell/e-shell-view.c:2056
 msgid "(None)"
 msgstr "(Ingen)"
 
-#: shell/e-shell-view.c:1910
+#: shell/e-shell-view.c:2100
 msgid ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution er koblet til. Klikk på denne knappen for å arbeide "
 "frakoblet."
 
-#: shell/e-shell-view.c:1917
+#: shell/e-shell-view.c:2107
 msgid "Ximian Evolution is in the process of going offline."
 msgstr "Ximian Evolution er i ferd med å koble fra."
 
-#: shell/e-shell-view.c:1923
+#: shell/e-shell-view.c:2113
 msgid ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution er frakoblet. Klikk på denne knappen for å arbeide "
 "tilkoblet."
 
-#: shell/e-shell.c:175
+#: shell/e-shell.c:176
 #, c-format
 msgid ""
 "Cannot activate component %s :\n"
@@ -25353,12 +25646,12 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/e-shell.c:739
+#: shell/e-shell.c:758
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan ikke sette opp lokal lagring -- %s"
 
-#: shell/e-shell.c:1877
+#: shell/e-shell.c:1831
 #, c-format
 msgid ""
 "The Evolution component that handles folders of type \"%s\"\n"
@@ -25369,148 +25662,140 @@ msgstr ""
 "har avsluttet uventet. Du vil måtte avslutte Evolution og starte på\n"
 "nytt for å få tilgang til disse dataene igjen."
 
-#: shell/e-shell.c:2178
+#: shell/e-shell.c:2096
 msgid "Invalid arguments"
 msgstr "Ugyldige argumenter"
 
-#: shell/e-shell.c:2180
+#: shell/e-shell.c:2098
 msgid "Cannot register on OAF"
 msgstr "Kan ikke registrere i OAF"
 
-#: shell/e-shell.c:2182
+#: shell/e-shell.c:2100
 msgid "Configuration Database not found"
 msgstr "Konfigurasjonsdatabase ikke funnet"
 
-#: shell/e-shell.c:2184 shell/e-storage.c:571
+#: shell/e-shell.c:2102 shell/e-storage.c:572
 msgid "Generic error"
 msgstr "Vanlig feil"
 
-#: shell/e-shortcuts-view.c:76
+#: shell/e-shortcuts-view.c:80
 msgid "Create new shortcut group"
 msgstr "Opprett ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:77
+#: shell/e-shortcuts-view.c:81
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: shell/e-shortcuts-view.c:173
+#: shell/e-shortcuts-view.c:179
 #, c-format
-msgid ""
-"Do you really want to remove group\n"
-"`%s' from the shortcut bar?"
-msgstr ""
-"Vil du virkelig fjerne gruppen\n"
-"«%s» fra snarveilinjen?"
-
-#: shell/e-shortcuts-view.c:178
-msgid "Don't remove"
-msgstr "Ikke fjern"
+msgid "Do you really want to remove group \"%s\" from the shortcut bar?"
+msgstr "Vil du virkelig fjerne gruppen «%s» fra snarveilinjen?"
 
-#: shell/e-shortcuts-view.c:208
+#: shell/e-shortcuts-view.c:215
 msgid "Rename Shortcut Group"
 msgstr "Endre navn på snarveigruppen"
 
-#: shell/e-shortcuts-view.c:209
+#: shell/e-shortcuts-view.c:216
 msgid "Rename selected shortcut group to:"
 msgstr "Endre valgt snarveigruppe til:"
 
-#: shell/e-shortcuts-view.c:241
+#: shell/e-shortcuts-view.c:248
 msgid "_Small Icons"
 msgstr "_Små ikoner"
 
-#: shell/e-shortcuts-view.c:242
+#: shell/e-shortcuts-view.c:249
 msgid "Show the shortcuts as small icons"
 msgstr "Vis snarveier som små ikoner"
 
-#: shell/e-shortcuts-view.c:244
+#: shell/e-shortcuts-view.c:251
 msgid "_Large Icons"
 msgstr "Store i_koner"
 
-#: shell/e-shortcuts-view.c:245
+#: shell/e-shortcuts-view.c:252
 msgid "Show the shortcuts as large icons"
 msgstr "Vis snarveier som store ikoner"
 
-#: shell/e-shortcuts-view.c:256
+#: shell/e-shortcuts-view.c:263
 msgid "_New Group..."
 msgstr "_Ny gruppe..."
 
-#: shell/e-shortcuts-view.c:257
+#: shell/e-shortcuts-view.c:264
 msgid "Create a new shortcut group"
 msgstr "Opprett en ny snarveigruppe"
 
-#: shell/e-shortcuts-view.c:259
+#: shell/e-shortcuts-view.c:266
 msgid "_Remove this Group..."
 msgstr "Fje_rn denne gruppen..."
 
-#: shell/e-shortcuts-view.c:260
+#: shell/e-shortcuts-view.c:267
 msgid "Remove this shortcut group"
 msgstr "Fjern denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:262
+#: shell/e-shortcuts-view.c:269
 msgid "Re_name this Group..."
 msgstr "E_ndre navn på denne gruppen..."
 
-#: shell/e-shortcuts-view.c:263
+#: shell/e-shortcuts-view.c:270
 msgid "Rename this shortcut group"
 msgstr "Endre navn på denne snarveigruppen"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:275
 msgid "_Hide the Shortcut Bar"
 msgstr "Sk_jul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:276
 msgid "Hide the shortcut bar"
 msgstr "Skjul snarveilinjen"
 
-#: shell/e-shortcuts-view.c:274
+#: shell/e-shortcuts-view.c:281
 msgid "Create _Default Shortcuts"
 msgstr "Opprett _forvalgte snarveier"
 
-#: shell/e-shortcuts-view.c:275
+#: shell/e-shortcuts-view.c:282
 msgid "Create Default Shortcuts"
 msgstr "Opprett forvalgte snarveier"
 
-#: shell/e-shortcuts-view.c:394
+#: shell/e-shortcuts-view.c:401
 msgid "Rename shortcut"
 msgstr "Endre navn på snarvei"
 
-#: shell/e-shortcuts-view.c:395
+#: shell/e-shortcuts-view.c:402
 msgid "Rename selected shortcut to:"
 msgstr "Endre navn på valgt snarvei til:"
 
-#: shell/e-shortcuts-view.c:408
+#: shell/e-shortcuts-view.c:415
 msgid "Open the folder linked to this shortcut"
 msgstr "Åpne mappen som er lenket til denne snarveien"
 
-#: shell/e-shortcuts-view.c:410 ui/evolution.xml.h:24
+#: shell/e-shortcuts-view.c:417 ui/evolution.xml.h:24
 msgid "Open in New _Window"
 msgstr "Åpne i nytt _vindu"
 
-#: shell/e-shortcuts-view.c:410
+#: shell/e-shortcuts-view.c:417
 msgid "Open the folder linked to this shortcut in a new window"
 msgstr "Åpne mappen som er lenket til denne snarveien i et nytt vindu"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: shell/e-shortcuts-view.c:413
+#: shell/e-shortcuts-view.c:420
 msgid "Rename this shortcut"
 msgstr "Endre navn på denne snarveien"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Re_move"
 msgstr "_Fjern"
 
-#: shell/e-shortcuts-view.c:415
+#: shell/e-shortcuts-view.c:422
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Fjern denne snarveien fra snarveilinjen"
 
-#: shell/e-shortcuts.c:641
+#: shell/e-shortcuts.c:649
 msgid "Error saving shortcuts."
 msgstr "Feil under lagring av snarveier."
 
-#: shell/e-shortcuts.c:1080
+#: shell/e-shortcuts.c:1096
 msgid "Shortcuts"
 msgstr "Snarveier"
 
@@ -25518,77 +25803,77 @@ msgstr "Snarveier"
 msgid "Checkbox"
 msgstr "Avkryssingsboks"
 
-#: shell/e-storage.c:569
+#: shell/e-storage.c:570
 msgid "No error"
 msgstr "Ingen feil"
 
-#: shell/e-storage.c:573
+#: shell/e-storage.c:574
 msgid "A folder with the same name already exists"
 msgstr "En mappe med samme navn eksisterer allerede"
 
-#: shell/e-storage.c:575
+#: shell/e-storage.c:576
 msgid "The specified folder type is not valid"
 msgstr "Spesifisert mappetype er ikke gyldig"
 
-#: shell/e-storage.c:577
+#: shell/e-storage.c:578
 msgid "I/O error"
 msgstr "I/U-feil"
 
-#: shell/e-storage.c:579
+#: shell/e-storage.c:580
 msgid "Not enough space to create the folder"
 msgstr "Ikke nok plass til å opprette mappen"
 
-#: shell/e-storage.c:581
+#: shell/e-storage.c:582
 msgid "The folder is not empty"
 msgstr "Mappen er ikke tom"
 
-#: shell/e-storage.c:583
+#: shell/e-storage.c:584
 msgid "The specified folder was not found"
 msgstr "Spesifisert mappe ble ikke funnet"
 
-#: shell/e-storage.c:585
+#: shell/e-storage.c:586
 msgid "Function not implemented in this storage"
 msgstr "Funksjonen er ikke implementert i dette lageret"
 
-#: shell/e-storage.c:589
+#: shell/e-storage.c:590
 msgid "Operation not supported"
 msgstr "Operasjonen er ikke støttet"
 
-#: shell/e-storage.c:591
+#: shell/e-storage.c:592
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke støttet for dette lageret"
 
-#: shell/e-storage.c:593
+#: shell/e-storage.c:594
 msgid "The specified folder cannot be modified or removed"
 msgstr "Spesifisert mappe kan ikke endres eller fjernes"
 
-#: shell/e-storage.c:595
+#: shell/e-storage.c:596
 msgid "Cannot make a folder a child of one of its descendants"
 msgstr "Kan ikke gjøre en mappe til barn av en av sine etterkommere"
 
-#: shell/e-storage.c:597
+#: shell/e-storage.c:598
 msgid "Cannot create a folder with that name"
 msgstr "Kunne ikke opprette en mappe med det navnet"
 
-#: shell/e-storage.c:599
+#: shell/e-storage.c:600
 msgid "This operation cannot be performed in off-line mode"
 msgstr "Denne operasjonen kan ikke utføres i frakoblet modus"
 
-#: shell/e-task-widget.c:191
+#: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-#: shell/e-task-widget.c:196
+#: shell/e-task-widget.c:216
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
-#: shell/evolution-folder-selector-button.c:94
+#: shell/evolution-folder-selector-button.c:101
 msgid "<click here to select a folder>"
 msgstr "<klikk her for å velge en mappe>"
 
-#: shell/evolution-shell-component-utils.c:124
+#: shell/evolution-shell-component-utils.c:123
 #, c-format
 msgid ""
 "%s\n"
@@ -25599,7 +25884,7 @@ msgstr ""
 "\n"
 "Ukjent feil."
 
-#: shell/evolution-shell-component-utils.c:127
+#: shell/evolution-shell-component-utils.c:126
 #, c-format
 msgid ""
 "%s\n"
@@ -25612,7 +25897,7 @@ msgstr ""
 "Feilen fra komponentsystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component-utils.c:134
+#: shell/evolution-shell-component-utils.c:133
 #, c-format
 msgid ""
 "%s\n"
@@ -25625,86 +25910,86 @@ msgstr ""
 "Feilen fra aktiveringssystemet er:\n"
 "%s"
 
-#: shell/evolution-shell-component.c:1145
+#: shell/evolution-shell-component.c:1164
 msgid "CORBA error"
 msgstr "CORBA-feil"
 
-#: shell/evolution-shell-component.c:1147
+#: shell/evolution-shell-component.c:1166
 msgid "Interrupted"
 msgstr "Avbrutt"
 
-#: shell/evolution-shell-component.c:1149
+#: shell/evolution-shell-component.c:1168
 msgid "Invalid argument"
 msgstr "Ugyldig argument"
 
-#: shell/evolution-shell-component.c:1151
+#: shell/evolution-shell-component.c:1170
 msgid "Already has an owner"
 msgstr "Har allerede en eier"
 
-#: shell/evolution-shell-component.c:1153
+#: shell/evolution-shell-component.c:1172
 msgid "No owner"
 msgstr "Ingen eier"
 
-#: shell/evolution-shell-component.c:1155
+#: shell/evolution-shell-component.c:1174
 msgid "Not found"
 msgstr "Ikke funnet"
 
-#: shell/evolution-shell-component.c:1157
+#: shell/evolution-shell-component.c:1176
 msgid "Unsupported type"
 msgstr "Ustøttet type"
 
-#: shell/evolution-shell-component.c:1159
+#: shell/evolution-shell-component.c:1178
 msgid "Unsupported schema"
 msgstr "Ustøttet schema"
 
-#: shell/evolution-shell-component.c:1161
+#: shell/evolution-shell-component.c:1180
 msgid "Unsupported operation"
 msgstr "Ustøttet operasjon"
 
-#: shell/evolution-shell-component.c:1163
+#: shell/evolution-shell-component.c:1182
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: shell/evolution-shell-component.c:1167
+#: shell/evolution-shell-component.c:1186
 msgid "Exists"
 msgstr "Eksisterer"
 
-#: shell/evolution-shell-component.c:1169
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid URI"
 msgstr "Ugyldig URI"
 
-#: shell/evolution-shell-component.c:1173
+#: shell/evolution-shell-component.c:1192
 msgid "Has subfolders"
 msgstr "Har undermapper"
 
-#: shell/evolution-shell-component.c:1175
+#: shell/evolution-shell-component.c:1194
 msgid "No space left"
 msgstr "Ingen plass igjen"
 
-#: shell/evolution-shell-component.c:1177
+#: shell/evolution-shell-component.c:1196
 msgid "Old owner has died"
 msgstr "Gammel eier er død"
 
-#: shell/evolution-test-component.c:49
+#: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Testtype"
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
-msgid "Active connections"
-msgstr "Aktive tilkoblinger"
+#: shell/evolution-test-component.c:703
+msgid "Evolution Test Component"
+msgstr "Testkomponent for Evolution"
 
-#: shell/glade/e-active-connection-dialog.glade.h:2
+#: shell/glade/e-active-connection-dialog.glade.h:1
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å lukke disse forbindelsene og arbeide frakoblet"
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Host"
-msgstr "Vert"
-
-#: shell/glade/e-active-connection-dialog.glade.h:4
+#: shell/glade/e-active-connection-dialog.glade.h:2
 msgid "The following connections are currently active:"
 msgstr "Følgende forbindelser er aktive:"
 
+#: shell/glade/e-active-connection-dialog.glade.h:3
+msgid "dialog1"
+msgstr ""
+
 #: shell/glade/e-shell-config-default-folders.glade.h:1
 msgid "C_alendar:"
 msgstr "K_alender"
@@ -25721,15 +26006,15 @@ msgstr "_E-post"
 msgid "_Tasks:"
 msgstr "_Oppgaver:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder name:"
 msgstr "Mappenavn:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
 msgid "Folder type:"
 msgstr "Mappetype:"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
@@ -25749,29 +26034,29 @@ msgstr "_Mappenavn:"
 msgid "_User:"
 msgstr "Br_uker:"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Konfigurasjonsassistent for Evolution"
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/glade/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Importerer filer"
 
-#: shell/glade/evolution-startup-wizard.glade.h:8
+#: shell/glade/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Tidssone "
 
-#: shell/glade/evolution-startup-wizard.glade.h:9
+#: shell/glade/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:10
+#: shell/glade/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
 "files from other applications. \n"
 "\n"
-"Please click the \"Next\" button to continue. "
+"Please click the \"Forward\" button to continue. "
 msgstr ""
 "Velkommen til Evolution. De neste skjermene lar deg\n"
 "konfigurere Evolution til å koble til dine e-post kontoer, og\n"
@@ -25779,12 +26064,13 @@ msgstr ""
 "\n"
 "Vennligst klikk «Neste» for å fortsette. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:15
+#: shell/glade/evolution-startup-wizard.glade.h:11
+#, fuzzy
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
 "\n"
-"Click the \"Finish\" button to save your settings. "
+"Click the \"Apply\" button to save your settings. "
 msgstr ""
 "Du har fullført inntasting av all informasjon\n"
 "som trengs for å konfigurere Evolution.\n"
@@ -25825,41 +26111,42 @@ msgstr ""
 "Gjennom denne veiviseren vil du ledes gjennom import av\n"
 "eksterne filer til Evolution."
 
-#: shell/importer/intelligent.c:190
+#: shell/importer/intelligent.c:189
 msgid "Importers"
 msgstr "Importerere"
 
-#: shell/importer/intelligent.c:196
+#: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ikke importer"
 
-#: shell/importer/intelligent.c:198
+#: shell/importer/intelligent.c:199
 msgid "Don't ask me again"
 msgstr "Ikke spør meg igjen"
 
-#: shell/importer/intelligent.c:208
+#: shell/importer/intelligent.c:207
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
-#: shell/main.c:96
+#: shell/main.c:109 shell/main.c:506
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:102
+#: shell/main.c:115
 msgid "Evolution is now exiting ..."
 msgstr "Evolution avslutter nå..."
 
-#: shell/main.c:227
-#, no-c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:216
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Ximian Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It's getting close,\n"
-"but some features are either unfinished or don't work properly.\n"
+"This version of Ximian Evolution is not yet complete. It is getting close,\n"
+"but some features are either unfinished or do not work properly.\n"
 "\n"
-"If you want a stable version of Evolution, we urge you to uninstall,\n"
-"this version, and install a 1.0.x version instead (1.0.8)\n"
+"If you want a stable version of Evolution, we urge you to uninstall\n"
+"this version, and install version %s instead.\n"
 "\n"
 "If you find bugs, please report them to us at bugzilla.ximian.com.\n"
 "This product comes with no warranty and is not intended for\n"
@@ -25884,7 +26171,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:250
+#: shell/main.c:240
 msgid ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
@@ -25892,40 +26179,40 @@ msgstr ""
 "Takk\n"
 "Ximian Evolution utviklerene\n"
 
-#: shell/main.c:259
+#: shell/main.c:248
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:394
+#: shell/main.c:335
 msgid "Cannot access the Ximian Evolution shell."
 msgstr "Kan ikke aksessere Ximian Evolution-skallet."
 
-#: shell/main.c:403
+#: shell/main.c:344
 #, c-format
 msgid "Cannot initialize the Ximian Evolution shell: %s"
 msgstr "Kan ikke initiere Ximian Evolution-skallet: %s"
 
-#: shell/main.c:485
+#: shell/main.c:476
 msgid "Disable splash screen"
 msgstr "Deaktiver splash"
 
-#: shell/main.c:487
+#: shell/main.c:478
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:489
+#: shell/main.c:480
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:491
+#: shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:493
+#: shell/main.c:485
 msgid "Force upgrading of configuration files from Evolution 1.0.x"
 msgstr "Tvungen oppgradering av konfigurasjonsfilene fra Evolution 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -25934,26 +26221,22 @@ msgstr ""
 "%s: --online og --offline kan ikke brukes samtidig.\n"
 "  Bruk %s --help for mer informasjon.\n"
 
-#: shell/main.c:542
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Kunne ikke initiere Bonobo komponentsystemet."
-
-#: tools/evolution-addressbook-abuse.c:80
-#: tools/evolution-addressbook-export.c:36
+#: tools/evolution-addressbook-abuse.c:81
+#: tools/evolution-addressbook-export.c:41
 #: tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil under lasting av standard adressebok."
 
-#: tools/evolution-addressbook-abuse.c:111
+#: tools/evolution-addressbook-abuse.c:112
 #: tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "Innfil"
 
-#: tools/evolution-addressbook-export.c:46
+#: tools/evolution-addressbook-export.c:51
 msgid "Output File"
 msgstr "Utfil"
 
-#: tools/evolution-addressbook-import.c:80
+#: tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "Ingen filnavn spesifisert."
 
@@ -26685,7 +26968,8 @@ msgid "Post a Reply"
 msgstr "Post et svar"
 
 #: ui/evolution-mail-message.xml.h:63
-msgid "Post a reply to a message message in a Public folder"
+#, fuzzy
+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:64
@@ -26868,6 +27152,10 @@ msgstr "_Vis"
 msgid "Attach"
 msgstr "Legg ved"
 
+#: 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:2
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
@@ -27403,9 +27691,8 @@ msgstr "Med _kategori"
 msgid "_Tasks"
 msgstr "_Oppgaver"
 
-#. Check for UTC.
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:209
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:702
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:199
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:644
 msgid "UTC"
 msgstr "UTC"
 
@@ -27431,43 +27718,43 @@ msgstr ""
 "tidssone.\n"
 "Bru høyre musknapp til å zoome ut."
 
-#: widgets/menus/gal-view-menus.c:295
+#: widgets/menus/gal-view-menus.c:288
 msgid "_Current View"
 msgstr "_Aktiv visning"
 
 #. bonobo displays this string so it must be in locale
-#: widgets/menus/gal-view-menus.c:357
+#: widgets/menus/gal-view-menus.c:350
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: widgets/menus/gal-view-menus.c:366
+#: widgets/menus/gal-view-menus.c:359
 msgid "Save Custom View"
 msgstr "Lagre egendefinert visning"
 
-#: widgets/menus/gal-view-menus.c:379
+#: widgets/menus/gal-view-menus.c:372
 msgid "Define Views"
 msgstr "Definer visninger"
 
 #. 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:427
+#: widgets/misc/e-calendar-item.c:434
 msgid "MTWTFSS"
 msgstr "MTOTFLS"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1070
+#: widgets/misc/e-calendar-item.c:1107
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-cell-date-edit.c:234 widgets/misc/e-dateedit.c:438
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:436
 msgid "Now"
 msgstr "nå"
 
-#: widgets/misc/e-cell-date-edit.c:242 widgets/misc/e-dateedit.c:444
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:442
 msgid "Today"
 msgstr "I dag"
 
-#: widgets/misc/e-cell-date-edit.c:797
+#: widgets/misc/e-cell-date-edit.c:805
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Datoen må skrives inn på formatet: %s"
@@ -27476,80 +27763,80 @@ msgstr "Datoen må skrives inn på formatet: %s"
 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:59
+#: widgets/misc/e-charset-picker.c:61
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: widgets/misc/e-charset-picker.c:60
+#: widgets/misc/e-charset-picker.c:62
 msgid "Central European"
 msgstr "Sentral-europeisk"
 
-#: widgets/misc/e-charset-picker.c:61
+#: widgets/misc/e-charset-picker.c:63
 msgid "Chinese"
 msgstr "Kinesisk"
 
-#: widgets/misc/e-charset-picker.c:62
+#: widgets/misc/e-charset-picker.c:64
 msgid "Cyrillic"
 msgstr "Kyrillisk"
 
-#: widgets/misc/e-charset-picker.c:63
+#: widgets/misc/e-charset-picker.c:65
 msgid "Greek"
 msgstr "Gresk"
 
-#: widgets/misc/e-charset-picker.c:64
+#: widgets/misc/e-charset-picker.c:66
 msgid "Hebrew"
 msgstr "Hebraisk"
 
-#: widgets/misc/e-charset-picker.c:65
+#: widgets/misc/e-charset-picker.c:67
 msgid "Japanese"
 msgstr "Japansk"
 
-#: widgets/misc/e-charset-picker.c:66
+#: widgets/misc/e-charset-picker.c:68
 msgid "Korean"
 msgstr "Koreansk"
 
-#: widgets/misc/e-charset-picker.c:67
+#: widgets/misc/e-charset-picker.c:69
 msgid "Turkish"
 msgstr "Tyrkisk"
 
-#: widgets/misc/e-charset-picker.c:68
+#: widgets/misc/e-charset-picker.c:70
 msgid "Unicode"
 msgstr "Unicode"
 
-#: widgets/misc/e-charset-picker.c:69
+#: widgets/misc/e-charset-picker.c:71
 msgid "Western European"
 msgstr "Vest-europeisk"
 
-#: widgets/misc/e-charset-picker.c:86
+#: widgets/misc/e-charset-picker.c:88
 msgid "Traditional"
 msgstr "Tradisjonell"
 
-#: widgets/misc/e-charset-picker.c:87 widgets/misc/e-charset-picker.c:88
+#: widgets/misc/e-charset-picker.c:89 widgets/misc/e-charset-picker.c:90
 msgid "Simplified"
 msgstr "Forenklet"
 
-#: widgets/misc/e-charset-picker.c:92
+#: widgets/misc/e-charset-picker.c:94
 msgid "Ukrainian"
 msgstr "Ukrainsk"
 
-#: widgets/misc/e-charset-picker.c:95
+#: widgets/misc/e-charset-picker.c:97
 msgid "Visual"
 msgstr "Synlig"
 
-#: widgets/misc/e-charset-picker.c:164
+#: widgets/misc/e-charset-picker.c:185
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "Ukjent tegnsett: %s"
 
-#: widgets/misc/e-charset-picker.c:206
+#: widgets/misc/e-charset-picker.c:228
 msgid "Enter the character set to use"
 msgstr "Skriv inn tegnsett som skal brukes"
 
-#: widgets/misc/e-charset-picker.c:281
+#: widgets/misc/e-charset-picker.c:303
 msgid "Other..."
 msgstr "Andre..."
 
-#: widgets/misc/e-charset-picker.c:400
+#: widgets/misc/e-charset-picker.c:423
 msgid "Character Encoding"
 msgstr "Tegnkoding"
 
@@ -27557,11 +27844,11 @@ msgstr "Tegnkoding"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-filter-bar.c:189
+#: widgets/misc/e-filter-bar.c:190
 msgid "Search Editor"
 msgstr "Redigering av søk"
 
-#: widgets/misc/e-filter-bar.c:211
+#: widgets/misc/e-filter-bar.c:212
 msgid "Save Search"
 msgstr "Lagre søk"
 
@@ -27577,64 +27864,363 @@ msgstr "R_ediger lagrede søk..."
 msgid "_Advanced..."
 msgstr "_Avansert..."
 
-#: widgets/misc/e-messagebox.c:152
+#: widgets/misc/e-messagebox.c:154
 msgid "Information"
 msgstr "Informasjon"
 
-#: widgets/misc/e-messagebox.c:166
+#: widgets/misc/e-messagebox.c:168
 msgid "Error"
 msgstr "Feil"
 
-#: widgets/misc/e-messagebox.c:173
+#: widgets/misc/e-messagebox.c:175
 msgid "Question"
 msgstr "Spørsmål"
 
-#: widgets/misc/e-messagebox.c:180
+#: widgets/misc/e-messagebox.c:182
 msgid "Message"
 msgstr "Melding"
 
-#. Add the "Don't show this message again." checkbox
-#: widgets/misc/e-messagebox.c:224
-msgid "Don't show this message again."
-msgstr "Ikke vis denne meldingen igjen."
-
-#: widgets/misc/e-search-bar.c:521
+#: widgets/misc/e-search-bar.c:524
 msgid "_Find Now"
 msgstr "_Finn nå "
 
-#: widgets/misc/e-search-bar.c:522
+#: widgets/misc/e-search-bar.c:525
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: widgets/misc/e-search-bar.c:895
+#: widgets/misc/e-search-bar.c:826
+msgid "Item ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:833
+msgid "Subitem ID"
+msgstr ""
+
+#: widgets/misc/e-search-bar.c:840
+#, fuzzy
+msgid "Text"
+msgstr "Test"
+
+#: widgets/misc/e-search-bar.c:918
 msgid "Clear"
 msgstr "Tøm"
 
-#: widgets/misc/e-search-bar.c:897
+#: widgets/misc/e-search-bar.c:920
 msgid "Find Now"
 msgstr "Finn nå "
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:1
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:1
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:1
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:1
 msgid "The Personal Addressbook Server"
 msgstr "Personlig adressebok-tjener"
 
-#: wombat/GNOME_Evolution_WombatLDAP.oaf.in.h:2
-#: wombat/GNOME_Evolution_WombatNOLDAP.oaf.in.h:2
+#: wombat/GNOME_Evolution_WombatLDAP.server.in.in.h:2
+#: wombat/GNOME_Evolution_WombatNOLDAP.server.in.in.h:2
 msgid "The Personal Calendar Server; calendar factory"
 msgstr "Personlig adressebok-tjener; factory"
 
-#: wombat/wombat.c:199
-msgid "setup_vfs(): could not initialize GNOME-VFS"
-msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
+#~ msgid "Factory for the Addressbook Minicard control"
+#~ msgstr "Factory for minikort kontroll for adressebok"
+
+#~ msgid "Factory for the Addressbook's address displayer"
+#~ msgstr "Factory for adressebokens adressevisning"
+
+#~ msgid "Factory for the Addressbook's address popup"
+#~ msgstr "Factory for adressebokens adressevisning"
+
+#~ msgid "Factory for the sample Addressbook control"
+#~ msgstr "Factory for eksempelkontroll for adressebok"
+
+#~ msgid "Associated LDAP Attribute"
+#~ msgstr "Assosiert LDAP-attributt"
+
+#~ msgid "Attribute"
+#~ msgstr "Attributt"
+
+#~ msgid "Corresponding Evolution Attribute"
+#~ msgstr "Korresponderende Evolution-attributt"
+
+#~ msgid "Evolution Attribute"
+#~ msgstr "Evolution-attributt"
+
+#~ msgid "LDAP Attribute"
+#~ msgstr "LDAP-attributt"
+
+#~ msgid ""
+#~ "Please select and Evolution attribute and an\n"
+#~ "LDAP attribute to associate with it."
+#~ msgstr ""
+#~ "Vennligst velg en Evolution-attributt og en\n"
+#~ "LDAP-attributt du vil assosiere med denne."
+
+#~ msgid "Select"
+#~ msgstr "Velg"
+
+#~ msgid ""
+#~ "Selecting this option will let you change Evolution's default settings "
+#~ "for LDAP\n"
+#~ "searches, and for creating and editting contacts. "
+#~ msgstr ""
+#~ "Hvis du aktiverer dette alternativet lar det deg endre Evolutions "
+#~ "forvalgte innstillinger\n"
+#~ "for LDAP-søk, og for oppretting og redigering av kontakter. "
+
+#~ msgid "Edit Contact List"
+#~ msgstr "Rediger kontaktliste"
+
+#~ msgid "C_ontacts..."
+#~ msgstr "K_ontakter..."
+
+#~ msgid "Phone Types"
+#~ msgstr "Telefontyper"
+
+#~ msgid "Delete Contact?"
+#~ msgstr "Slett kontakt?"
+
+#~ msgid "Confirm Overwrite"
+#~ msgstr "Bekreft overskriving"
+
+#~ msgid "Display Cards?"
+#~ msgstr "Vis kort?"
+
+#~ msgid "Display Cards"
+#~ msgstr "Vis kort"
+
+#~ msgid "Factory for the Evolution Tasks control"
+#~ msgstr "Factory for Evolution oppgavekontroll"
+
+#~ msgid "Factory for the calendar iTip view control"
+#~ msgstr "Factory for kalenderens iTip visningskontroll"
+
+#~ msgid "Factory for the sample Calendar control"
+#~ msgstr "Factory for eksempelkontroll for kalender"
+
+#~ msgid "Factory to create a component editor factory"
+#~ msgstr "Factory for å opprette en factory for komponentredigering"
+
+#~ msgid "Could not initialize GNOME"
+#~ msgstr "Kunne ikke initiere GNOME"
+
+#~ msgid ""
+#~ "Evolution does not yet support email notification for reminders.  You "
+#~ "will not be able to edit the options for this reminder."
+#~ msgstr ""
+#~ "Evolution støtter ikke e-postmelding for påminnelser ennå. Du vil ikke "
+#~ "kunne redigere alternativene for denne påminnelsen."
+
+#~ msgid "st"
+#~ msgstr "ste"
 
-#: wombat/wombat.c:211
-msgid "init_corba(): could not initialize GNOME"
-msgstr "init_corba(): kunne ikke initiere GNOME"
+#~ msgid "nd"
+#~ msgstr "ndre"
 
-#: wombat/wombat.c:224
-msgid "init_bonobo(): could not initialize Bonobo"
-msgstr "init_bonobo(): kunne ikke initiere Bonobo"
+#~ msgid "rd"
+#~ msgstr "dje"
+
+#~ msgid "th"
+#~ msgstr "de"
+
+#~ msgid "Could not activate Bonobo"
+#~ msgstr "Kunne ikke aktivere Bonobo"
+
+#~ msgid "Could not create the component editor factory"
+#~ msgstr "Kunne ikke opprette factory for komponentredigering"
+
+#~ msgid "Print Calendar"
+#~ msgstr "Skriv ut kalender"
+
+#~ msgid ""
+#~ "Could not create the tasks view.  Please check your ORBit and OAF setup."
+#~ msgstr ""
+#~ "Kunne ikke opprette oppgavevisning. Vennligst sjekk din ORBit og OAF "
+#~ "konfigurasjon."
+
+#~ msgid ""
+#~ "Evolution has taken the tasks that were in your calendar folder and "
+#~ "automatically migrated them to the new tasks folder."
+#~ msgstr ""
+#~ "Evolution har utført automatisk migrasjon av oppgavene fra din "
+#~ "kalendermappe til den nye oppgaver-mappen."
+
+#~ msgid ""
+#~ "Evolution has tried to take the tasks that were in your calendar folder "
+#~ "and migrate them to the new tasks folder.\n"
+#~ "Some of the tasks could not be migrated, so this process may be attempted "
+#~ "again in the future."
+#~ msgstr ""
+#~ "Evolution har forsøkt å migrere oppgavene som var i din kalendermappe til "
+#~ "den nye oppgavemappen.\n"
+#~ "Noen av oppgavene kunne ikke migreres, så denne prosessen vil kunne "
+#~ "forsøkes igjen i fremtiden."
+
+#~ msgid ""
+#~ "Could not open `%s'; no items from the calendar folder will be migrated "
+#~ "to the tasks folder."
+#~ msgstr ""
+#~ "Kunne ikke åpne «%s»; ingen oppføringer fra kalendermappen vil flyttes "
+#~ "til oppgavemappen."
+
+#~ msgid ""
+#~ "The method required to load `%s' is not supported; no items from the "
+#~ "calendar folder will be migrated to the tasks folder."
+#~ msgstr ""
+#~ "Metoden som kreves for å laste «%s» er ikke støttet; ingen oppføringer "
+#~ "fra kalendermappen vil bli migrert til oppgavemappen."
+
+#~ msgid "Warning!"
+#~ msgstr "Advarsel!"
+
+#~ msgid ""
+#~ "Could not create composer window, because you have not yet\n"
+#~ "configured any identities in the mail component."
+#~ msgstr ""
+#~ "Kunne ikke opprette skrivevindu fordi du ikke har satt\n"
+#~ "opp en identitet i e-post-komponenten."
+
+#~ msgid "Cannot initialize the Evolution composer."
+#~ msgstr "Kan ikke initiere Evolutions meldingsredigerer."
+
+#~ msgid "Add action"
+#~ msgstr "Legg til handling"
+
+#~ msgid "Add criterion"
+#~ msgstr "Legg til kriterie"
+
+#~ msgid "Evolution mail folder factory component."
+#~ msgstr "Evolution komponent for e-postmappe factory."
+
+#~ msgid "Factory for the Evolution composer."
+#~ msgstr "Factory for Evolution meldingsredigering."
+
+#~ msgid "Factory for the Mail Summary component."
+#~ msgstr "Factory for e-post sammendrag komponent."
+
+#~ msgid "Warning: Unsent Messages"
+#~ msgstr "Advarsel: Usendte meldinger"
+
+#~ msgid "Cannot initialize the Evolution mail component."
+#~ msgstr "Kan ikke initiere Evolutions e-postkomponent."
+
+#~ msgid "Cannot initialize Evolution's mail config component."
+#~ msgstr "Kan ikke initiere Evolutions konfigurasjonskomponent for e-post."
+
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Kan ikke initiere Evolutions mappeinfo-komponent."
+
+#~ msgid "Really delete account?"
+#~ msgstr "Vil du virkelig slette kontoen?"
+
+#~ msgid "Go to next folder with unread messages?"
+#~ msgstr "Gå til neste mappe med uleste meldinger?"
+
+#~ msgid ""
+#~ "There are no more new messages in this folder.\n"
+#~ "Would you like to go to the next folder?"
+#~ msgstr ""
+#~ "Ingen flere nye meldinger i denne mappen.\n"
+#~ "Vil du gå til neste mappe?"
+
+#~ msgid "US-Letter"
+#~ msgstr "US-letter"
+
+#~ msgid ""
+#~ "Please specify signature filename\n"
+#~ "in Andvanced section of signature settings."
+#~ msgstr ""
+#~ "Vennligst oppgi filnavn for signatur\n"
+#~ "under avanserte innstillinger for signaturer."
+
+#~ msgid "Add Signature"
+#~ msgstr "Legg til signatur"
+
+#~ msgid "Account %d"
+#~ msgstr "Konto %d"
+
+#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
+#~ msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZzÆæØøÅå"
+
+#~ msgid "Spell Checking Language"
+#~ msgstr "Språk for stavekontroll"
+
+#~ msgid "Salve file"
+#~ msgstr "Redd fil"
+
+#~ msgid "Factory for Evolution Summary's configuration control."
+#~ msgstr "Factory for konfigurasjonskontroll for Evolution sammendrag."
+
+#~ msgid "Marquette"
+#~ msgstr "Marquette"
+
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Executive summary komponent kunne ikke initiere Bonobo.\n"
+
+#~ msgid "Evolution installation"
+#~ msgstr "Evolution installasjon"
+
+#~ msgid ""
+#~ "This new version of Evolution needs to install additional files\n"
+#~ "into your personal Evolution directory"
+#~ msgstr ""
+#~ "Denne nye versjonen av Evolution må installere tilleggsfiler i\n"
+#~ "din personlige Evolution-katalog"
+
+#~ msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+#~ msgstr ""
+#~ "Vennligst klikk «OK» for å installere filene, eller «Avbryt» for å "
+#~ "avslutte."
+
+#~ msgid ""
+#~ "Evolution has detected an old\n"
+#~ "Executive-Summary directory.\n"
+#~ "This needs to be removed before\n"
+#~ "Evolution will run.\n"
+#~ "Do you want me to remove this directory?"
+#~ msgstr ""
+#~ "Evolution har funnet en gammel\n"
+#~ "Executive-Summary katalog.\n"
+#~ "Denne må fjernes før Evolution\n"
+#~ "kan kjøre.\n"
+#~ "Vil du fjerne denne katalogen?"
+
+#~ msgid "New..."
+#~ msgstr "Ny..."
+
+#~ msgid ""
+#~ "Could not start the Evolution Mailer Assistant interface\n"
+#~ "(%s)"
+#~ msgstr ""
+#~ "Kunne ikke starte assistent-grensesnittet for Evolution\n"
+#~ "(%s)"
+
+#~ msgid "Could not start the Evolution Mailer Assistant interface\n"
+#~ msgstr "Kunne ikke starte assistent-grensesnittet for Evolution\n"
+
+#~ msgid "Folder name cannot contain slashes."
+#~ msgstr "Mappenavn kan ikke inneholde skråstreker."
+
+#~ msgid "Bug buddy was not found in your $PATH."
+#~ msgstr "Bug buddy ble ikke funnet i din $PATH."
+
+#~ msgid "Don't remove"
+#~ msgstr "Ikke fjern"
+
+#~ msgid "Active connections"
+#~ msgstr "Aktive tilkoblinger"
+
+#~ msgid "Host"
+#~ msgstr "Vert"
+
+#~ msgid "Cannot initialize the Bonobo component system."
+#~ msgstr "Kunne ikke initiere Bonobo komponentsystemet."
+
+#~ msgid "setup_vfs(): could not initialize GNOME-VFS"
+#~ msgstr "setup_vfs(): kunne ikke initiere GNOME-VFS"
+
+#~ msgid "init_corba(): could not initialize GNOME"
+#~ msgstr "init_corba(): kunne ikke initiere GNOME"
+
+#~ msgid "init_bonobo(): could not initialize Bonobo"
+#~ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 
 #~ msgid "_Configure..."
 #~ msgstr "_Konfigurer..."
@@ -27843,9 +28429,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "News Servers"
 #~ msgstr "news-tjenere"
 
-#~ msgid "Source"
-#~ msgstr "Kilde"
-
 #~ msgid "Source Information"
 #~ msgstr "Kildeinformasjon"
 
@@ -28090,9 +28673,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid " Edit "
 #~ msgstr " Rediger "
 
-#~ msgid " New "
-#~ msgstr " Ny "
-
 #~ msgid "Advanced Options"
 #~ msgstr "Avanserte alternativer"
 
@@ -28381,12 +28961,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Dari"
 #~ msgstr "Dari"
 
-#~ msgid "Default Forward style is: "
-#~ msgstr "Standard videresendingsstil er: "
-
-#~ msgid "Default character encoding: "
-#~ msgstr "Standard tegnkoding: "
-
 #~ msgid "Delete selected signature"
 #~ msgstr "Slett valgt signatur"
 
@@ -28640,9 +29214,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "_Summary Settings..."
 #~ msgstr "Innstillinger for _sammendrag..."
 
-#~ msgid "New List"
-#~ msgstr "Ny liste"
-
 #~ msgid "New Appointment"
 #~ msgstr "Ny avtale"
 
@@ -29735,9 +30306,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "File not found"
 #~ msgstr "Fil ikke funnet"
 
-#~ msgid "Save calendar"
-#~ msgstr "Lagre kalender"
-
 #~ msgid "Delete all Occurrences"
 #~ msgstr "Slett alle oppføringer"
 
@@ -30872,9 +31440,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "_Reply (FIXME)"
 #~ msgstr "Sva_r"
 
-#~ msgid "Send as:"
-#~ msgstr "Send som:"
-
 #~ msgid "%I:%M:%S %p%n"
 #~ msgstr "%I:%M:%S %p%n"
 
@@ -31905,9 +32470,6 @@ msgstr "init_bonobo(): kunne ikke initiere Bonobo"
 #~ msgid "Weekly"
 #~ msgstr "Ukentlig"
 
-#~ msgid "Every "
-#~ msgstr "Hver"
-
 #~ msgid ""
 #~ "1st\n"
 #~ "2nd\n"
author	Kjartan Maraas <kmaraas@gnome.org>	2003-03-17 08:44:35 +0800
committer	Kjartan Maraas <kmaraas@src.gnome.org>	2003-03-17 08:44:35 +0800
commit	3b3658a2fe71a68b7a00fa8917188c17ee937055 (patch)
tree	03aef9a021816fc291da775f0975d9f02cbaea73 /po
parent	94ff918c13a03c65422e8995dd6ec53fdd093fdd (diff)
download	gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.gz gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.bz2 gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.lz gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.xz gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.tar.zst gsoc2013-evolution-3b3658a2fe71a68b7a00fa8917188c17ee937055.zip