[evolution/wip/webkit2] Updated Icelandic translation



commit 3004921cebcda9f97496d41de2817d7ec115d607
Author: Sveinn í Felli <sv1 fellsnet is>
Date:   Tue Apr 28 14:13:23 2015 +0000

    Updated Icelandic translation

 po/is.po | 5010 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2661 insertions(+), 2349 deletions(-)
---
diff --git a/po/is.po b/po/is.po
index bf93473..8edcb65 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,6 +1,6 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#: ../shell/main.c:503
+#: ../shell/main.c:506
 # Helgi Þormar Þorbjörnsson <helgi trance is>, 2004.
 # Sveinn í Felli <sv1 fellsnet is>, 2015.
 msgid ""
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2015-01-06 10:20+0000\n"
-"PO-Revision-Date: 2015-02-02 10:09+0000\n"
+"POT-Creation-Date: 2015-04-24 08:38+0000\n"
+"PO-Revision-Date: 2015-04-28 14:10+0000\n"
 "Last-Translator: Sveinn í Felli <sv1 fellsnet is>\n"
 "Language-Team: Icelandic <translation-team-is lists sourceforge net>\n"
 "Language: is\n"
@@ -194,7 +194,7 @@ msgstr ""
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:53 ../modules/mail/em-composer-prefs.c:397
+#: ../mail/mail-config.ui.h:55 ../modules/mail/em-composer-prefs.c:417
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
-msgstr ""
+msgstr "Sleppa tvítekningum"
 
 #: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
@@ -231,7 +231,7 @@ msgid ""
 msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1248
 msgid "Failed to delete contact"
 msgstr "Tókst ekki að eyða tengilið"
 
@@ -314,7 +314,6 @@ msgid "Telephone"
 msgstr "Sími"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-#| msgid "_Address:"
 msgid "SIP Address"
 msgstr "SIP vistfang:"
 
@@ -334,7 +333,7 @@ msgstr "_Heimasíða:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1881
+#: ../modules/itip-formatter/itip-view.c:1907
 msgid "_Calendar:"
 msgstr "_Dagatal:"
 
@@ -351,7 +350,7 @@ msgid "Home Page:"
 msgstr "Heimasíða:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:93
+#: ../modules/cal-config-google/e-cal-config-google.c:92
 msgid "Calendar:"
 msgstr "Dagatal:"
 
@@ -373,7 +372,6 @@ msgid "Blog:"
 msgstr "Blogg:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#| msgid "_Address:"
 msgid "Web Addresses"
 msgstr "Vefföng"
 
@@ -382,7 +380,6 @@ msgid "_Profession:"
 msgstr "_Starfsheiti:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#| msgid "Job Title"
 msgctxt "Job"
 msgid "_Title:"
 msgstr "_Titill:"
@@ -470,6 +467,7 @@ msgid "_PO Box:"
 msgstr "_Pósthólf:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "_Heimilisfang:"
 
@@ -515,35 +513,34 @@ msgid "_Help"
 msgstr "_Hjálp"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:34
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
 msgid "Options"
 msgstr "Valkostir"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#, fuzzy
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
 #: ../addressbook/gui/widgets/eab-contact-merging.c:474
 #: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
 #: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:406
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:480 ../e-util/e-html-editor-actions.c:573
+#: ../e-util/e-html-editor-actions.c:614 ../e-util/e-html-editor-actions.c:708
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -551,20 +548,18 @@ msgstr "Valkostir"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3043
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3224
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
 #: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
 #: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:886
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:187
+#: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
-#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/face/face.c:291
+#: ../plugins/publish-calendar/publish-calendar.c:790
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
@@ -582,9 +577,9 @@ msgstr "_Hætta við"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
 #: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
 #: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3044
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3225
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
 #: ../smime/gui/certificate-manager.c:653
@@ -594,52 +589,47 @@ msgstr "_Vista"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
 msgid "Show Telephone"
-msgstr ""
+msgstr "Birta símanúmer"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
-#, fuzzy
 msgid "Show SIP Address"
-msgstr "_Heimilisfang:"
+msgstr "Birta SIP vistfang"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
 msgid "Show Instant Messaging"
-msgstr ""
+msgstr "Birta upplýsingar um spjallforritaaðganga"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
 msgid "Show Web Addresses"
-msgstr ""
+msgstr "Birta vefföng"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
 msgid "Show Job section"
-msgstr ""
+msgstr "Birta vinnuupplýsingar"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
 msgid "Show Miscellaneous"
-msgstr ""
+msgstr "Birta hluta með ýmislegu"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-#, fuzzy
 msgid "Show Home Mailing Address"
-msgstr "_Heimilisfang:"
+msgstr "Birta póstfang heimilis:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-#, fuzzy
 msgid "Show Work Mailing Address"
-msgstr "_Heimilisfang:"
+msgstr "Birta póstfang vinnu:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-#, fuzzy
 msgid "Show Other Mailing Address"
-msgstr "_Heimilisfang:"
+msgstr "Birta önnur póstföng:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-#, fuzzy
 msgid "Show Notes"
-msgstr "Sýna athugasemdir"
+msgstr "Birta minnispunkta"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 #: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:994
+#: ../e-util/e-html-editor-actions.c:1129
 msgid "_Undo"
 msgstr "_Afturkalla"
 
@@ -650,7 +640,7 @@ msgstr "Afturkalla"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:980
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "_Redo"
 msgstr "_Endurtaka"
 
@@ -684,7 +674,7 @@ msgstr "Vinsamlegast veldu mynd fyrir þennan tengilið"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
 #: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:481 ../e-util/e-html-editor-actions.c:574
+#: ../e-util/e-html-editor-actions.c:615 ../e-util/e-html-editor-actions.c:709
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
 #: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
@@ -727,7 +717,7 @@ msgstr "%s'%s' er tómt"
 msgid "Invalid contact."
 msgstr "Ógildur tengiliður."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
@@ -738,7 +728,7 @@ msgstr "Ógildur tengiliður."
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:388 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -769,7 +759,6 @@ msgid "_Full name"
 msgstr "_Fullt nafn"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
-#| msgid "Email"
 msgid "E_mail"
 msgstr "_Netfang"
 
@@ -831,7 +820,6 @@ msgid "_First:"
 msgstr "_Fornafn"
 
 #: ../addressbook/gui/contact-editor/fullname.ui.h:16
-#, fuzzy
 #| msgid "Job Title"
 msgctxt "FullName"
 msgid "_Title:"
@@ -872,29 +860,28 @@ msgstr "_Fela póstföng þegar sent er á listann"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "Add an email to the List"
-msgstr ""
+msgstr "Bæta netfangi á listann"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
-msgstr ""
+msgstr "Fjarlægja netfang af listanum"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#, fuzzy
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:460
 #: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
 #: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
 #: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:54
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:56
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
 #: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../plugins/templates/templates.c:463
 msgid "_Remove"
-msgstr "_Fjarlægja"
+msgstr "Fja_rlægja"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
@@ -945,19 +932,19 @@ msgid "Error removing list"
 msgstr "Villa við að fjarlægja lista"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1253
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
 msgid "Name contains"
 msgstr "Nafn inniheldur"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
 msgid "Email begins with"
 msgstr "Póstfang byrjar á"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181
 #: ../modules/calendar/e-cal-shell-view-actions.c:1611
 #: ../modules/calendar/e-memo-shell-view-actions.c:733
 #: ../modules/calendar/e-task-shell-view-actions.c:933
@@ -975,28 +962,27 @@ msgid "Copy _Email Address"
 msgstr "Afrita _Netfang"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:307
+#: ../e-util/e-web-view.c:338
 msgid "Copy the email address to the clipboard"
 msgstr "Afrita netfang yfir á klippispjald"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:312
+#: ../e-util/e-web-view.c:350
 msgid "_Send New Message To..."
 msgstr "_Senda ný skilaboð til..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:314
+#: ../e-util/e-web-view.c:352
 msgid "Send a mail message to this address"
 msgstr "Senda póst á þetta netfang"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view.c:1064
 #, c-format
 msgid "Click to mail %s"
 msgstr "Smellið til að senda póst til %s"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:141
-#| msgid "Open"
 msgid "Open map"
 msgstr ""
 
@@ -1356,7 +1342,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Líma tengiliði af klippispjaldi"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:1053
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Eyða völdum tengiliðum"
 
@@ -1364,49 +1350,48 @@ msgstr "Eyða völdum tengiliðum"
 msgid "Select all visible contacts"
 msgstr "Velja alla sjáanlega tengiliði"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1296
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Ertu viss um að þú viljið eyða þessum nafnaskrám?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Ertu viss um að þú viljið eyða þessari nafnaskrá?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Ertu viss um að þú viljið eyða þessari nafnaskrá (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Ertu viss um að þú viljið eyða þessum tengiliðum?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete this contact?"
 msgstr "Ertu viss um að þú viljið eyða þessum tengilið?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ertu viss um að þú viljið eyða þessum tengilið (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805
 #: ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1125
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 #: ../modules/calendar/e-cal-shell-view-actions.c:1434
 #: ../modules/calendar/e-memo-shell-view-actions.c:635
 #: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:943
 #: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Eyða"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1417,11 +1402,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1482
 msgid "_Don't Display"
 msgstr "_Ekki birta"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1483
 msgid "Display _All Contacts"
 msgstr "Birta _alla tengiliði"
 
@@ -1595,13 +1580,13 @@ msgstr "Renna _að"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2365
 msgid "Zoom _Out"
 msgstr "Renna _frá"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1972
+#: ../e-util/e-html-editor-actions.c:2108
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
@@ -1668,9 +1653,9 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Flyt inn..."
 
@@ -1718,7 +1703,6 @@ msgstr "Evolution vCard innflutningur"
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
 #: ../addressbook/printing/e-contact-print.c:874
 #, c-format
-#| msgid "Page"
 msgid "Page %d"
 msgstr "Síða %d"
 
@@ -1766,26 +1750,22 @@ msgid "Failed to open client '%s': %s"
 msgstr ""
 
 #: ../addressbook/util/eab-book-util.c:36
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Vinna tölvupóstfang"
 
 #: ../addressbook/util/eab-book-util.c:37
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Heima tölvupóstfang"
 
 #: ../addressbook/util/eab-book-util.c:38
-#| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Annað tölvupóstfang"
 
 #  red
 #: ../addressbook/util/eab-book-util.c:44
-#| msgid "Work"
 msgctxt "addressbook-label"
 msgid "Work SIP"
 msgstr "Vinna SIP"
@@ -1796,13 +1776,11 @@ msgid "Home SIP"
 msgstr "Heima SIP"
 
 #: ../addressbook/util/eab-book-util.c:46
-#| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other SIP"
 msgstr "Annað SIP"
 
 #: ../addressbook/util/eab-book-util.c:74
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "AIM"
@@ -1813,7 +1791,6 @@ msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/util/eab-book-util.c:76
-#| msgid "Yahoo"
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Yahoo"
@@ -1824,7 +1801,6 @@ msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/util/eab-book-util.c:78
-#| msgid "MSN"
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "MSN"
@@ -1859,7 +1835,6 @@ msgstr "Google Talk"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:126
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "Tölvupóstur"
@@ -1880,7 +1855,6 @@ msgstr "SIP"
 #. * IM=Instant Messaging
 #.
 #: ../addressbook/util/eab-book-util.c:216
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "IM"
@@ -1901,7 +1875,6 @@ msgstr[0] "mínúta"
 msgstr[1] "mínútur"
 
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:118
-#| msgid "hours"
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "klukkustund"
@@ -1911,11 +1884,10 @@ msgstr[1] "klukkustundir"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#, fuzzy
 #: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
-msgstr[0] "Dagur"
+msgstr[0] "dagur"
 msgstr[1] "dagar"
 
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:343
@@ -1940,13 +1912,12 @@ msgstr "_Blunda"
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 #: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1003
+#: ../e-util/e-html-editor-actions.c:1138
 #: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:58
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:60
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
 #: ../plugins/email-custom-header/email-custom-header.c:844
-#: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
@@ -1954,7 +1925,6 @@ msgid "_Edit"
 msgstr "_Breyta"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#| msgid "Print"
 msgid "_Print"
 msgstr "_Prenta"
 
@@ -1963,11 +1933,11 @@ msgid "_Dismiss"
 msgstr "_Hætta"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1844
-#: ../calendar/alarm-notify/alarm-queue.c:1854
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1493
-#: ../modules/itip-formatter/itip-view.c:1604
+#: ../calendar/alarm-notify/alarm-queue.c:1860
+#: ../calendar/alarm-notify/alarm-queue.c:1870
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1627
 msgid "Location:"
 msgstr "Staður:"
 
@@ -2004,51 +1974,49 @@ msgstr "klukkustundir"
 msgid "minutes"
 msgstr "mínútur"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1824
+#: ../calendar/alarm-notify/alarm-queue.c:1703
+#: ../calendar/alarm-notify/alarm-queue.c:1840
 msgid "No summary available."
 msgstr "Engin samantekt til."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1696
-#: ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1712
+#: ../calendar/alarm-notify/alarm-queue.c:1714
 msgid "No description available."
 msgstr "Engin lýsing til."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1706
+#: ../calendar/alarm-notify/alarm-queue.c:1722
 msgid "No location information available."
 msgstr "Ekki upplýsingar um stað til."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1711
-#: ../calendar/alarm-notify/alarm-queue.c:1815
-#: ../calendar/alarm-notify/alarm-queue.c:2156
+#: ../calendar/alarm-notify/alarm-queue.c:1727
+#: ../calendar/alarm-notify/alarm-queue.c:1831
+#: ../calendar/alarm-notify/alarm-queue.c:2178
 msgid "Evolution Reminders"
 msgstr ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1755
+#: ../calendar/alarm-notify/alarm-queue.c:1771
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../calendar/alarm-notify/alarm-queue.c:1974
+#: ../calendar/alarm-notify/alarm-queue.c:1996
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
-#, fuzzy
+#: ../calendar/alarm-notify/alarm-queue.c:1997 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Nei"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
-#, fuzzy
+#: ../calendar/alarm-notify/alarm-queue.c:1998 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Já"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1980
+#: ../calendar/alarm-notify/alarm-queue.c:2002
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2065,7 +2033,7 @@ msgstr ""
 "\n"
 "Ertu viss um að þú vilt keyra þetta forrit?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1995
+#: ../calendar/alarm-notify/alarm-queue.c:2017
 msgid "Do not ask me about this program again."
 msgstr "Ekki spyrja um þetta forrit aftur."
 
@@ -2511,95 +2479,111 @@ msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:93
-msgid "Failed to create an event in a calendar '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:95
-msgid "Failed to create a memo in a memo list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:97
-msgid "Failed to create a task in a task list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:99
-msgid "Failed to modify an event in a calendar '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:101
-msgid "Failed to modify a memo in a memo list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:103
-msgid "Failed to modify a task in a task list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:105
-msgid "Failed to delete an event in a calendar '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:107
-msgid "Failed to delete a memo in a memo list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:109
 #, fuzzy
-msgid "Failed to delete a task in a task list '{0}'"
+msgid "Failed to delete a task in the task list '{0}'"
 msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:111
-msgid "Failed to update an event in a calendar '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:113
-msgid "Failed to update a memo in a memo list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:115
-msgid "Failed to update a task in a task list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:117
-msgid "Failed to send an event to a calendar '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:119
-msgid "Failed to send a memo to a memo list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:121
 #, fuzzy
-msgid "Failed to send a task to a task list '{0}'"
+msgid "Failed to send a task to the task list '{0}'"
 msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:123
-msgid "Error creating view for a calendar '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Error creating view for the calendar '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:125
-msgid "Error creating view for a task list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Error creating view for the task list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:127
-msgid "Error creating view for a memo list '{0}'"
-msgstr ""
+#, fuzzy
+msgid "Error creating view for the memo list '{0}'"
+msgstr "Eyða"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:129
@@ -2749,7 +2733,7 @@ msgstr "Einka"
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
 #: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
 #: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
+#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Trúnaðarmál"
 
@@ -2766,7 +2750,7 @@ msgstr "Þáttakandi"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
@@ -2779,21 +2763,21 @@ msgstr "Flokkur"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "Attachments"
 msgstr "Viðhengi"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 msgid "Exist"
 msgstr "Er til"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr "Er ekki til"
 
@@ -2806,19 +2790,19 @@ msgstr "Endurtekning"
 
 #: ../calendar/gui/caltypes.xml.h:20
 msgid "Occurs"
-msgstr ""
+msgstr "Gerist"
 
 #: ../calendar/gui/caltypes.xml.h:21
 msgid "Less Than"
-msgstr ""
+msgstr "minna en"
 
 #: ../calendar/gui/caltypes.xml.h:22
 msgid "Exactly"
-msgstr ""
+msgstr "nákvæmlega"
 
 #: ../calendar/gui/caltypes.xml.h:23
 msgid "More Than"
-msgstr ""
+msgstr "meira en"
 
 #: ../calendar/gui/caltypes.xml.h:24 ../calendar/gui/memotypes.xml.h:17
 #: ../calendar/gui/tasktypes.xml.h:28
@@ -2832,7 +2816,7 @@ msgstr "Lýsing inniheldur"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
-msgstr ""
+msgstr "Breyta áminningu"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
 #: ../calendar/gui/e-alarm-list.c:424
@@ -2884,12 +2868,12 @@ msgstr "dag(ar)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
 msgid "Add Reminder"
-msgstr ""
+msgstr "Bæta við áminningu"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 #: ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
-msgstr ""
+msgstr "Áminning"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
@@ -2897,7 +2881,7 @@ msgstr "Endurtekning"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
-msgstr ""
+msgstr "Endu_rtaka áminninguna"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
@@ -2914,7 +2898,7 @@ msgstr "S_kilaboð"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom reminder sound"
-msgstr ""
+msgstr "Sérsniðið hljóð áminningar"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Sound:"
@@ -2944,7 +2928,7 @@ msgstr "Aðgerð/byrjar"
 #: ../calendar/gui/dialogs/event-page.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
-msgstr ""
+msgstr "Áminningar"
 
 #: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
@@ -3048,10 +3032,10 @@ msgstr ""
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:374 ../e-util/e-html-editor-dialog.c:196
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
 #: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
@@ -3060,39 +3044,38 @@ msgid "_Close"
 msgstr "_Loka"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1223
-#, fuzzy
 #| msgid "Close this window"
 msgid "Close the current window"
 msgstr "Loka núverandi glugga"
 
 #. copy menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:959 ../e-util/e-text.c:2089
-#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../e-util/e-html-editor-actions.c:1094 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:377 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Afrita"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1325 ../mail/e-mail-browser.c:135
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:379
+#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
 #: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Afrita val"
 
 #. cut menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:936
 #, fuzzy
-#: ../e-util/e-html-editor-actions.c:966 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "_Klippa"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1319
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1409
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Klippa val"
 
@@ -3104,64 +3087,60 @@ msgstr "Eyða vali"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
-msgstr ""
+msgstr "Skoða hjálp"
 
 #. paste menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#, fuzzy
-#: ../e-util/e-html-editor-actions.c:973 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
+#: ../e-util/e-html-editor-actions.c:1108 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Líma"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1331
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1421
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Líma klippiborð"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:428 ../mail/e-mail-reader.c:2262
-#: ../modules/addressbook/e-book-shell-view-actions.c:1263
-#: ../modules/addressbook/e-book-shell-view-actions.c:1277
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2267
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "_Prenta..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
-#, fuzzy
-#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2274
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
 #: ../modules/calendar/e-cal-shell-view-actions.c:1642
 #: ../modules/calendar/e-memo-shell-view-actions.c:764
 #: ../modules/calendar/e-task-shell-view-actions.c:964
 #| msgid "Preview:"
 msgid "Pre_view..."
-msgstr "Forsýn"
+msgstr "_Forskoðun..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
-msgstr ""
+msgstr "Vista núverandi breytingar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1284
-#, fuzzy
 #: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
-msgstr "Vista og loka..."
+msgstr "Vista og loka"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
-msgstr ""
+msgstr "Vista núverandi breytingar og loka glugga"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#, fuzzy
-#: ../e-util/e-html-editor-actions.c:987 ../e-util/e-web-view.c:349
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
+#: ../e-util/e-html-editor-actions.c:1122 ../e-util/e-web-view.c:387
+#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
-msgstr "Velja _Allt"
+msgstr "Velja _allt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Velja allan texta"
 
@@ -3170,36 +3149,36 @@ msgid "_Classification"
 msgstr "_Flokkun"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1010
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../e-util/e-html-editor-actions.c:1145
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Skrá"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1031
+#: ../e-util/e-html-editor-actions.c:1166
 msgid "_Insert"
 msgstr "_Innsetja"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Valkostir"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1052 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1120
+#: ../e-util/e-html-editor-actions.c:1187 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1121
 #: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "S_koða"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1366
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "Við_hengi"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:369 ../e-util/e-attachment-view.c:412
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:448
 msgid "Attach a file"
 msgstr "Attach a file"
 
@@ -3212,7 +3191,6 @@ msgid "Toggles whether to display categories"
 msgstr "Skipta hvort eigi að sýna flokka"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1384
-#| msgid "Time _zone:"
 msgid "Time _Zone"
 msgstr "Tíma_belti"
 
@@ -3277,7 +3255,7 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Skiptir um hvort að svæði fyrir gerð þáttakenda er sýnt"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2232
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Viðhengi"
 
@@ -3421,7 +3399,7 @@ msgstr ""
 "skipuleggjandi þess"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3178
+#: ../calendar/gui/dialogs/event-page.c:3180
 msgid "This event has reminders"
 msgstr ""
 
@@ -3475,35 +3453,33 @@ msgstr "_Umsjónarmenn"
 msgid "Atte_ndees"
 msgstr "Þáttakendur"
 
-#: ../calendar/gui/dialogs/event-page.c:3458
+#: ../calendar/gui/dialogs/event-page.c:3460
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "%d dag fyrir atburðinn"
 msgstr[1] "%d daga fyrir atburðinn"
 
-#: ../calendar/gui/dialogs/event-page.c:3464
+#: ../calendar/gui/dialogs/event-page.c:3466
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "%d klukkustund fyrir atburðinn"
 msgstr[1] "%d klukkustundir fyrir atburðinn"
 
-#: ../calendar/gui/dialogs/event-page.c:3470
+#: ../calendar/gui/dialogs/event-page.c:3472
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "%d mínútu fyrir atburðinn"
 msgstr[1] "%d mínútur fyrir atburðinn"
 
-#: ../calendar/gui/dialogs/event-page.c:3491
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:3493
 msgid "Custom"
 msgstr "Sérsniðið"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3498
-#, fuzzy
+#: ../calendar/gui/dialogs/event-page.c:3500
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ekkert"
@@ -3546,8 +3522,8 @@ msgstr "_Staðsetning:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:514
-#: ../e-util/e-html-editor-link-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:374
 msgid "_Description:"
 msgstr "_Lýsing:"
 
@@ -3659,9 +3635,9 @@ msgstr ""
 "Minnimmiða er ekki hægt að breya að fullu þar sem að þú ert ekki "
 "skipuleggjandi"
 
-#: ../calendar/gui/dialogs/memo-page.c:1166
-#: ../em-format/e-mail-formatter-utils.c:201
-#: ../em-format/e-mail-formatter-utils.c:218
+#: ../calendar/gui/dialogs/memo-page.c:1168
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
 #: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
 #: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
 #: ../modules/mail/em-mailer-prefs.c:64
@@ -3669,11 +3645,10 @@ msgid "To"
 msgstr "Til"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#, fuzzy
 #: ../calendar/gui/dialogs/task-page.c:426
 #: ../calendar/gui/dialogs/task-page.ui.h:34
 msgid "_List:"
-msgstr "listi"
+msgstr "_Listi:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
 #: ../calendar/gui/dialogs/task-page.c:434
@@ -3932,7 +3907,6 @@ msgstr "þar til"
 
 #. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-#| msgid "Never"
 msgctxt "recurrpage"
 msgid "forever"
 msgstr "endalaust"
@@ -3950,7 +3924,6 @@ msgid "Exceptions"
 msgstr "Undantekningar"
 
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-#| msgid "Preview:"
 msgid "Preview"
 msgstr "Forsýn"
 
@@ -4091,14 +4064,12 @@ msgid "D_ue date:"
 msgstr "Fram_kvæmda dagur:"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:28
-#| msgid "Time _zone:"
 msgid "Time zone:"
 msgstr "Tímabelti:"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:35
-#, fuzzy
 msgid "_Status:"
-msgstr "Staða:"
+msgstr "_Staða:"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:36
 msgid "Date _completed:"
@@ -4109,13 +4080,12 @@ msgid "_Percent complete:"
 msgstr ""
 
 #: ../calendar/gui/dialogs/task-page.ui.h:38
-#, fuzzy
 msgid "Priorit_y:"
 msgstr "F_organgur:"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:39
 msgid "C_lassification:"
-msgstr ""
+msgstr "_Flokkun:"
 
 #: ../calendar/gui/dialogs/task-page.ui.h:40
 msgid "_Web Page:"
@@ -4319,15 +4289,15 @@ msgstr "Byrja dags:"
 
 #: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
-msgstr ""
+msgstr "Lokadagur"
 
 #: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Dagur atriðis:"
 
 #: ../calendar/gui/e-cal-component-preview.c:309
-#: ../modules/itip-formatter/itip-view.c:1496
-#: ../modules/itip-formatter/itip-view.c:1613
+#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1636
 msgid "Status:"
 msgstr "Staða:"
 
@@ -4344,17 +4314,17 @@ msgstr "Lýsing:"
 msgid "Web Page:"
 msgstr "Vefsíða:"
 
-#: ../calendar/gui/e-cal-data-model.c:1608
+#: ../calendar/gui/e-cal-data-model.c:1625
 #, c-format
 msgid "Creating view for calendar '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-data-model.c:1612
+#: ../calendar/gui/e-cal-data-model.c:1629
 #, c-format
 msgid "Creating view for task list '%s'"
 msgstr ""
 
-#: ../calendar/gui/e-cal-data-model.c:1616
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
 msgid "Creating view for memo list '%s'"
 msgstr ""
@@ -4508,7 +4478,7 @@ msgstr "%A %d %b %Y"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2978
 #: ../calendar/gui/e-day-view-top-item.c:859
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
@@ -4530,7 +4500,7 @@ msgstr "%A %d %b %Y"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2962
 #: ../calendar/gui/e-day-view-top-item.c:855
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
@@ -4556,8 +4526,8 @@ msgstr "Loka dagur"
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3500
-#: ../modules/itip-formatter/itip-view.c:6087
+#: ../modules/itip-formatter/itip-view.c:3606
+#: ../modules/itip-formatter/itip-view.c:6196
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Unknown"
@@ -4608,14 +4578,14 @@ msgstr "Nei"
 #: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6075
+#: ../modules/itip-formatter/itip-view.c:6184
 msgid "Accepted"
 msgstr "Samþykkt"
 
 #: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6081
+#: ../modules/itip-formatter/itip-view.c:6190
 msgid "Declined"
 msgstr "Hafnað"
 
@@ -4629,7 +4599,7 @@ msgstr "Bráðabirgða"
 #: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6084
+#: ../modules/itip-formatter/itip-view.c:6193
 msgid "Delegated"
 msgstr "Fulltrúi"
 
@@ -4702,11 +4672,11 @@ msgstr[0] "Eyða"
 msgstr[1] "Eyða"
 
 #: ../calendar/gui/e-cal-ops.c:492
-#, fuzzy, c-format
+#, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
-msgstr[0] "Eyða"
-msgstr[1] "Eyða"
+msgstr[0] "Eyði verkefni"
+msgstr[1] "Eyði %d verkefnum"
 
 #: ../calendar/gui/e-cal-ops.c:692
 #, c-format
@@ -4803,31 +4773,31 @@ msgstr[1] ""
 
 #: ../calendar/gui/e-cal-ops.c:2041
 #, fuzzy, c-format
-msgid "Moving an memo"
+msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Vista í möppu..."
 msgstr[1] "Vista í möppu..."
 
 #: ../calendar/gui/e-cal-ops.c:2042
-#, c-format
-msgid "Copying an memo"
+#, fuzzy, c-format
+msgid "Copying a memo"
 msgid_plural "Copying %d memos"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vista í möppu..."
+msgstr[1] "Vista í möppu..."
 
 #: ../calendar/gui/e-cal-ops.c:2048
 #, fuzzy, c-format
-msgid "Moving an task"
+msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Vista í möppu..."
 msgstr[1] "Vista í möppu..."
 
 #: ../calendar/gui/e-cal-ops.c:2049
-#, c-format
-msgid "Copying an task"
+#, fuzzy, c-format
+msgid "Copying a task"
 msgid_plural "Copying %d tasks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vista í möppu..."
+msgstr[1] "Vista í möppu..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:165
@@ -4849,14 +4819,14 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
+#: ../calendar/gui/e-day-view.c:2066 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
 #: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
+#: ../calendar/gui/e-day-view.c:2069 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
 #: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
@@ -4868,13 +4838,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-day-view.c:2945 ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3574
+#: ../calendar/gui/e-day-view.c:3609
 #, c-format
 msgid "Week %d"
 msgstr "Vika %d"
@@ -4885,27 +4855,27 @@ msgstr "Vika %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:802
+#: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i mínútna millibili"
 
-#: ../calendar/gui/e-day-view-time-item.c:827
+#: ../calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Sýna annað tímabelti"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:844
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:846
+#: ../modules/calendar/e-calendar-preferences.c:306
+#: ../modules/calendar/e-calendar-preferences.c:358
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Engin"
 
-#: ../calendar/gui/e-day-view-time-item.c:878
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../calendar/gui/e-day-view-time-item.c:880
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:389
 msgid "Select..."
 msgstr "Velja..."
 
@@ -5107,7 +5077,7 @@ msgid "Language"
 msgstr "Tungumál"
 
 #: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1573
+#: ../modules/calendar/e-cal-shell-content.c:1600
 #: ../modules/calendar/e-memo-shell-view-actions.c:180
 #: ../modules/calendar/e-memo-shell-view-actions.c:195
 #: ../modules/calendar/e-memo-shell-view.c:308
@@ -5164,9 +5134,9 @@ msgstr "%d%%"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1072
+#: ../calendar/importers/icalendar-importer.c:1062
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1531
+#: ../modules/calendar/e-cal-shell-content.c:1560
 #: ../modules/calendar/e-task-shell-view-actions.c:203
 #: ../modules/calendar/e-task-shell-view-actions.c:218
 #: ../modules/calendar/e-task-shell-view.c:466
@@ -5194,7 +5164,7 @@ msgstr "Eyða völdum verkum"
 msgid "Select all visible tasks"
 msgstr "Velja öll sýnileg verk"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Veldu tímabelti"
 
@@ -5274,7 +5244,7 @@ msgstr "Hafnað"
 #: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
-msgstr ""
+msgstr "Úthlutað"
 
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
@@ -5288,7 +5258,6 @@ msgstr "Uppfært:"
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
 #: ../calendar/gui/itip-utils.c:1019
-#| msgid "France"
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Hætt við"
@@ -5312,7 +5281,7 @@ msgstr "Mótboð"
 #: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
-msgstr ""
+msgstr "Laus/upptekinn upplýsingar (%s til %s)"
 
 #: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
@@ -5325,21 +5294,20 @@ msgstr "Gat ekki bókað viðburð en það er árekstur við annan viðburð."
 
 #: ../calendar/gui/itip-utils.c:1153
 msgid "Unable to book a resource, error: "
-msgstr ""
+msgstr "Gat ekki bókað tilfang, villa: "
 
 #: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Þú verður að vera þáttakandi í viðburðinum."
 
 #: ../calendar/gui/itip-utils.c:1917
-#, fuzzy
 #| msgid "Send / Receive"
 msgid "Sending an event"
-msgstr "Senda / Sækja"
+msgstr "Sendi atburð"
 
 #: ../calendar/gui/itip-utils.c:1921
 msgid "Sending a memo"
-msgstr ""
+msgstr "Sendi minnismiða"
 
 #: ../calendar/gui/itip-utils.c:1925
 msgid "Sending a task"
@@ -5533,19 +5501,22 @@ msgstr "Lokið"
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
 #: ../calendar/gui/print.c:3335
+#, fuzzy
 msgid " (Due "
-msgstr ""
+msgstr "Á dagskrá"
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
 #: ../calendar/gui/print.c:3342
+#, fuzzy
 msgid "Due "
-msgstr ""
+msgstr "Á dagskrá"
 
 #: ../calendar/gui/print.c:3546
+#, fuzzy
 msgid "Attendees: "
-msgstr ""
+msgstr "_Þáttakendur..."
 
 #: ../calendar/gui/print.c:3590
 #, c-format
@@ -5577,8 +5548,9 @@ msgid "Contacts: "
 msgstr "Tengiliðir: "
 
 #: ../calendar/gui/tasktypes.xml.h:12
+#, fuzzy
 msgid "In progress"
-msgstr ""
+msgstr "Í vinnslu"
 
 #: ../calendar/gui/tasktypes.xml.h:25
 #, no-c-format
@@ -5599,193 +5571,194 @@ msgstr "er minna en"
 msgid "Appointments and Meetings"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "Opnar dagatal"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar skrár (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar skrár (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1065
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "Viðburða dagatal"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1098
 msgid "Gnome Calendar"
 msgstr "GNOME dagatal"
 
-#: ../calendar/importers/icalendar-importer.c:1109
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Fundur"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Viðburður"
 
-#: ../calendar/importers/icalendar-importer.c:1183
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
-msgstr ""
+msgstr "Verkefni"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#, fuzzy
-#: ../calendar/importers/icalendar-importer.c:1496
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Minnismiði"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr ""
 
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr ""
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1213
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Opið"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1226
+#: ../calendar/importers/icalendar-importer.c:1216
+#, fuzzy
 msgctxt "iCalImp"
 msgid "Private"
-msgstr ""
+msgstr "Einka"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1219
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Trúnaðarmál"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1223
+#, fuzzy
 msgctxt "iCalImp"
 msgid "Classification"
-msgstr ""
+msgstr "Flokkun"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1238
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Samantekt"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Staðsetning"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 #, fuzzy
-#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Byrja"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1263
+#: ../calendar/importers/icalendar-importer.c:1253
+#, fuzzy
 msgctxt "iCalImp"
 msgid "Due"
-msgstr ""
+msgstr "Á dagskrá"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1265
 #, fuzzy
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Enda"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1285
+#: ../calendar/importers/icalendar-importer.c:1275
+#, fuzzy
 msgctxt "iCalImp"
 msgid "Categories"
-msgstr ""
+msgstr "Flokkar"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1309
+#: ../calendar/importers/icalendar-importer.c:1299
 #, fuzzy
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Lokið"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1307
 #, fuzzy
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1328
-#: ../calendar/importers/icalendar-importer.c:1331
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
-msgstr ""
+msgstr "Skipuleggjandi"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1351
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
-msgstr ""
+msgstr "Þáttakendur"
 
-#: ../calendar/importers/icalendar-importer.c:1368
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Lýsing"
 
-#: ../calendar/importers/icalendar-importer.c:1528
-#, fuzzy
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
-msgstr "Gerð"
+msgstr "Tegund"
 
 #.
 #. *
@@ -7334,158 +7307,181 @@ msgstr "Pacific/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pacific/Yap"
 
-#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
-#, fuzzy
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Ekki sýna þessi skilaboð framar"
-
-#: ../composer/e-composer-actions.c:265
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Vista sem..."
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Loka opinni skrá"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "Nýr _póstur"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Opna glugga fyrir nýjan póst"
 
-#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
-#, fuzzy
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
-msgstr "_Stillingar"
+msgstr "_Kjörstillingar"
 
-#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
-msgstr ""
+msgstr "Stilla Evolution"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Vista opna skrá"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Vista _sem..."
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Vista opna skrá með öðru nafni"
 
-#: ../composer/e-composer-actions.c:411
-#, fuzzy
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
-msgstr "Sta_fatafla:"
+msgstr "Sta_fatafla"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Prent _forsýn"
 
-#: ../composer/e-composer-actions.c:442
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Vista sem _drög"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Vista sem drög"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "_Senda"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Senda þennan póst"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
-msgstr ""
+msgstr "_PGP Dulritun"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
-msgstr ""
+msgstr "Dulritun með PGP"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
-msgstr ""
+msgstr "PGP _undirritun"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:475
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
-msgstr ""
+msgstr "_Myndasafn"
 
-#: ../composer/e-composer-actions.c:477
+#: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:483
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:485
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:491
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#, fuzzy
+msgid "Unicode smileys"
+msgstr "Unicode (UTF-8)"
+
+#: ../composer/e-composer-actions.c:525
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr ""
+
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:565
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:573
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:547
+msgid "_From Override Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:549
+#, fuzzy
+#| msgid "Toggles whether the Role field is displayed"
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "Skipta um hvort hlutverka svæði sé sýnt"
+
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:581
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr ""
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr ""
 
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
+msgid "_Name:"
+msgstr "_Nafn:"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr ""
@@ -7500,43 +7496,38 @@ msgid ""
 "appearing in the recipient list of the message"
 msgstr ""
 
-#: ../composer/e-composer-header-table.c:770
-#, fuzzy
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
-msgstr "Frá:"
+msgstr "_Frá:"
 
-#: ../composer/e-composer-header-table.c:777
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
-msgstr ""
+msgstr "Sva_ra-til:"
 
-#: ../composer/e-composer-header-table.c:782
-#, fuzzy
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../composer/e-composer-header-table.c:788
-#, fuzzy
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:794
-#, fuzzy
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:799
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
-msgstr ""
+msgstr "_Senda til:"
 
-#: ../composer/e-composer-header-table.c:803
-#, fuzzy
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
-msgstr "_Efnislína:"
+msgstr "_Viðfangsefni:"
 
-#: ../composer/e-composer-header-table.c:811
-#: ../mail/e-mail-config-identity-page.c:505
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:504
 msgid "Si_gnature:"
-msgstr ""
+msgstr "Un_dirritun:"
 
 #: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
@@ -7546,24 +7537,24 @@ msgstr ""
 msgid "Click here to select folders to post to"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:858
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:880
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:1581 ../composer/e-msg-composer.c:2147
+#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2282
 msgid "Compose Message"
 msgstr ""
 
-#: ../composer/e-msg-composer.c:4390
+#: ../composer/e-msg-composer.c:4605
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 
@@ -7595,11 +7586,11 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:7
 msgid "_Do not Recover"
-msgstr ""
+msgstr "_Ekki endurheimta"
 
 #: ../composer/mail-composer.error.xml.h:8
 msgid "_Recover"
-msgstr ""
+msgstr "Endu_rheimta"
 
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not save to autosave file &quot;{0}&quot;."
@@ -7639,7 +7630,7 @@ msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:19
 msgid "_Save Draft"
-msgstr ""
+msgstr "Vista _drög"
 
 #: ../composer/mail-composer.error.xml.h:20
 msgid "Are you sure you want to discard the message you are composing?"
@@ -7696,7 +7687,6 @@ msgid "_Save to Outbox"
 msgstr ""
 
 #: ../composer/mail-composer.error.xml.h:33
-#, fuzzy
 msgid "_Try Again"
 msgstr "Re_yndu aftur"
 
@@ -7725,6 +7715,28 @@ msgid ""
 "sending the message, if it was done by an accident, or send the message."
 msgstr ""
 
+#: ../composer/mail-composer.error.xml.h:39
+#, fuzzy
+#| msgid "Are you sure you want to delete this memo?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Ertu viss um að þú viljir eyða þessum minnismiða?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr ""
+
+#: ../composer/mail-composer.error.xml.h:42
+#, fuzzy
+#| msgid "No Information"
+msgid "Lose _formatting"
+msgstr "Engar upplýsingar"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr ""
@@ -7733,7 +7745,7 @@ msgstr ""
 msgid "Calendar event notifications"
 msgstr "Tilkynningar viðburða dagatals"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1054
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7808,7 +7820,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
 msgid "Contact preview pane position (horizontal)"
-msgstr ""
+msgstr "Staðsetning forskoðunarglugga tengiliða (lárétt)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:12
 msgid "Position of the contact preview pane when oriented horizontally."
@@ -7816,7 +7828,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:13
 msgid "Contact preview pane position (vertical)"
-msgstr ""
+msgstr "Staðsetning forskoðunarglugga tengiliða (lóðrétt)"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:14
 msgid "Position of the contact preview pane when oriented vertically."
@@ -7828,7 +7840,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
 msgid "Whether to show maps in preview pane"
-msgstr ""
+msgstr "Hvort eigi að birta landakort í forskoðunarglugga"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:17
 msgid "Primary address book"
@@ -7842,14 +7854,13 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:19
 msgid "Show preview pane"
-msgstr ""
+msgstr "Birta forskoðunarglugga"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:20
 msgid "Whether to show the preview pane."
-msgstr ""
+msgstr "Hvort eigi að birta forskoðunarglugga."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
-#, fuzzy
 msgid "true"
 msgstr "satt"
 
@@ -7903,6 +7914,17 @@ msgid ""
 "different character sets."
 msgstr ""
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr ""
@@ -8227,7 +8249,6 @@ msgid "Name of the preferred New toolbar button item"
 msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
-#| msgid "New calendar"
 msgid "Primary calendar"
 msgstr "Aðal dagatal"
 
@@ -8325,7 +8346,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "Highlight tasks due today"
-msgstr ""
+msgstr "Áherslulita verkefni sem á að ljúka í dag"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid ""
@@ -8367,7 +8388,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Highlight overdue tasks"
-msgstr ""
+msgstr "Áherslulita verkefni sem á að vera búið að ljúka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid ""
@@ -8524,7 +8545,7 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:9
 msgid "Whether the window is maximized"
-msgstr ""
+msgstr "Hvort glugginn er hámarkaður"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
 msgid "Gnome Calendar's calendar import done"
@@ -8591,44 +8612,46 @@ msgid "Automatic emoticon recognition"
 msgstr ""
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Group Reply replies to list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8636,106 +8659,116 @@ msgid ""
 "replying."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Put the cursor at the bottom of replies"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
 "message or the bottom."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Always request read receipt"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Send HTML mail by default"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Send HTML mail by default."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Show \"From\" override field when sending a mail message"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8743,42 +8776,42 @@ msgid ""
 "standard."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid "Send messages through Outbox folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Put personalized signatures at the top of replies"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
 "the message or the bottom."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Do not add signature delimiter"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Ignore list Reply-To:"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8789,250 +8822,260 @@ msgid ""
 "Post: header, if there is one."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
 "prefix. An example is 'SV,AV'."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Enable developer mode"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enables some hidden actions and tools aimed for development and debugging."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Will autowrap lines after given number of characters."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Save file format for drag-and-drop operation"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Show image animations"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable magic space bar"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Citation highlight color"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Citation highlight color."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable/disable caret mode"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Default charset in which to display messages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Default charset in which to display messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show Animations"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Show animated images as animations."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show all message headers"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show all the headers when viewing a messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "List of headers to show when viewing a message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
 "when viewing a message, but are still listed in Preferences."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show photo of the sender"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show the photo of the sender in the message reading pane."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Search gravatar.com for photo of the sender"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid "Mark as Seen always after specified timeout"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Timeout for marking messages as seen"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Sender email-address column in the message list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show deleted messages in the message-list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Enable Unmatched search folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Hides the per-folder preview and removes the selection"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Height of the message-list pane"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Height of the message-list pane."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Whether message headers are collapsed in the user interface"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Width of the message-list pane"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Width of the message-list pane."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Layout style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9040,86 +9083,96 @@ msgid ""
 "message list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Variable width font"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The variable width font for mail display."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Terminal font"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The terminal font for mail display."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Use custom fonts"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Use custom fonts for displaying mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Thread the message-list based on Subject"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default value for thread expand state"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
 "restart."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+msgid "Whether sort thread children always ascending"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9127,138 +9180,138 @@ msgid ""
 "given by a user"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Log filter actions"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Flush Outbox after filtering"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
 "one minute after the last action invocation."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Default forward style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Default reply style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when emptying the trash"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt while marking multiple messages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when deleting messages in search folder"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
 "the search results."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9266,11 +9319,11 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9278,152 +9331,164 @@ msgid ""
 "ask user."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when replying privately to list messages"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when mailing list hijacks private replies"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
 "sets a Reply-To: header which redirects your reply back to the list"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when replying to many recipients"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Empty Trash folders on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Last time Empty Trash was run"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Fjöldi sekúnda sem að villan er sýnd í stöðulínu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Level beyond which the message should be logged."
 msgstr "Stig umfram það sem að skilaboðin skulu skráð."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Show original \"Date\" header value."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
 "format and local time zone."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "List of Labels and their associated colors"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Check incoming mail being junk"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Run junk test on incoming mail."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Empty Junk folders on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Minimum days between emptying the junk on exit"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Last time Empty Junk was run"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "The default plugin for Junk hook"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
 "to the other available plugins."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9431,97 +9496,96 @@ msgid ""
 "autocompletion."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
 "checking speed."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "UID string of the default account."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
-#, fuzzy
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Save directory"
-msgstr "Vistunarmappa:"
+msgstr "Vistunarmappa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Directory for saving mail component files."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Composer load/attach directory"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Directory for loading/attaching files to composer."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Check for new messages on start"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Check for new messages in all active accounts"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
 "started. This option is used only together with 'send_recv_on_start' option."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Server synchronization interval"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Allow expunge in virtual folders"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -9529,63 +9593,74 @@ msgid ""
 "for deleted messages belonging to the virtual folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "An Archive folder for On This Computer folders."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "(Deprecated) Default forward style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "(Deprecated) Default reply style"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
 msgstr ""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9785,7 +9860,6 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
-#| msgid "Use underline"
 msgid "Use sound theme"
 msgstr ""
 
@@ -9896,7 +9970,6 @@ msgid ""
 msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
-#, fuzzy
 msgid "Toolbar is visible"
 msgstr "Verkfærastika sýnileg"
 
@@ -9940,8 +10013,29 @@ msgstr ""
 msgid "Use only the local spam tests (no DNS)."
 msgstr ""
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../em-format/e-mail-formatter-attachment.c:405
-#, fuzzy
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
@@ -9963,24 +10057,23 @@ msgid "Play the attachment in embedded audio player"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#, fuzzy
 #: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
 #: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
-msgstr "Frá:"
+msgstr "Frá"
 
 #: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
-msgstr ""
+msgstr "(ekkert viðfangsefni)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-image.c:170
 msgid "Regular Image"
-msgstr ""
+msgstr "Venjuleg mynd"
 
 #: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
@@ -9997,94 +10090,65 @@ msgstr ""
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1271
-#: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Nafn"
 
 #: ../em-format/e-mail-formatter-print.c:53
-#, fuzzy
 #: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Stærð"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr ""
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr ""
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr ""
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr ""
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#, fuzzy
-#: ../mail/e-mail-config-security-page.c:736
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
-msgid "Security"
-msgstr "Öryggi"
-
 #: ../em-format/e-mail-formatter-quote-headers.c:174
-#, fuzzy
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
 #: ../modules/mail/em-mailer-prefs.c:67
 #: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
-msgstr "_Efnislína:"
+msgstr "Efni"
 
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:193
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1166
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1484
 msgid "Mailer"
-msgstr ""
+msgstr "Póstþjónn"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "HTML"
-msgstr ""
+msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:361
 msgid "Format part as HTML"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#, fuzzy
-#: ../em-format/e-mail-formatter-text-plain.c:197
-#: ../e-util/e-html-editor-actions.c:1408
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1544
 msgid "Plain Text"
 msgstr "Hreinn texti"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:124
-#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr ""
 
 #: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "Unsigned"
-msgstr ""
+msgstr "Óundirritað"
 
 #: ../em-format/e-mail-formatter-secure-button.c:51
 msgid ""
@@ -10175,10 +10239,9 @@ msgid ""
 msgstr ""
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#, fuzzy
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
-msgstr "S_koða skilríkið"
+msgstr "S_koða skilríki"
 
 #: ../em-format/e-mail-formatter-secure-button.c:202
 msgid "This certificate is not viewable"
@@ -10192,19 +10255,43 @@ msgstr "Upptök"
 msgid "Display source of a MIME part"
 msgstr ""
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#, fuzzy
-#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
-msgstr "_Cc:"
+msgstr "Cc"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#, fuzzy
-#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
 #: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
-msgstr "_Bcc:"
+msgstr "Bcc"
+
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-utils.c:570
+#, fuzzy
+#| msgid "No encryption"
+msgid "GPG encrypted"
+msgstr "Án dulritunar"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr ""
+
+#: ../em-format/e-mail-formatter-utils.c:582
+#, fuzzy
+msgid "S/MIME encrypted"
+msgstr "MIME tegund:"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:736
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "Öryggi"
 
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
@@ -10278,25 +10365,24 @@ msgstr ""
 msgid "Reply-To"
 msgstr ""
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
-#, fuzzy
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:551
+#: ../e-util/e-dateedit.c:574 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Dagsetning"
 
 #: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
-msgstr ""
+msgstr "Fréttahópar"
 
 #: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
-#, fuzzy
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
 msgid "Face"
 msgstr "Fés"
 
-#: ../em-format/e-mail-part-utils.c:508
-#, fuzzy, c-format
+#: ../em-format/e-mail-part-utils.c:544
+#, c-format
 msgid "%s attachment"
 msgstr "%s viðhengi"
 
@@ -10351,12 +10437,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% lokið)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1824
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Hætta við"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr ""
 
@@ -10364,13 +10450,11 @@ msgstr ""
 msgid "Failed to create a thread: "
 msgstr ""
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
-#, fuzzy
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:738
 msgid "Icon View"
 msgstr "Táknmyndasýn"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
-#, fuzzy
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:740
 msgid "List View"
 msgstr "Listasýn"
 
@@ -10378,58 +10462,58 @@ msgstr "Listasýn"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1197
+#: ../e-util/e-attachment.c:1223
 msgid "Attached message"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
 msgid "Operation was cancelled"
 msgstr ""
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
-#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
+#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
 msgid "attachment.dat"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
 msgid "A load operation is already in progress"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
 msgid "A save operation is already in progress"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2473
+#: ../e-util/e-attachment.c:2521
 #, c-format
 msgid "Could not load '%s'"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2476
+#: ../e-util/e-attachment.c:2524
 #, c-format
 msgid "Could not load the attachment"
 msgstr ""
 
-#: ../e-util/e-attachment.c:2761
-#, fuzzy, c-format
+#: ../e-util/e-attachment.c:2809
+#, c-format
 msgid "Could not open '%s'"
-msgstr "Ekki tókst að opna \"%s\""
+msgstr "Tókst ekki að opna \"%s\""
 
-#: ../e-util/e-attachment.c:2764
+#: ../e-util/e-attachment.c:2812
 #, c-format
 msgid "Could not open the attachment"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3411
+#: ../e-util/e-attachment.c:3459
 msgid "Attachment contents not loaded"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3502
+#: ../e-util/e-attachment.c:3550
 #, c-format
 msgid "Could not save '%s'"
 msgstr ""
 
-#: ../e-util/e-attachment.c:3505
+#: ../e-util/e-attachment.c:3553
 #, c-format
 msgid "Could not save the attachment"
 msgstr ""
@@ -10439,14 +10523,12 @@ msgid "Attachment Properties"
 msgstr ""
 
 #: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
-#, fuzzy
 msgid "F_ilename:"
-msgstr "Skráarheiti"
+msgstr "Skráar_heiti:"
 
 #: ../e-util/e-attachment-dialog.c:374
-#, fuzzy
 msgid "MIME Type:"
-msgstr "MIME tegund:"
+msgstr "MIME-tegund:"
 
 #: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
@@ -10457,15 +10539,13 @@ msgid "Could not set as background"
 msgstr ""
 
 #: ../e-util/e-attachment-handler-image.c:148
-#, fuzzy
 msgid "Set as _Background"
 msgstr "Setja sem _bakgrunn"
 
 #: ../e-util/e-attachment-icon-view.c:168
-#, fuzzy
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
-msgstr "Hleð..."
+msgstr "Hleð inn"
 
 #: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
@@ -10476,7 +10556,7 @@ msgstr ""
 msgid "Hide Attachment _Bar"
 msgstr ""
 
-#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:754
 msgid "Show Attachment _Bar"
 msgstr ""
 
@@ -10486,7 +10566,7 @@ msgstr ""
 
 #: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
-msgstr ""
+msgstr "Hengja við"
 
 #: ../e-util/e-attachment-store.c:533
 msgid "Archive selected directories using this format:"
@@ -10495,7 +10575,7 @@ msgstr ""
 #: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
-msgstr[0] ""
+msgstr[0] "Vista viðhengi"
 msgstr[1] ""
 
 #: ../e-util/e-attachment-store.c:653
@@ -10510,24 +10590,20 @@ msgstr ""
 msgid "Save extracted files and the original _archive"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:377
-#, fuzzy
+#: ../e-util/e-attachment-view.c:413
 msgid "Open With Other Application..."
 msgstr "Opna með öðru forriti..."
 
-#: ../e-util/e-attachment-view.c:384
-#, fuzzy
+#: ../e-util/e-attachment-view.c:420
 msgid "S_ave All"
-msgstr "_Vista Allt"
+msgstr "Vista _allt"
 
-#: ../e-util/e-attachment-view.c:391
-#, fuzzy
+#: ../e-util/e-attachment-view.c:427
 #| msgid "Save As"
 msgid "Sa_ve As"
-msgstr "Vist_a sem..."
+msgstr "_Vista sem"
 
-#: ../e-util/e-attachment-view.c:400
-#, fuzzy
+#: ../e-util/e-attachment-view.c:436
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
@@ -10535,44 +10611,60 @@ msgstr "Vist_a sem..."
 msgid "Save _As"
 msgstr "Vist_a sem"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:446
 msgid "A_dd Attachment..."
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:417
-#, fuzzy
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../e-util/e-attachment-view.c:453
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
 #: ../modules/calendar/e-cal-shell-view-actions.c:1240
 #: ../modules/calendar/e-memo-shell-view-actions.c:571
 #: ../modules/calendar/e-task-shell-view-actions.c:696
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Eiginleikar"
 
-#: ../e-util/e-attachment-view.c:434
-#, fuzzy
+#: ../e-util/e-attachment-view.c:470
 msgid "_Hide"
 msgstr "_Fela"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:477
 msgid "Hid_e All"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:484
 msgid "_View Inline"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:491
 msgid "Vie_w All Inline"
 msgstr ""
 
-#: ../e-util/e-attachment-view.c:785
+#: ../e-util/e-attachment-view.c:498
+msgid "_Zoom to 100%"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:500
+msgid "Zoom the image to its natural size"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:505
+#, fuzzy
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "Loka þessum glugga"
+
+#: ../e-util/e-attachment-view.c:507
+msgid "Zoom large images to not be wider than the window width"
+msgstr ""
+
+#: ../e-util/e-attachment-view.c:850
 #, fuzzy, c-format
 msgid "Open With \"%s\""
 msgstr "Opna með %s"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../e-util/e-attachment-view.c:853
 #, c-format
 msgid "Open this attachment in %s"
 msgstr ""
@@ -10632,7 +10724,6 @@ msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../e-util/e-calendar-item.c:1362
-#| msgid "%d %B %Y"
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr ""
@@ -10654,15 +10745,15 @@ msgstr ""
 msgid "Color:"
 msgstr "Litur:"
 
-#: ../e-util/e-cal-source-config.c:405
+#: ../e-util/e-cal-source-config.c:428
 msgid "Copy calendar contents locally for offline operation"
 msgstr ""
 
-#: ../e-util/e-cal-source-config.c:409
+#: ../e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
 msgstr ""
 
-#: ../e-util/e-cal-source-config.c:413
+#: ../e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
 msgstr ""
 
@@ -10676,11 +10767,24 @@ msgstr "Tiltækir flokk_ar:"
 
 #: ../e-util/e-categories-editor.c:274
 #, fuzzy
-#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1099
+msgctxt "category"
 msgid "_New"
 msgstr "_Nýtt"
 
+#: ../e-util/e-categories-editor.c:278
+#, fuzzy
+#| msgid "_Edit"
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Breyta"
+
+#: ../e-util/e-categories-editor.c:282
+#, fuzzy
+#| msgid "_Delete"
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Eyða"
+
 #: ../e-util/e-categories-selector.c:322
 #, fuzzy
 msgid "Icon"
@@ -10841,8 +10945,9 @@ msgstr ""
 
 #. Translators: Character set "Cyrillic, Ukrainian"
 #: ../e-util/e-charset.c:100
+#, fuzzy
 msgid "Ukrainian"
-msgstr ""
+msgstr "Úkraínska"
 
 #. Translators: Character set "Hebrew, Visual"
 #: ../e-util/e-charset.c:104
@@ -10863,7 +10968,7 @@ msgstr ""
 msgid "Other..."
 msgstr "Annað..."
 
-#: ../e-util/e-client-cache.c:1209
+#: ../e-util/e-client-cache.c:1285
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr ""
@@ -10890,8 +10995,9 @@ msgid "dark green #2"
 msgstr ""
 
 #: ../e-util/e-color-combo.c:85
+#, fuzzy
 msgid "navy"
-msgstr ""
+msgstr "Flotablátt (#000080)"
 
 #: ../e-util/e-color-combo.c:86
 msgid "dark blue"
@@ -11049,40 +11155,40 @@ msgid "white"
 msgstr "Hvítt"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
-#, fuzzy
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3857
-#: ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3959
+#: ../mail/mail-config.ui.h:70
+#, fuzzy
 msgid "Default"
 msgstr "Sjálfgefið"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-dateedit.c:525
 msgid "Date and Time"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:550
 msgid "Text entry to input date"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:573
 msgid "Click this button to show a calendar"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:627
 msgid "Drop-down combination box to select time"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:628
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Tími"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:702
 #, fuzzy
 msgid "No_w"
 msgstr "_Núna"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:709
 #, fuzzy
 #| msgid "Today"
 msgid "_Today"
@@ -11090,24 +11196,24 @@ msgstr "Í _dag"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:718
 #, fuzzy
 msgid "_None"
 msgstr "_Ekkert"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../e-util/e-dateedit.c:1840 ../e-util/e-dateedit.c:2088
 #, fuzzy
 msgctxt "date"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1980
 msgid "Invalid Date Value"
 msgstr ""
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2025
 msgid "Invalid Time Value"
 msgstr ""
 
@@ -11178,121 +11284,121 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr ""
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr ""
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 #, fuzzy
 msgid "Format:"
 msgstr "Skráarsnið:"
 
 #. Translators: :-)
-#: ../e-util/e-emoticon-chooser.c:39
+#: ../e-util/e-emoticon-chooser.c:40
 msgid "_Smile"
 msgstr ""
 
 #. Translators: :-(
-#: ../e-util/e-emoticon-chooser.c:41
+#: ../e-util/e-emoticon-chooser.c:42
 #, fuzzy
 msgid "S_ad"
 msgstr "0 sad"
 
 #. Translators: ;-)
-#: ../e-util/e-emoticon-chooser.c:43
+#: ../e-util/e-emoticon-chooser.c:44
 #, fuzzy
 msgid "_Wink"
 msgstr "Wink"
 
 #. Translators: :-P
-#: ../e-util/e-emoticon-chooser.c:45
+#: ../e-util/e-emoticon-chooser.c:46
 msgid "Ton_gue"
 msgstr ""
 
 #. Translators: :-))
-#: ../e-util/e-emoticon-chooser.c:47
+#: ../e-util/e-emoticon-chooser.c:48
 msgid "Laug_h"
 msgstr ""
 
 #. Translators: :-|
-#: ../e-util/e-emoticon-chooser.c:49
+#: ../e-util/e-emoticon-chooser.c:50
 #, fuzzy
 msgid "_Plain"
 msgstr "Venjulegt"
 
 #. Translators: :-!
-#: ../e-util/e-emoticon-chooser.c:51
+#: ../e-util/e-emoticon-chooser.c:52
 msgid "Smi_rk"
 msgstr ""
 
 #. Translators: :"-)
-#: ../e-util/e-emoticon-chooser.c:53
+#: ../e-util/e-emoticon-chooser.c:54
 msgid "_Embarrassed"
 msgstr ""
 
 #. Translators: :-D
-#: ../e-util/e-emoticon-chooser.c:55
+#: ../e-util/e-emoticon-chooser.c:56
 msgid "_Big Smile"
 msgstr ""
 
 #. Translators: :-/
-#: ../e-util/e-emoticon-chooser.c:57
+#: ../e-util/e-emoticon-chooser.c:58
 msgid "Uncer_tain"
 msgstr ""
 
 #. Translators: :-O
-#: ../e-util/e-emoticon-chooser.c:59
+#: ../e-util/e-emoticon-chooser.c:60
 msgid "S_urprise"
 msgstr ""
 
 #. Translators: :-S
-#: ../e-util/e-emoticon-chooser.c:61
+#: ../e-util/e-emoticon-chooser.c:62
 msgid "W_orried"
 msgstr ""
 
 #. Translators: :-*
-#: ../e-util/e-emoticon-chooser.c:63
+#: ../e-util/e-emoticon-chooser.c:64
 msgid "_Kiss"
 msgstr ""
 
 #. Translators: X-(
-#: ../e-util/e-emoticon-chooser.c:65
+#: ../e-util/e-emoticon-chooser.c:66
 msgid "A_ngry"
 msgstr ""
 
 #. Translators: B-)
-#: ../e-util/e-emoticon-chooser.c:67
+#: ../e-util/e-emoticon-chooser.c:68
 msgid "_Cool"
 msgstr ""
 
 #. Translators: O:-)
-#: ../e-util/e-emoticon-chooser.c:69
+#: ../e-util/e-emoticon-chooser.c:70
 msgid "Ange_l"
 msgstr ""
 
 #. Translators: :'(
-#: ../e-util/e-emoticon-chooser.c:71
+#: ../e-util/e-emoticon-chooser.c:72
 msgid "Cr_ying"
 msgstr ""
 
 #. Translators: :-Q
-#: ../e-util/e-emoticon-chooser.c:73
+#: ../e-util/e-emoticon-chooser.c:74
 msgid "S_ick"
 msgstr ""
 
 #. Translators: |-)
-#: ../e-util/e-emoticon-chooser.c:75
+#: ../e-util/e-emoticon-chooser.c:76
 msgid "Tire_d"
 msgstr ""
 
 #. Translators: >:-)
-#: ../e-util/e-emoticon-chooser.c:77
+#: ../e-util/e-emoticon-chooser.c:78
 msgid "De_vilish"
 msgstr ""
 
 #. Translators: :-(|)
-#: ../e-util/e-emoticon-chooser.c:79
+#: ../e-util/e-emoticon-chooser.c:80
 msgid "_Monkey"
 msgstr ""
 
@@ -11418,8 +11524,8 @@ msgid "<click here to select a date>"
 msgstr ""
 
 #: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
-#, fuzzy
 #: ../e-util/e-filter-datespec.c:154
+#, fuzzy
 msgid "now"
 msgstr "_Núna"
 
@@ -11439,8 +11545,9 @@ msgid "Choose a File"
 msgstr "Veldu skrá..."
 
 #: ../e-util/e-filter-rule.c:751
+#, fuzzy
 msgid "R_ule name:"
-msgstr ""
+msgstr "Heiti reglu"
 
 #: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
@@ -11468,13 +11575,13 @@ msgstr ""
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
-#, fuzzy
-#: ../e-util/e-mail-identity-combo-box.c:472
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:63
+#: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
+#, fuzzy
 msgid "None"
 msgstr "Ekkert"
 
@@ -11503,779 +11610,788 @@ msgid "A_dd Condition"
 msgstr ""
 
 #: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:229
+#: ../mail/em-utils.c:164
 msgid "Incoming"
 msgstr ""
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:165
 msgid "Outgoing"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:57
+#: ../e-util/e-html-editor-actions.c:58
 msgid "Failed to insert HTML file."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:94
+#: ../e-util/e-html-editor-actions.c:95
 msgid "Failed to insert text file."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:478
+#: ../e-util/e-html-editor-actions.c:612
 msgid "Insert HTML File"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:484
+#: ../e-util/e-html-editor-actions.c:618
 #, fuzzy
 msgid "HTML file"
 msgstr "Senda HTML Póst?"
 
-#: ../e-util/e-html-editor-actions.c:511
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:645
 #, fuzzy
 #| msgid "_Insert"
+msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "_Innsetja"
 
-#: ../e-util/e-html-editor-actions.c:571
+#: ../e-util/e-html-editor-actions.c:706
 msgid "Insert text file"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:577
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:712
 #| msgid "Text"
 msgid "Text file"
 msgstr "Textaskrá"
 
-#: ../e-util/e-html-editor-actions.c:961
+#: ../e-util/e-html-editor-actions.c:1096
 msgid "Copy selected text to the clipboard"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:968
+#: ../e-util/e-html-editor-actions.c:1103
 msgid "Cut selected text to the clipboard"
 msgstr ""
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:975
+#: ../e-util/e-html-editor-actions.c:1110
 msgid "Paste text from the clipboard"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:982
+#: ../e-util/e-html-editor-actions.c:1117
 #, fuzzy
 msgid "Redo the last undone action"
 msgstr "Endurtaka síðustu afturkölluðu aðgerð"
 
-#: ../e-util/e-html-editor-actions.c:996
+#: ../e-util/e-html-editor-actions.c:1131
 #, fuzzy
 msgid "Undo the last action"
 msgstr "Hætta við síðustu aðgerð"
 
-#: ../e-util/e-html-editor-actions.c:1017
+#: ../e-util/e-html-editor-actions.c:1152
 #, fuzzy
 msgid "For_mat"
 msgstr "_Forsníða"
 
-#: ../e-util/e-html-editor-actions.c:1024
+#: ../e-util/e-html-editor-actions.c:1159
 #, fuzzy
 msgid "_Paragraph Style"
 msgstr "málsgreinarstíll"
 
-#: ../e-util/e-html-editor-actions.c:1038
-#: ../e-util/e-html-editor-image-dialog.c:591
+#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-image-dialog.c:635
 #, fuzzy
 msgid "_Alignment"
 msgstr "Jöfnun:"
 
-#: ../e-util/e-html-editor-actions.c:1045
+#: ../e-util/e-html-editor-actions.c:1180
 msgid "Current _Languages"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1062
+#: ../e-util/e-html-editor-actions.c:1197
 #, fuzzy
 msgid "_Increase Indent"
 msgstr "Auka inndrátt"
 
-#: ../e-util/e-html-editor-actions.c:1064
+#: ../e-util/e-html-editor-actions.c:1199
 #, fuzzy
 msgid "Increase Indent"
 msgstr "Auka inndrátt"
 
-#: ../e-util/e-html-editor-actions.c:1069
+#: ../e-util/e-html-editor-actions.c:1204
 #, fuzzy
 msgid "_HTML File..."
 msgstr "Senda HTML Póst?"
 
-#: ../e-util/e-html-editor-actions.c:1076
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Te_xt File..."
-msgstr "Textaskrá"
+msgstr "Te_xtaskrá..."
 
-#: ../e-util/e-html-editor-actions.c:1083
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Paste _Quotation"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1090
+#: ../e-util/e-html-editor-actions.c:1225
 #, fuzzy
 msgid "_Find..."
 msgstr "_Finna..."
 
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:1227
 #, fuzzy
 msgid "Search for text"
 msgstr "Leita að texta"
 
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../e-util/e-html-editor-actions.c:1232
+#, fuzzy
 msgid "Find A_gain"
-msgstr ""
+msgstr "Finna _aftur"
 
-#: ../e-util/e-html-editor-actions.c:1104
+#: ../e-util/e-html-editor-actions.c:1239
 #, fuzzy
 msgid "Re_place..."
 msgstr "Skipta út"
 
-#: ../e-util/e-html-editor-actions.c:1106
+#: ../e-util/e-html-editor-actions.c:1241
 #, fuzzy
 msgid "Search for and replace text"
 msgstr "Leita að og skipta út texta"
 
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../e-util/e-html-editor-actions.c:1246
 #, fuzzy
 msgid "Check _Spelling..."
 msgstr "_Yfirfara stafsetningu..."
 
-#: ../e-util/e-html-editor-actions.c:1118
+#: ../e-util/e-html-editor-actions.c:1253
 #, fuzzy
 msgid "_Decrease Indent"
 msgstr "Minnka inndrátt"
 
-#: ../e-util/e-html-editor-actions.c:1120
+#: ../e-util/e-html-editor-actions.c:1255
 #, fuzzy
 msgid "Decrease Indent"
 msgstr "Minnka inndrátt"
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "_Wrap Lines"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1132
+#: ../e-util/e-html-editor-actions.c:1267
 msgid "Open Inspector"
 msgstr ""
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1142
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1277
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
+#, fuzzy
 msgid "_Center"
 msgstr "_Miðja"
 
-#: ../e-util/e-html-editor-actions.c:1144
+#: ../e-util/e-html-editor-actions.c:1279
 #, fuzzy
 msgid "Center Alignment"
 msgstr "_Heimilisfang:"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1149
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1284
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
+#, fuzzy
 msgid "_Left"
 msgstr "_Vinstri"
 
-#: ../e-util/e-html-editor-actions.c:1151
+#: ../e-util/e-html-editor-actions.c:1286
 #, fuzzy
 msgid "Left Alignment"
 msgstr "_Heimilisfang:"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1156
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1291
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
+#, fuzzy
 msgid "_Right"
 msgstr "_Hægri"
 
-#: ../e-util/e-html-editor-actions.c:1158
+#: ../e-util/e-html-editor-actions.c:1293
 #, fuzzy
 msgid "Right Alignment"
 msgstr "_Heimilisfang:"
 
-#: ../e-util/e-html-editor-actions.c:1166
+#: ../e-util/e-html-editor-actions.c:1301
+#, fuzzy
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
-msgstr ""
+msgstr "HTML"
 
-#: ../e-util/e-html-editor-actions.c:1168
+#: ../e-util/e-html-editor-actions.c:1303
 #, fuzzy
 msgid "HTML editing mode"
 msgstr "Senda HTML Póst?"
 
-#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-actions.c:1308
 #, fuzzy
 msgid "Plain _Text"
 msgstr "Hreinn texti"
 
-#: ../e-util/e-html-editor-actions.c:1175
+#: ../e-util/e-html-editor-actions.c:1310
 msgid "Plain text editing mode"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1183
+#: ../e-util/e-html-editor-actions.c:1318
 #, fuzzy
 msgid "_Normal"
 msgstr "_Venjulegt"
 
-#: ../e-util/e-html-editor-actions.c:1190
+#: ../e-util/e-html-editor-actions.c:1325
 #, fuzzy
 msgid "Header _1"
 msgstr "haus"
 
-#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1332
 #, fuzzy
 msgid "Header _2"
 msgstr "haus"
 
-#: ../e-util/e-html-editor-actions.c:1204
+#: ../e-util/e-html-editor-actions.c:1339
 #, fuzzy
 msgid "Header _3"
 msgstr "haus"
 
-#: ../e-util/e-html-editor-actions.c:1211
+#: ../e-util/e-html-editor-actions.c:1346
 #, fuzzy
 msgid "Header _4"
 msgstr "haus"
 
-#: ../e-util/e-html-editor-actions.c:1218
+#: ../e-util/e-html-editor-actions.c:1353
 #, fuzzy
 msgid "Header _5"
 msgstr "haus"
 
-#: ../e-util/e-html-editor-actions.c:1225
+#: ../e-util/e-html-editor-actions.c:1360
 #, fuzzy
 msgid "Header _6"
 msgstr "haus"
 
-#: ../e-util/e-html-editor-actions.c:1232
+#: ../e-util/e-html-editor-actions.c:1367
+#, fuzzy
 msgid "_Preformatted"
-msgstr ""
+msgstr "_Forsniðið"
 
-#: ../e-util/e-html-editor-actions.c:1239
+#: ../e-util/e-html-editor-actions.c:1374
 #, fuzzy
 #| msgid "_Address:"
 msgid "A_ddress"
 msgstr "Vistfang"
 
-#: ../e-util/e-html-editor-actions.c:1246
+#: ../e-util/e-html-editor-actions.c:1381
 msgid "_Blockquote"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1253
+#: ../e-util/e-html-editor-actions.c:1388
 #, fuzzy
 msgid "_Bulleted List"
 msgstr "Punkta listi"
 
-#: ../e-util/e-html-editor-actions.c:1260
+#: ../e-util/e-html-editor-actions.c:1395
 msgid "_Roman Numeral List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1267
+#: ../e-util/e-html-editor-actions.c:1402
 #, fuzzy
 msgid "Numbered _List"
 msgstr "Númeraður listi"
 
-#: ../e-util/e-html-editor-actions.c:1274
+#: ../e-util/e-html-editor-actions.c:1409
 msgid "_Alphabetical List"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1290
-#: ../e-util/e-html-editor-actions.c:1327
+#: ../e-util/e-html-editor-actions.c:1425
+#: ../e-util/e-html-editor-actions.c:1463
 #, fuzzy
 msgid "_Image..."
 msgstr "Mynd"
 
-#: ../e-util/e-html-editor-actions.c:1297
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1428
+#, fuzzy
+#| msgid "_Insert"
+msgid "Insert Image"
+msgstr "_Innsetja"
+
+#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1470
 #, fuzzy
-#: ../e-util/e-html-editor-actions.c:1334
 msgid "_Link..."
 msgstr "tengill"
 
-#: ../e-util/e-html-editor-actions.c:1299
+#: ../e-util/e-html-editor-actions.c:1435
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Link"
 msgstr "_Innsetja"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1305
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1441
+#: ../e-util/e-html-editor-actions.c:1485
 #, fuzzy
 msgid "_Rule..."
 msgstr "_Endursenda..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../e-util/e-html-editor-actions.c:1444
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert Rule"
 msgstr "_Innsetja"
 
-#: ../e-util/e-html-editor-actions.c:1313
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1449
+#: ../e-util/e-html-editor-actions.c:1492
 #, fuzzy
 msgid "_Table..."
 msgstr "tafla"
 
-#: ../e-util/e-html-editor-actions.c:1315
+#: ../e-util/e-html-editor-actions.c:1451
 #, fuzzy
 msgid "Insert Table"
 msgstr "Forsýn:"
 
-#: ../e-util/e-html-editor-actions.c:1320
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "_Cell..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1341
+#: ../e-util/e-html-editor-actions.c:1477
 #, fuzzy
 msgid "Pa_ge..."
 msgstr "Síða"
 
-#: ../e-util/e-html-editor-actions.c:1365
+#: ../e-util/e-html-editor-actions.c:1501
 #, fuzzy
 msgid "Font _Size"
 msgstr "Leturstærð"
 
-#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-actions.c:1508
 #, fuzzy
 msgid "_Font Style"
 msgstr "Stíll leturs"
 
-#: ../e-util/e-html-editor-actions.c:1379
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Paste As _Text"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1526
 #: ../e-util/e-html-editor-text-dialog.c:214
 #, fuzzy
 msgid "_Bold"
 msgstr "_Feitletrað"
 
-#: ../e-util/e-html-editor-actions.c:1392
+#: ../e-util/e-html-editor-actions.c:1528
 #, fuzzy
 msgid "Bold"
 msgstr "Feitletrað"
 
-#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-actions.c:1534
 #: ../e-util/e-html-editor-text-dialog.c:225
 #, fuzzy
 #| msgid "Italy"
 msgid "_Italic"
 msgstr "_Skáletrað"
 
-#: ../e-util/e-html-editor-actions.c:1400
+#: ../e-util/e-html-editor-actions.c:1536
 #, fuzzy
 #| msgid "Italy"
 msgid "Italic"
 msgstr "Skáletrað"
 
-#: ../e-util/e-html-editor-actions.c:1406
+#: ../e-util/e-html-editor-actions.c:1542
 #, fuzzy
 msgid "_Plain Text"
 msgstr "Hreinn texti"
 
-#: ../e-util/e-html-editor-actions.c:1414
-#, fuzzy
+#: ../e-util/e-html-editor-actions.c:1550
 #: ../e-util/e-html-editor-text-dialog.c:246
+#, fuzzy
 msgid "_Strikethrough"
 msgstr "_Strika í gegnum"
 
-#: ../e-util/e-html-editor-actions.c:1416
+#: ../e-util/e-html-editor-actions.c:1552
 #, fuzzy
 msgid "Strikethrough"
 msgstr "Yfirstrikun"
 
-#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-actions.c:1558
 #: ../e-util/e-html-editor-text-dialog.c:236
 #, fuzzy
 #| msgid "Use underline"
 msgid "_Underline"
 msgstr "_Undirstrika"
 
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../e-util/e-html-editor-actions.c:1560
 #, fuzzy
 #| msgid "Use underline"
 msgid "Underline"
 msgstr "Undirstrika"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1434
+#: ../e-util/e-html-editor-actions.c:1570
 msgid "-2"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1442
+#: ../e-util/e-html-editor-actions.c:1578
 msgid "-1"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1450
+#: ../e-util/e-html-editor-actions.c:1586
 msgid "+0"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1458
+#: ../e-util/e-html-editor-actions.c:1594
 msgid "+1"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1466
+#: ../e-util/e-html-editor-actions.c:1602
 msgid "+2"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1610
 msgid "+3"
 msgstr ""
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1482
+#: ../e-util/e-html-editor-actions.c:1618
 msgid "+4"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1501
+#: ../e-util/e-html-editor-actions.c:1637
 msgid "Cell Contents"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1644
 #, fuzzy
 msgid "Column"
 msgstr "Dálkur:"
 
-#: ../e-util/e-html-editor-actions.c:1515
+#: ../e-util/e-html-editor-actions.c:1651
 #, fuzzy
 msgid "Row"
 msgstr "_Röð:"
 
-#: ../e-util/e-html-editor-actions.c:1522
-#: ../e-util/e-html-editor-actions.c:1607
+#: ../e-util/e-html-editor-actions.c:1658
+#: ../e-util/e-html-editor-actions.c:1743
 #, fuzzy
 msgid "Table"
 msgstr "tafla"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1668
 #, fuzzy
 #| msgid "Delete"
 msgid "Table Delete"
 msgstr "Eyða"
 
-#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1675 ../e-util/e-text.c:2127
 msgid "Input Methods"
 msgstr "Innsetningaraðferðir"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1547
+#: ../e-util/e-html-editor-actions.c:1683
 #, fuzzy
 #| msgid "_Insert"
 msgid "Table Insert"
 msgstr "_Innsetja"
 
-#: ../e-util/e-html-editor-actions.c:1554
+#: ../e-util/e-html-editor-actions.c:1690
 #, fuzzy
 msgid "Properties"
 msgstr "Eiginleikar"
 
-#: ../e-util/e-html-editor-actions.c:1572
+#: ../e-util/e-html-editor-actions.c:1708
 msgid "Column After"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1579
+#: ../e-util/e-html-editor-actions.c:1715
 msgid "Column Before"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1586
+#: ../e-util/e-html-editor-actions.c:1722
 #, fuzzy
 #| msgid "_Insert"
 msgid "Insert _Link"
 msgstr "_Innsetja"
 
-#: ../e-util/e-html-editor-actions.c:1593
+#: ../e-util/e-html-editor-actions.c:1729
 msgid "Row Above"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1736
 msgid "Row Below"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1614
+#: ../e-util/e-html-editor-actions.c:1750
 msgid "Cell..."
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1621
+#: ../e-util/e-html-editor-actions.c:1757
 #, fuzzy
 msgid "Image..."
 msgstr "Mynd"
 
-#: ../e-util/e-html-editor-actions.c:1628
+#: ../e-util/e-html-editor-actions.c:1764
 #, fuzzy
 msgid "Link..."
 msgstr "tengill"
 
-#: ../e-util/e-html-editor-actions.c:1635
+#: ../e-util/e-html-editor-actions.c:1771
 #, fuzzy
 #| msgid "Page"
 msgid "Page..."
 msgstr "Síða"
 
-#: ../e-util/e-html-editor-actions.c:1642
+#: ../e-util/e-html-editor-actions.c:1778
 #, fuzzy
 msgid "Paragraph..."
 msgstr "málsgrein"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1786
 #, fuzzy
 #| msgid "Full _Name..."
 msgid "Rule..."
 msgstr "Fullt _Nafn:"
 
-#: ../e-util/e-html-editor-actions.c:1657
+#: ../e-util/e-html-editor-actions.c:1793
 #, fuzzy
 msgid "Table..."
 msgstr "tafla"
 
-#: ../e-util/e-html-editor-actions.c:1664
+#: ../e-util/e-html-editor-actions.c:1800
 #, fuzzy
 #| msgid "Text"
 msgid "Text..."
 msgstr "Texti"
 
-#: ../e-util/e-html-editor-actions.c:1671
+#: ../e-util/e-html-editor-actions.c:1807
 #, fuzzy
 #| msgid "Remove"
 msgid "Remove Link"
 msgstr "Fjarlægja"
 
-#: ../e-util/e-html-editor-actions.c:1688
+#: ../e-util/e-html-editor-actions.c:1824
 msgid "Add Word to Dictionary"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1695
+#: ../e-util/e-html-editor-actions.c:1831
 msgid "Ignore Misspelled Word"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1702
+#: ../e-util/e-html-editor-actions.c:1838
 msgid "Add Word To"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1847
 msgid "More Suggestions"
 msgstr ""
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1819
+#: ../e-util/e-html-editor-actions.c:1955
 #, c-format
 msgid "%s Dictionary"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1906
+#: ../e-util/e-html-editor-actions.c:2042
 msgid "_Emoticon"
 msgstr ""
 
-#: ../e-util/e-html-editor-actions.c:1907
+#: ../e-util/e-html-editor-actions.c:2043
 #, fuzzy
 msgid "Insert Emoticon"
 msgstr "_Um Ximian Evolution..."
 
-#: ../e-util/e-html-editor-actions.c:1975
+#: ../e-util/e-html-editor-actions.c:2111
 #, fuzzy
 msgid "Re_place"
 msgstr "Skipta út"
 
-#: ../e-util/e-html-editor-actions.c:1978
+#: ../e-util/e-html-editor-actions.c:2114
 #, fuzzy
 msgid "_Image"
 msgstr "M_ynd"
 
-#: ../e-util/e-html-editor-actions.c:1981
+#: ../e-util/e-html-editor-actions.c:2117
 #, fuzzy
 msgid "_Link"
 msgstr "Tengi_ll"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1985
+#: ../e-util/e-html-editor-actions.c:2121
 #, fuzzy
 msgid "_Rule"
 msgstr "_Fullt Nafn"
 
-#: ../e-util/e-html-editor-actions.c:1988
-#: ../e-util/e-html-editor-cell-dialog.c:658
+#: ../e-util/e-html-editor-actions.c:2124
+#: ../e-util/e-html-editor-cell-dialog.c:732
 #, fuzzy
 msgid "_Table"
 msgstr "tafla"
 
-#: ../e-util/e-html-editor.c:669
+#: ../e-util/e-html-editor.c:672
 #, fuzzy
 msgid "Paragraph Style"
 msgstr "málsgreinarstíll"
 
-#: ../e-util/e-html-editor.c:683
+#: ../e-util/e-html-editor.c:686
 #, fuzzy
 msgid "Editing Mode"
 msgstr "Valið:"
 
-#: ../e-util/e-html-editor.c:695
+#: ../e-util/e-html-editor.c:698
 #, fuzzy
 msgid "Font Color"
 msgstr "_Loka"
 
-#: ../e-util/e-html-editor.c:713
+#: ../e-util/e-html-editor.c:716
 #, fuzzy
 msgid "Font Size"
 msgstr "Leturstærð"
 
-#: ../e-util/e-html-editor-cell-dialog.c:618
+#: ../e-util/e-html-editor-cell-dialog.c:692
 #, fuzzy
 msgid "<b>Scope</b>"
 msgstr "Umfang:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:632
+#: ../e-util/e-html-editor-cell-dialog.c:706
 msgid "C_ell"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:645
+#: ../e-util/e-html-editor-cell-dialog.c:719
 #, fuzzy
 msgid "_Row"
 msgstr "_Röð:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:671
+#: ../e-util/e-html-editor-cell-dialog.c:745
 #, fuzzy
 msgid "Col_umn"
 msgstr "Dálkur:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:681
+#: ../e-util/e-html-editor-cell-dialog.c:755
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:694
+#: ../e-util/e-html-editor-cell-dialog.c:768
+#: ../e-util/e-html-editor-hrule-dialog.c:407
+#: ../e-util/e-html-editor-table-dialog.c:894
 #, fuzzy
-#: ../e-util/e-html-editor-hrule-dialog.c:384
-#: ../e-util/e-html-editor-table-dialog.c:819
 msgid "Left"
 msgstr "Vinstri"
 
-#: ../e-util/e-html-editor-cell-dialog.c:695
+#: ../e-util/e-html-editor-cell-dialog.c:769
+#: ../e-util/e-html-editor-hrule-dialog.c:409
+#: ../e-util/e-html-editor-table-dialog.c:895
 #, fuzzy
-#: ../e-util/e-html-editor-hrule-dialog.c:386
-#: ../e-util/e-html-editor-table-dialog.c:820
 msgid "Center"
 msgstr "Miðja"
 
-#: ../e-util/e-html-editor-cell-dialog.c:696
+#: ../e-util/e-html-editor-cell-dialog.c:770
+#: ../e-util/e-html-editor-hrule-dialog.c:411
+#: ../e-util/e-html-editor-table-dialog.c:896
 #, fuzzy
-#: ../e-util/e-html-editor-hrule-dialog.c:388
-#: ../e-util/e-html-editor-table-dialog.c:821
 msgid "Right"
 msgstr "Hægri"
 
-#: ../e-util/e-html-editor-cell-dialog.c:704
+#: ../e-util/e-html-editor-cell-dialog.c:778
 #, fuzzy
 msgid "_Horizontal:"
 msgstr "Lárétt:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-cell-dialog.c:786
+#: ../e-util/e-html-editor-image-dialog.c:625
 #, fuzzy
-#: ../e-util/e-html-editor-image-dialog.c:581
 msgid "Top"
 msgstr "Toppur"
 
-#: ../e-util/e-html-editor-cell-dialog.c:713
-#: ../e-util/e-html-editor-image-dialog.c:582
+#: ../e-util/e-html-editor-cell-dialog.c:787
+#, fuzzy
+#: ../e-util/e-html-editor-image-dialog.c:626
 msgid "Middle"
-msgstr ""
+msgstr "Miðja"
 
-#: ../e-util/e-html-editor-cell-dialog.c:714
+#: ../e-util/e-html-editor-cell-dialog.c:788
+#: ../e-util/e-html-editor-image-dialog.c:627
 #, fuzzy
-#: ../e-util/e-html-editor-image-dialog.c:583
 msgid "Bottom"
 msgstr "Botn"
 
-#: ../e-util/e-html-editor-cell-dialog.c:722
+#: ../e-util/e-html-editor-cell-dialog.c:796
 #, fuzzy
 msgid "_Vertical:"
 msgstr "Lóðrétt:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:728
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Wrap Text"
 msgstr ""
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:736
+#: ../e-util/e-html-editor-cell-dialog.c:810
 msgid "_Header Style"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:750
-#: ../e-util/e-html-editor-image-dialog.c:521
-#: ../e-util/e-html-editor-table-dialog.c:731
+#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-table-dialog.c:806
 #, fuzzy
 msgid "<b>Layout</b>"
 msgstr "Umbrot"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:835
 #, fuzzy
 #| msgid "Width:"
 msgid "_Width"
 msgstr "_Breidd"
 
-#: ../e-util/e-html-editor-cell-dialog.c:800
+#: ../e-util/e-html-editor-cell-dialog.c:874
 msgid "Row S_pan:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:814
+#: ../e-util/e-html-editor-cell-dialog.c:888
 msgid "Co_lumn Span:"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:821
-#: ../e-util/e-html-editor-table-dialog.c:835
+#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-table-dialog.c:910
 #, fuzzy
 msgid "<b>Background</b>"
 msgstr "Bakgrunnslitur"
 
-#: ../e-util/e-html-editor-cell-dialog.c:834
+#: ../e-util/e-html-editor-cell-dialog.c:908
+#: ../e-util/e-html-editor-table-dialog.c:923
 #, fuzzy
-#: ../e-util/e-html-editor-table-dialog.c:848
 msgid "Transparent"
 msgstr "Gegnsætt"
 
-#: ../e-util/e-html-editor-cell-dialog.c:842
+#: ../e-util/e-html-editor-cell-dialog.c:916
 #, fuzzy
 msgid "C_olor:"
 msgstr "Litur"
 
-#: ../e-util/e-html-editor-cell-dialog.c:850
-#: ../e-util/e-html-editor-image-dialog.c:483
-#: ../e-util/e-html-editor-table-dialog.c:864
+#: ../e-util/e-html-editor-cell-dialog.c:924
+#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-table-dialog.c:939
 msgid "Choose Background Image"
 msgstr ""
 
-#: ../e-util/e-html-editor-cell-dialog.c:855
-#: ../e-util/e-html-editor-image-dialog.c:489
-#: ../e-util/e-html-editor-table-dialog.c:869
+#: ../e-util/e-html-editor-cell-dialog.c:929
+#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-table-dialog.c:944
 #, fuzzy
 msgid "Images"
 msgstr "Myndir"
 
-#: ../e-util/e-html-editor-cell-dialog.c:868
+#: ../e-util/e-html-editor-cell-dialog.c:942
 #, fuzzy
 msgid "_Image:"
 msgstr "Mynd"
 
-#: ../e-util/e-html-editor-cell-dialog.c:875
-#: ../e-util/e-html-editor-page-dialog.c:516
-#: ../e-util/e-html-editor-table-dialog.c:889
+#: ../e-util/e-html-editor-cell-dialog.c:949
+#: ../e-util/e-html-editor-page-dialog.c:654
+#: ../e-util/e-html-editor-table-dialog.c:964
 #, fuzzy
 #| msgid "Remove"
 msgid "_Remove image"
 msgstr "Fjarlægja"
 
-#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-cell-dialog.c:969
 #, fuzzy
 msgid "Cell Properties"
 msgstr "Stillingar..."
@@ -12287,14 +12403,15 @@ msgid "No match found"
 msgstr ""
 
 #: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:229
+#: ../e-util/e-html-editor-replace-dialog.c:247
 #, fuzzy
 msgid "Search _backwards"
 msgstr "Leita afturá_bak"
 
 #: ../e-util/e-html-editor-find-dialog.c:167
+#, fuzzy
 msgid "Case _Sensitive"
-msgstr ""
+msgstr "_Næmt fyrir há og lágstöfum"
 
 #: ../e-util/e-html-editor-find-dialog.c:174
 #, fuzzy
@@ -12307,183 +12424,190 @@ msgstr "_Leita"
 msgid "Find"
 msgstr "Leita"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:319
+#: ../e-util/e-html-editor-hrule-dialog.c:342
 #, fuzzy
 msgid "<b>Size</b>"
 msgstr "Stærð:"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:339
-#: ../e-util/e-html-editor-image-dialog.c:539
-#: ../e-util/e-html-editor-table-dialog.c:742
+#: ../e-util/e-html-editor-hrule-dialog.c:362
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:817
 #, fuzzy
 #| msgid "Width:"
 msgid "_Width:"
 msgstr "_Breidd:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:364
+#: ../e-util/e-html-editor-hrule-dialog.c:387
 #, fuzzy
 #| msgid "Size:"
 msgid "_Size:"
 msgstr "_Stærð:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:371
+#: ../e-util/e-html-editor-hrule-dialog.c:394
 #, fuzzy
 msgid "<b>Style</b>"
 msgstr "Stíll"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:396
-#: ../e-util/e-html-editor-table-dialog.c:828
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-table-dialog.c:903
 #, fuzzy
 msgid "_Alignment:"
 msgstr "Jöfnun:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:402
+#: ../e-util/e-html-editor-hrule-dialog.c:425
 msgid "S_haded"
 msgstr ""
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-hrule-dialog.c:442
 #, fuzzy
 msgid "Rule properties"
 msgstr "Stillingar..."
 
-#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-image-dialog.c:515
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:685
+#: ../e-util/e-html-editor-table-dialog.c:760
 #, fuzzy
 msgid "<b>General</b>"
 msgstr "<b>Almennar</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:500
+#: ../e-util/e-html-editor-image-dialog.c:544
 #, fuzzy
 msgid "_Source:"
 msgstr "Uppruni"
 
-#: ../e-util/e-html-editor-image-dialog.c:563
+#: ../e-util/e-html-editor-image-dialog.c:607
 #, fuzzy
 msgid "_Height:"
 msgstr "_Hæð:"
 
-#: ../e-util/e-html-editor-image-dialog.c:604
+#: ../e-util/e-html-editor-image-dialog.c:648
 msgid "_X-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:620
+#: ../e-util/e-html-editor-image-dialog.c:664
 msgid "_Y-Padding:"
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:884
 #, fuzzy
-#: ../e-util/e-html-editor-table-dialog.c:809
 msgid "_Border:"
 msgstr "_Jaðar:"
 
-#: ../e-util/e-html-editor-image-dialog.c:646
+#: ../e-util/e-html-editor-image-dialog.c:690
 #, fuzzy
 msgid "<b>Link</b>"
 msgstr "tengill"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:352
 #, fuzzy
-#: ../e-util/e-html-editor-link-dialog.c:334
 msgid "_URL:"
 msgstr "URL"
 
-#: ../e-util/e-html-editor-image-dialog.c:669
-#: ../e-util/e-html-editor-link-dialog.c:339
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:357
 msgid "_Test URL..."
 msgstr ""
 
-#: ../e-util/e-html-editor-image-dialog.c:686
+#: ../e-util/e-html-editor-image-dialog.c:730
 #, fuzzy
 msgid "Image Properties"
 msgstr "Eiginleikar mynda"
 
-#: ../e-util/e-html-editor-link-dialog.c:363
+#: ../e-util/e-html-editor-link-dialog.c:381
 #, fuzzy
 #| msgid "Remove"
 msgid "_Remove Link"
 msgstr "Fjarlægja"
 
-#: ../e-util/e-html-editor-link-dialog.c:388
+#: ../e-util/e-html-editor-link-dialog.c:406
 #, fuzzy
 msgid "Link Properties"
 msgstr "Stillingar..."
 
-#: ../e-util/e-html-editor-page-dialog.c:69
+#: ../e-util/e-html-editor-page-dialog.c:72
 msgid "Perforated Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:78
+#: ../e-util/e-html-editor-page-dialog.c:81
 msgid "Blue Ink"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:87
+#: ../e-util/e-html-editor-page-dialog.c:90
 #, fuzzy
 msgid "Paper"
 msgstr "Pappír"
 
-#: ../e-util/e-html-editor-page-dialog.c:96
+#: ../e-util/e-html-editor-page-dialog.c:99
+#, fuzzy
 msgid "Ribbon"
-msgstr ""
+msgstr "Borði"
 
-#: ../e-util/e-html-editor-page-dialog.c:105
+#: ../e-util/e-html-editor-page-dialog.c:108
 msgid "Midnight"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
 #: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
 msgid "Draft"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:132
+#: ../e-util/e-html-editor-page-dialog.c:135
 msgid "Graph Paper"
 msgstr ""
 
-#: ../e-util/e-html-editor-page-dialog.c:415
+#: ../e-util/e-html-editor-page-dialog.c:538
 #, fuzzy
 msgid "<b>Colors</b>"
 msgstr "Litir"
 
-#: ../e-util/e-html-editor-page-dialog.c:434
+#: ../e-util/e-html-editor-page-dialog.c:557
 #, fuzzy
 #| msgid "Text"
 msgid "_Text:"
 msgstr "Texti"
 
-#: ../e-util/e-html-editor-page-dialog.c:449
+#: ../e-util/e-html-editor-page-dialog.c:572
 #, fuzzy
 msgid "_Link:"
 msgstr "tengill"
 
-#: ../e-util/e-html-editor-page-dialog.c:464
+#: ../e-util/e-html-editor-page-dialog.c:587
+#, fuzzy
+msgid "_Visited Link:"
+msgstr "tengill"
+
+#: ../e-util/e-html-editor-page-dialog.c:602
 #, fuzzy
 msgid "_Background:"
 msgstr "Bakgrunnslitur"
 
-#: ../e-util/e-html-editor-page-dialog.c:472
+#: ../e-util/e-html-editor-page-dialog.c:610
 #, fuzzy
 msgid "<b>Background Image</b>"
 msgstr "Bakgrunns _mynd:"
 
-#: ../e-util/e-html-editor-page-dialog.c:494
+#: ../e-util/e-html-editor-page-dialog.c:632
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 #, fuzzy
 msgid "_Template:"
 msgstr "Sniðmá_t:"
 
-#: ../e-util/e-html-editor-page-dialog.c:502
-#, fuzzy
+#: ../e-util/e-html-editor-page-dialog.c:640
 #: ../e-util/e-import-assistant.c:283
+#, fuzzy
 msgid "Select a file"
 msgstr "Veldu skrá"
 
-#: ../e-util/e-html-editor-page-dialog.c:509
+#: ../e-util/e-html-editor-page-dialog.c:647
 #, fuzzy
 msgid "_Custom:"
 msgstr "Sérsniðið"
 
-#: ../e-util/e-html-editor-page-dialog.c:536
+#: ../e-util/e-html-editor-page-dialog.c:674
 #, fuzzy
 msgid "Page Properties"
 msgstr "Stillingar..."
@@ -12503,49 +12627,52 @@ msgstr "Jöfnun:"
 msgid "Paragraph Properties"
 msgstr "Stillingar..."
 
-#: ../e-util/e-html-editor-replace-dialog.c:148
+#: ../e-util/e-html-editor-replace-dialog.c:163
 #, fuzzy, c-format
-msgid "%d occurences replaced"
-msgstr "Eyða"
+msgid "%d occurence replaced"
+msgid_plural "%d occurences replaced"
+msgstr[0] "Eyða"
+msgstr[1] "Eyða"
 
-#: ../e-util/e-html-editor-replace-dialog.c:209
+#: ../e-util/e-html-editor-replace-dialog.c:227
 #, fuzzy
 msgid "R_eplace:"
 msgstr "Skipta út"
 
-#: ../e-util/e-html-editor-replace-dialog.c:221
+#: ../e-util/e-html-editor-replace-dialog.c:239
+#, fuzzy
 msgid "_With:"
-msgstr ""
+msgstr "_Með:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:233
+#: ../e-util/e-html-editor-replace-dialog.c:251
+#, fuzzy
 msgid "_Case sensitive"
-msgstr ""
+msgstr "_Næmt fyrir há og lágstöfum"
 
-#: ../e-util/e-html-editor-replace-dialog.c:237
+#: ../e-util/e-html-editor-replace-dialog.c:255
 #, fuzzy
 msgid "Wra_p search"
 msgstr "Ávallt"
 
-#: ../e-util/e-html-editor-replace-dialog.c:247
+#: ../e-util/e-html-editor-replace-dialog.c:265
 #, fuzzy
 msgid "_Skip"
 msgstr "_Sleppa"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
-#, fuzzy
+#: ../e-util/e-html-editor-replace-dialog.c:273
 #: ../e-util/e-system.error.xml.h:3
+#, fuzzy
 msgid "_Replace"
 msgstr "_Útskipta"
 
-#: ../e-util/e-html-editor-replace-dialog.c:263
+#: ../e-util/e-html-editor-replace-dialog.c:281
 #, fuzzy
 msgid "Replace _All"
 msgstr "Útskipta _Öllu"
 
-#. Replace
-#: ../e-util/e-html-editor-replace-dialog.c:283
+#: ../e-util/e-html-editor-replace-dialog.c:301
 #, fuzzy
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
+msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Skipta út"
 
@@ -12554,85 +12681,91 @@ msgstr "Skipta út"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "Forsýn:"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:501
+#: ../e-util/e-html-editor-spell-check-dialog.c:505
 #, fuzzy
 msgid "<b>Suggestions</b>"
 msgstr "_Uppástungur:"
 
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:540
+#, fuzzy
+msgid "Replace"
+msgstr "Skipta út"
+
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#: ../e-util/e-html-editor-spell-check-dialog.c:549
 #, fuzzy
 msgid "Replace All"
 msgstr "Útskipta Öllu"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:554
-#, fuzzy
+#: ../e-util/e-html-editor-spell-check-dialog.c:558
 #: ../mail/mail.error.xml.h:109
+#, fuzzy
 msgid "Ignore"
 msgstr "Hunsa"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:567
 #, fuzzy
 msgid "Skip"
 msgstr "Sleppa"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#: ../e-util/e-html-editor-spell-check-dialog.c:576
 #, fuzzy
 msgid "Back"
 msgstr "Til baka"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:581
+#: ../e-util/e-html-editor-spell-check-dialog.c:585
 #, fuzzy
 msgid "<b>Dictionary</b>"
 msgstr "Forsýn:"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#: ../e-util/e-html-editor-spell-check-dialog.c:605
 #, fuzzy
 msgid "Add word"
 msgstr "Bæta við _orði"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:618
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
+#: ../mail/mail-config.ui.h:38
 #, fuzzy
-#: ../mail/mail-config.ui.h:36
 msgid "Spell Checking"
 msgstr "Stafsetningarvilluleit"
 
-#: ../e-util/e-html-editor-table-dialog.c:707
+#: ../e-util/e-html-editor-table-dialog.c:782
 #, fuzzy
 msgid "_Rows:"
 msgstr "Raðir"
 
-#: ../e-util/e-html-editor-table-dialog.c:724
+#: ../e-util/e-html-editor-table-dialog.c:799
 #, fuzzy
 msgid "C_olumns:"
 msgstr "Dálkar:"
 
-#: ../e-util/e-html-editor-table-dialog.c:775
+#: ../e-util/e-html-editor-table-dialog.c:850
 #, fuzzy
 msgid "_Spacing:"
 msgstr "Millibil"
 
-#: ../e-util/e-html-editor-table-dialog.c:792
+#: ../e-util/e-html-editor-table-dialog.c:867
 #, fuzzy
 msgid "_Padding:"
 msgstr "Fylling"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:931
 #: ../e-util/e-html-editor-text-dialog.c:261
 #, fuzzy
 msgid "_Color:"
 msgstr "Litur"
 
-#: ../e-util/e-html-editor-table-dialog.c:882
+#: ../e-util/e-html-editor-table-dialog.c:957
 #, fuzzy
 msgid "Image:"
 msgstr "Mynd"
 
-#: ../e-util/e-html-editor-table-dialog.c:909
+#: ../e-util/e-html-editor-table-dialog.c:984
 #, fuzzy
 msgid "Table Properties"
 msgstr "Stillingar..."
@@ -12647,29 +12780,15 @@ msgstr "S_tærð:"
 msgid "Text Properties"
 msgstr "Stillingar..."
 
-#: ../e-util/e-html-editor-view.c:3149
+#: ../e-util/e-html-editor-view.c:5030
 #, fuzzy
 msgid "Changed property"
 msgstr "Stillingar..."
 
-#: ../e-util/e-html-editor-view.c:3150
+#: ../e-util/e-html-editor-view.c:5031
 msgid "Whether editor changed"
 msgstr ""
 
-#: ../e-util/e-html-editor-view.c:6898
-msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:6902
-msgid "_Don't lose formatting"
-msgstr ""
-
-#: ../e-util/e-html-editor-view.c:6903
-msgid "_Lose formatting"
-msgstr ""
-
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -12780,15 +12899,15 @@ msgstr "Loka"
 msgid "_Save and Close"
 msgstr "Vista og loka..."
 
-#: ../e-util/e-mail-signature-editor.c:531
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr ""
 
-#: ../e-util/e-mail-signature-editor.c:564
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr ""
 
-#: ../e-util/e-mail-signature-editor.c:600
+#: ../e-util/e-mail-signature-editor.c:598
 #, fuzzy
 msgid "Unnamed"
 msgstr "ónefnd"
@@ -12812,13 +12931,6 @@ msgid ""
 "for display purposes only."
 msgstr ""
 
-#: ../e-util/e-mail-signature-script-dialog.c:415
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:327
-#: ../mail/e-mail-config-summary-page.c:339
-msgid "_Name:"
-msgstr "_Nafn:"
-
 #: ../e-util/e-mail-signature-script-dialog.c:444
 #, fuzzy
 msgid "S_cript:"
@@ -12838,45 +12950,52 @@ msgid ""
 "should instead select the timezone from the drop-down combination box below."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:248
+#: ../e-util/e-misc-utils.c:249
 msgid "Could not open the link."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:295
+#: ../e-util/e-misc-utils.c:331
 msgid "Could not display help for Evolution."
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2390
+#: ../e-util/e-misc-utils.c:2384
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2393
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2396
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening task list '%s'"
 msgstr ""
 
-#: ../e-util/e-misc-utils.c:2399
+#: ../e-util/e-misc-utils.c:2393
 #, fuzzy, c-format
 msgid "Opening address book '%s'"
 msgstr "_Heimilisfang:"
 
+#: ../e-util/e-misc-utils.c:3127
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Ekki sýna þessi skilaboð framar"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr ""
 
 #: ../e-util/e-name-selector-dialog.c:309
+#, fuzzy
 msgid "Address B_ook:"
-msgstr ""
+msgstr "Nafnaskrá"
 
 #: ../e-util/e-name-selector-dialog.c:316
+#, fuzzy
 msgid "Cat_egory:"
-msgstr ""
+msgstr "Flokkur"
 
 #: ../e-util/e-name-selector-dialog.c:340
 #, fuzzy
@@ -12886,7 +13005,7 @@ msgstr "_Leita:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1215
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
 #: ../modules/calendar/e-cal-shell-view-actions.c:1573
 #: ../modules/calendar/e-memo-shell-view-actions.c:709
 #: ../modules/calendar/e-task-shell-view-actions.c:881
@@ -12939,9 +13058,9 @@ msgstr ""
 
 #. Edit Contact item
 #: ../e-util/e-name-selector-entry.c:3228
-#, c-format
+#, fuzzy, c-format
 msgid "_Edit %s"
-msgstr ""
+msgstr "Breyta %s"
 
 #: ../e-util/e-name-selector-list.c:583
 #, fuzzy, c-format
@@ -13091,64 +13210,65 @@ msgid "Add Rule"
 msgstr "Bæta við reglu"
 
 #: ../e-util/e-rule-editor.c:286
+#, fuzzy
 msgid "Edit Rule"
-msgstr ""
+msgstr "Breyta reglu"
 
 #: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:567
-#| msgid "Close this window"
+#: ../e-util/e-search-bar.c:568
 msgid "Close the find bar"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:575
+#: ../e-util/e-search-bar.c:576
 #, fuzzy
 msgid "Fin_d:"
 msgstr "Leita"
 
-#: ../e-util/e-search-bar.c:587
+#: ../e-util/e-search-bar.c:588
 msgid "Clear the search"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:611
+#: ../e-util/e-search-bar.c:612
 #, fuzzy
 msgid "_Previous"
 msgstr "_Fyrra"
 
-#: ../e-util/e-search-bar.c:614
+#: ../e-util/e-search-bar.c:615
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:623
+#: ../e-util/e-search-bar.c:624
 #, fuzzy
 msgid "_Next"
 msgstr "_Næsta"
 
-#: ../e-util/e-search-bar.c:626
+#: ../e-util/e-search-bar.c:627
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:635
+#: ../e-util/e-search-bar.c:636
 #, fuzzy
 msgid "Mat_ch case"
 msgstr "Hástafsnæ_mt"
 
-#: ../e-util/e-search-bar.c:663
+#: ../e-util/e-search-bar.c:664
 msgid "Reached bottom of page, continued from top"
 msgstr ""
 
-#: ../e-util/e-search-bar.c:685
+#: ../e-util/e-search-bar.c:686
 msgid "Reached top of page, continued from bottom"
 msgstr ""
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
-#, fuzzy
+#: ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../modules/mail/e-mail-shell-view.c:1172
 #: ../smime/gui/certificate-manager.c:1669
+#, fuzzy
 msgid "Mail"
 msgstr "Póstur"
 
@@ -13163,8 +13283,9 @@ msgid "Standard"
 msgstr "Staðlað"
 
 #: ../e-util/e-send-options.ui.h:6
+#, fuzzy
 msgid "Proprietary"
-msgstr ""
+msgstr "Séreignarhugbúnaður"
 
 #: ../e-util/e-send-options.ui.h:8
 #, fuzzy
@@ -13233,9 +13354,10 @@ msgid "_Set expiration date"
 msgstr ""
 
 #: ../e-util/e-send-options.ui.h:24
+#, fuzzy
 msgctxt "ESendOptions"
 msgid "_Until"
-msgstr ""
+msgstr "þar til"
 
 #: ../e-util/e-send-options.ui.h:25
 msgid "Delivery Options"
@@ -13246,8 +13368,9 @@ msgid "_Priority:"
 msgstr "_Forgangur:"
 
 #: ../e-util/e-send-options.ui.h:27
+#, fuzzy
 msgid "_Classification:"
-msgstr ""
+msgstr "Flokkun"
 
 #: ../e-util/e-send-options.ui.h:28
 #, fuzzy
@@ -13302,30 +13425,30 @@ msgstr ""
 msgid "Sta_tus Tracking"
 msgstr ""
 
-#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Gerð:"
 
-#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 #, fuzzy
 msgid "Name:"
 msgstr "Nafn:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1305
+#: ../e-util/e-source-config.c:1311
 msgid "Refresh every"
 msgstr ""
 
-#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
 msgid "Use a secure connection"
 msgstr ""
 
-#: ../e-util/e-source-config.c:1431
+#: ../e-util/e-source-config.c:1437
 msgid "Unset _trust for SSL certificate"
 msgstr ""
 
-#: ../e-util/e-source-config.c:1467
+#: ../e-util/e-source-config.c:1473
 #, fuzzy
 msgid "User"
 msgstr "Notandi"
@@ -13356,28 +13479,28 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:379
+#: ../e-util/e-spell-entry.c:408
 msgid "(no suggestions)"
 msgstr ""
 
-#: ../e-util/e-spell-entry.c:403
+#: ../e-util/e-spell-entry.c:432
 #, fuzzy
 msgid "More..."
 msgstr "Meira..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:517
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr ""
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:537
+#: ../e-util/e-spell-entry.c:566
 #, fuzzy
 msgid "Ignore All"
 msgstr "Hunsa _Allt"
 
-#: ../e-util/e-spell-entry.c:569
+#: ../e-util/e-spell-entry.c:598
 #, fuzzy
 msgid "Spelling Suggestions"
 msgstr "Tillögur um _stafsetningu..."
@@ -13400,8 +13523,9 @@ msgid "Because \"{1}\"."
 msgstr ""
 
 #: ../e-util/e-system.error.xml.h:6
+#, fuzzy
 msgid "Cannot open file \"{0}\"."
-msgstr ""
+msgstr "Gat ekki opnað skrá"
 
 #: ../e-util/e-system.error.xml.h:7
 msgid "Failed to remove data source &quot;{0}&quot;."
@@ -13417,7 +13541,7 @@ msgstr ""
 
 #: ../e-util/e-system.error.xml.h:10
 msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr ""
+msgstr "Gat ekki eytt tilfangi &quot;{0}&quot;."
 
 #: ../e-util/e-system.error.xml.h:11
 msgid ""
@@ -13525,8 +13649,6 @@ msgstr ""
 
 #: ../e-util/e-table-config.ui.h:2
 #, fuzzy
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
 msgid "_Apply"
 msgstr "Virkj_a"
 
@@ -13604,8 +13726,9 @@ msgid ""
 msgstr ""
 
 #: ../e-util/e-table-field-chooser-dialog.c:226
+#, fuzzy
 msgid "Add a Column"
-msgstr ""
+msgstr "Bæta við _dálki..."
 
 #: ../e-util/e-table-group-container.c:368
 #, fuzzy, c-format
@@ -13738,103 +13861,117 @@ msgid "Flags"
 msgstr "Flögg"
 
 #: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:721
 #, fuzzy
-#: ../mail/e-mail-config-identity-page.c:722
 msgid "Identity"
 msgstr "Auðkenni"
 
-#: ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view.c:316
 msgid "_Copy Link Location"
 msgstr "_Afrita slóð tengils"
 
-#: ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view.c:318
 msgid "Copy the link to the clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view.c:326
 msgid "_Open Link in Browser"
 msgstr "_Opna tengil í vafra"
 
-#: ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view.c:328
 msgid "Open the link in a web browser"
 msgstr ""
 
-#: ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view.c:336
+#, fuzzy
 msgid "_Copy Email Address"
-msgstr ""
+msgstr "Afrita _Netfang"
+
+#: ../e-util/e-web-view.c:343
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "Afrita _Netfang"
+
+#: ../e-util/e-web-view.c:345
+#, fuzzy
+#| msgid "Copy the email address to the clipboard"
+msgid "Copy the raw email address to the clipboard"
+msgstr "Afrita netfang yfir á klippispjald"
 
-#: ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:360
+#, fuzzy
 msgid "_Copy Image"
-msgstr ""
+msgstr "Afrita _mynd"
 
-#: ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:367
 #, fuzzy
 #| msgid "Save as..."
 msgid "Save _Image..."
 msgstr "Vista mynd"
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:369
 msgid "Save the image to a file"
 msgstr ""
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1337
+#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1001
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to call %s"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1003
+#: ../e-util/e-web-view.c:1071
 msgid "Click to hide/unhide addresses"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1014
+#: ../e-util/e-web-view.c:1082
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1016
+#: ../e-util/e-web-view.c:1084
 msgid "Go to the beginning of the message"
 msgstr ""
 
-#: ../e-util/e-web-view.c:1020
+#: ../e-util/e-web-view.c:1088
 #, c-format
 msgid "Click to open %s"
 msgstr ""
 
-#: ../e-util/e-web-view.c:2853
+#: ../e-util/e-web-view.c:3034
 msgid "Copying image to clipboard"
 msgstr ""
 
-#: ../e-util/e-web-view.c:3041
+#: ../e-util/e-web-view.c:3222
 #, fuzzy
 msgid "Save Image"
 msgstr "Vista mynd"
 
-#: ../e-util/e-web-view.c:3077
-#, c-format
+#: ../e-util/e-web-view.c:3258
+#, fuzzy, c-format
 msgid "Saving image to '%s'"
-msgstr ""
+msgstr "Vista mynd í %s"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr ""
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr ""
 
@@ -13910,23 +14047,26 @@ msgstr ""
 msgid "a time relative to the current time"
 msgstr ""
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:85
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:87
 #, fuzzy
 msgid "seconds"
 msgstr "sekúndur"
 
 #: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+#, fuzzy
 msgid "weeks"
-msgstr ""
+msgstr "vikur"
 
 #: ../e-util/filter.ui.h:10
+#, fuzzy
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
-msgstr ""
+msgstr "mánuðir"
 
 #: ../e-util/filter.ui.h:11
+#, fuzzy
 msgid "years"
-msgstr ""
+msgstr "Ár"
 
 #: ../e-util/filter.ui.h:12
 msgid "ago"
@@ -13982,7 +14122,7 @@ msgid "begin editing this cell"
 msgstr "byrja að breyta þessum reit"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:177
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "víxla reit"
 
@@ -14075,11 +14215,6 @@ msgstr ""
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr ""
-
 #: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -14131,39 +14266,44 @@ msgstr[1] ""
 msgid "Invalid folder URI '%s'"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1174
-#: ../modules/mail/e-mail-shell-view-private.c:1074
-#: ../modules/mail/e-mail-shell-view-private.c:1085
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1081
+#: ../modules/mail/e-mail-shell-view-private.c:1092
 msgid "Inbox"
 msgstr ""
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1167
-#: ../modules/mail/e-mail-shell-view-private.c:1072
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1079
 msgid "Drafts"
 msgstr ""
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1178
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1083
 msgid "Outbox"
 msgstr ""
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1182
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 #, fuzzy
-#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Sent:"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1170
-#, fuzzy
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1087
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
-#: ../plugins/templates/templates.c:1442
+#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
+#: ../plugins/templates/templates.c:1488
+#, fuzzy
 msgid "Templates"
 msgstr "Sniðmát"
 
@@ -14172,72 +14312,62 @@ msgstr "Sniðmát"
 msgid "User cancelled operation"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:1389
-#, c-format
-msgid "%s authentication failed"
-msgstr ""
-
-#: ../libemail-engine/e-mail-session.c:1439
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr ""
-
-#: ../libemail-engine/e-mail-session.c:1502
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:1515
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 
-#: ../libemail-engine/e-mail-session.c:2509
+#: ../libemail-engine/e-mail-session.c:2360
 #, fuzzy, c-format
 msgid "Waiting for '%s'"
 msgstr "Vista í möppu..."
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../libemail-engine/e-mail-session-utils.c:540
 msgid "No mail transport service available"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:635
-#: ../libemail-engine/mail-ops.c:723
+#: ../libemail-engine/e-mail-session-utils.c:630
+#: ../libemail-engine/mail-ops.c:719
 #, fuzzy, c-format
 msgid "Posting message to '%s'"
 msgstr "Vista Sem"
 
-#: ../libemail-engine/e-mail-session-utils.c:672
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:702
-#: ../libemail-engine/e-mail-session-utils.c:737
-#: ../libemail-engine/mail-ops.c:783 ../libemail-engine/mail-ops.c:818
+#: ../libemail-engine/e-mail-session-utils.c:697
+#: ../libemail-engine/e-mail-session-utils.c:732
+#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
 #, fuzzy, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Vista Sem"
 
-#: ../libemail-engine/e-mail-session-utils.c:726
-#: ../libemail-engine/mail-ops.c:807
+#: ../libemail-engine/e-mail-session-utils.c:721
+#: ../libemail-engine/mail-ops.c:803
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local 'Sent' folder instead."
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:756
-#: ../libemail-engine/mail-ops.c:835
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:831
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr ""
 
-#: ../libemail-engine/e-mail-session-utils.c:958
-#: ../libemail-engine/mail-ops.c:983 ../libemail-engine/mail-ops.c:1085
+#: ../libemail-engine/e-mail-session-utils.c:953
+#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
 msgid "Sending message"
 msgstr "Sendi bréfið"
 
@@ -14274,7 +14404,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:753
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14283,59 +14413,59 @@ msgid ""
 "Original error was: %s"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:994
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sendi bréf %d af %d"
 
-#: ../libemail-engine/mail-ops.c:1046
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libemail-engine/mail-ops.c:1052
+#: ../libemail-engine/mail-ops.c:1048
 #, fuzzy
 msgid "Canceled."
 msgstr "Hætt við"
 
-#: ../libemail-engine/mail-ops.c:1054
+#: ../libemail-engine/mail-ops.c:1050
 #, fuzzy
 msgid "Complete."
 msgstr "Fullklárað"
 
-#: ../libemail-engine/mail-ops.c:1168
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1169
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1288
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1416
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1417
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1492
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: ../libemail-engine/mail-ops.c:1584
+#: ../libemail-engine/mail-ops.c:1580
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr ""
@@ -14410,10 +14540,10 @@ msgid "De_fault"
 msgstr "Sjálfgefið"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#, fuzzy
-#: ../modules/mail/em-composer-prefs.c:1228
+#: ../modules/mail/em-composer-prefs.c:1270
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../plugins/publish-calendar/publish-calendar.c:855
+#, fuzzy
 msgid "Enabled"
 msgstr "Virkt"
 
@@ -14429,16 +14559,12 @@ msgstr ""
 msgid "Missing domain in email address"
 msgstr ""
 
-#: ../mail/e-mail-backend.c:855
-msgid "Unknown background operation"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:903
 #: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Loka þessum glugga"
 
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr ""
 
@@ -14460,7 +14586,7 @@ msgstr ""
 msgid "_Revise Details"
 msgstr ""
 
-#: ../mail/e-mail-config-auth-check.c:349
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr ""
 
@@ -14508,13 +14634,14 @@ msgid "Archi_ve Folder:"
 msgstr "_Leita"
 
 #: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1079
+#: ../modules/mail/em-mailer-prefs.c:1397
 msgid "Choose a folder to archive messages to."
 msgstr ""
 
 #: ../mail/e-mail-config-defaults-page.c:652
+#, fuzzy
 msgid "_Restore Defaults"
-msgstr ""
+msgstr "Endu_rheimta sjálfgefið"
 
 #: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
@@ -14581,47 +14708,49 @@ msgstr ""
 msgid "Account Information"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:346
+#: ../mail/e-mail-config-summary-page.c:352
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../mail/e-mail-config-identity-page.c:372
 #, fuzzy
 #| msgid "_Full Name:"
 msgid "Full Nam_e:"
 msgstr "_Fullt Nafn:"
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../mail/e-mail-config-identity-page.c:399
+#, fuzzy
 msgid "Email _Address:"
-msgstr ""
+msgstr "Tölvupóstfang"
 
-#: ../mail/e-mail-config-identity-page.c:447
-#, fuzzy
+#: ../mail/e-mail-config-identity-page.c:446
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
+#, fuzzy
 msgid "Optional Information"
 msgstr "Valfrjálsar upplýsingar:"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../mail/e-mail-config-identity-page.c:482
+#, fuzzy
 msgid "Or_ganization:"
-msgstr ""
+msgstr "S_ofnun:"
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr ""
 
-#: ../mail/e-mail-config-identity-page.c:556
-msgid "Try _setup account automatically, based on Email Address"
+#: ../mail/e-mail-config-identity-page.c:555
+msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
 
 #: ../mail/e-mail-config-lookup-page.c:70
@@ -14653,7 +14782,7 @@ msgid "%s - %s"
 msgstr "%s (%s)"
 
 #: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:30
 #: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
@@ -14678,22 +14807,22 @@ msgid "Si_gning algorithm:"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:71
 msgid "SHA1"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:72
 msgid "SHA256"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:73
 msgid "SHA384"
 msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:74
 msgid "SHA512"
 msgstr ""
 
@@ -14715,18 +14844,18 @@ msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
-msgstr ""
+msgstr "U_ndirritunarskilríki:"
 
 #: ../mail/e-mail-config-security-page.c:535
-#, fuzzy
 #: ../mail/e-mail-config-security-page.c:641
+#, fuzzy
 msgid "Select"
 msgstr "Velja"
 
 #: ../mail/e-mail-config-security-page.c:544
-#, fuzzy
 #: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:1006
+#, fuzzy
 msgid "_Clear"
 msgstr "_Hreinsa"
 
@@ -14740,7 +14869,7 @@ msgstr ""
 
 #: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
-msgstr ""
+msgstr "Dulritunarskírteini:"
 
 #: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
@@ -14772,53 +14901,54 @@ msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:369
 #, fuzzy
 msgid "Personal Details"
 msgstr "Persónuupplýsingar"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../mail/e-mail-config-summary-page.c:378
 #, fuzzy
 #| msgid "_Full Name:"
 msgid "Full Name:"
 msgstr "Fullt nafn"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../mail/e-mail-config-summary-page.c:392
+#, fuzzy
 msgid "Email Address:"
-msgstr ""
+msgstr "Tölvupóstfang"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:406
 #, fuzzy
 msgid "Receiving"
 msgstr "Móttek"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../mail/e-mail-config-summary-page.c:418
 #, fuzzy
 msgid "Sending"
 msgstr "Sendi"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr ""
 
-#: ../mail/e-mail-config-summary-page.c:452
+#: ../mail/e-mail-config-summary-page.c:451
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 #, fuzzy
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "Þ_jónn:"
 
-#: ../mail/e-mail-config-summary-page.c:473
+#: ../mail/e-mail-config-summary-page.c:472
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 #, fuzzy
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Notandanafn:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../mail/e-mail-config-summary-page.c:493
 #, fuzzy
 msgid "Security:"
 msgstr "Öryggi"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../mail/e-mail-config-summary-page.c:784
 msgid "Account Summary"
 msgstr ""
 
@@ -14830,35 +14960,36 @@ msgid ""
 msgstr ""
 
 #: ../mail/e-mail-config-welcome-page.c:166
+#, fuzzy
 #: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
-msgstr ""
+msgstr "Velkomin"
 
 #: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr ""
 
-#: ../mail/e-mail-display.c:97
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr ""
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr ""
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr ""
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr ""
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr ""
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr ""
 
@@ -14883,46 +15014,46 @@ msgstr "_Heiti möppu:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:226
+#: ../mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Answered"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:227
+#: ../mail/e-mail-free-form-exp.c:237
 #, fuzzy
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Eyða"
 
-#: ../mail/e-mail-free-form-exp.c:228
+#: ../mail/e-mail-free-form-exp.c:238
 #, fuzzy
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Vista Sem"
 
-#: ../mail/e-mail-free-form-exp.c:229
+#: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:230
+#: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
 msgid "Seen"
 msgstr ""
 
-#: ../mail/e-mail-free-form-exp.c:231
+#: ../mail/e-mail-free-form-exp.c:241
 #, fuzzy
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Viðhengi"
 
-#: ../mail/e-mail-free-form-exp.c:479
+#: ../mail/e-mail-free-form-exp.c:489
 #, fuzzy
 msgctxt "ffe"
 msgid "no"
 msgstr "nei"
 
-#: ../mail/e-mail-free-form-exp.c:480
+#: ../mail/e-mail-free-form-exp.c:490
 #, fuzzy
 msgctxt "ffe"
 msgid "false"
@@ -14967,7 +15098,7 @@ msgid "_Later"
 msgstr ""
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Add Label"
 msgstr ""
 
@@ -15016,677 +15147,697 @@ msgstr ""
 msgid "Header Value"
 msgstr ""
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:119
 msgid "Headers"
 msgstr ""
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Blaðsíða %d af %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
 msgid "Copy to Folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
 #, fuzzy
 msgid "_Move"
 msgstr "_Flytja"
 
 #  create the dialog
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
 #, fuzzy
 msgid "C_opy"
 msgstr "_Afrita"
 
-#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1273 ../mail/e-mail-reader.c:1485
+#: ../mail/e-mail-reader.c:1525
 msgid "_Do not ask me again."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1531
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:1733
 msgid "Failed to retrieve message:"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
+#: ../mail/e-mail-reader.c:1778 ../mail/e-mail-reader.c:3110
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1966
 msgid "A_dd Sender to Address Book"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1968
 msgid "Add sender to address book"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1973
 #, fuzzy
 msgid "_Archive..."
 msgstr "SKRÁARSAFN"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1975
 msgid "Move selected messages to the Archive folder for the account"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1980
 msgid "Check for _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1982
 msgid "Filter the selected messages for junk status"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1987
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1989
 msgid "Copy selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1994
 msgid "_Delete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1996
 msgid "Mark the selected messages for deletion"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:2001
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a rule to filter messages to this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2008
 msgid "Create a Filter Rule for _Recipients..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a rule to filter messages to these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2015
 msgid "Create a Filter Rule for Se_nder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a rule to filter messages from this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2022
 msgid "Create a Filter Rule for _Subject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2024
 msgid "Create a rule to filter messages with this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2029
 msgid "A_pply Filters"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2031
 msgid "Apply filter rules to the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2036
 msgid "_Find in Message..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2038
 msgid "Search for text in the body of the displayed message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2043
 msgid "_Clear Flag"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2045
 msgid "Remove the follow-up flag from the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2050
 msgid "_Flag Completed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2052
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2057
 msgid "Follow _Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2059
 msgid "Flag the selected messages for follow-up"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2064
 msgid "_Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2066 ../mail/e-mail-reader.c:2073
 msgid "Forward the selected message to someone as an attachment"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2071
 msgid "Forward As _Attached"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2078
 msgid "_Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2080 ../mail/e-mail-reader.c:2087
 msgid "Forward the selected message in the body of a new message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2085
 msgid "Forward As _Inline"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2092
 msgid "_Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2094 ../mail/e-mail-reader.c:2101
 msgid "Forward the selected message quoted like a reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2099
 msgid "Forward As _Quoted"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2106
 msgid "_Load Images"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2108
 msgid "Force images in HTML mail to be loaded"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2113 ../mail/e-mail-reader.c:2491
 msgid "_Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2115
 msgid "Mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2120 ../mail/e-mail-reader.c:2495
 msgid "_Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2122
 msgid "Mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2127
 #, fuzzy
 msgid "_Important"
 msgstr "MIKILVÆGT"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2129
 msgid "Mark the selected messages as important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2134
+#, fuzzy
 msgid "_Junk"
-msgstr ""
+msgstr "Ruslpóstur"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2136
 msgid "Mark the selected messages as junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2141
 msgid "_Not Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2143
 msgid "Mark the selected messages as not being junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2148
 #, fuzzy
 msgid "_Read"
 msgstr "_Lesa"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2150
 msgid "Mark the selected messages as having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#: ../mail/e-mail-reader.c:2155 ../mail/e-mail-reader.c:2515
 msgid "Do not _Ignore Subthread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2157
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+#: ../mail/e-mail-reader.c:2162 ../mail/e-mail-reader.c:2519
 msgid "Do not _Ignore Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2164
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2169
 msgid "Uni_mportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2171
 msgid "Mark the selected messages as unimportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2176
 msgid "_Unread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2178
 msgid "Mark the selected messages as not having been read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2183
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2185
 msgid "Open the selected messages in the composer for editing"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2190
 msgid "Compose _New Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2192
 msgid "Open a window for composing a mail message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2197
 #, fuzzy
 msgid "_Open in New Window"
 msgstr "Opna í nýjum _glugga"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2199
 msgid "Open the selected messages in a new window"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2204
 msgid "_Move to Folder..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2206
 msgid "Move selected messages to another folder"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2211
 msgid "_Next Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2213
 msgid "Display the next message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2218
 msgid "Next _Important Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2220
 msgid "Display the next important message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2225
 msgid "Next _Thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2227
 msgid "Display the next thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2232
 msgid "Next _Unread Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2234
 msgid "Display the next unread message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2239
 msgid "_Previous Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2241
 msgid "Display the previous message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2246
 msgid "Pr_evious Important Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2248
 msgid "Display the previous important message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2253
 msgid "Previous T_hread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2255
 msgid "Display the previous thread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2260
 msgid "P_revious Unread Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2262
 msgid "Display the previous unread message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2269
 msgid "Print this message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2276
 msgid "Preview the message to be printed"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2281
 msgid "Re_direct"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2283
 msgid "Redirect (bounce) the selected message to someone"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2288
 msgid "Remo_ve Attachments"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove attachments"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2295
 msgid "Remove Du_plicate Messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2297
 msgid "Checks selected messages for duplicates"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2302 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2304
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2309 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2311
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2316
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2318
 msgid "Compose a reply to the sender of the selected message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2318
-#| msgid "Save as..."
+#: ../mail/e-mail-reader.c:2323
 msgid "_Save as mbox..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2325
 msgid "Save selected messages as an mbox file"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2330
 msgid "_Message Source"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2332
 msgid "Show the raw email source of the message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2344
 msgid "_Undelete Message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2346
 msgid "Undelete the selected messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2351
 #, fuzzy
 msgid "_Normal Size"
 msgstr "Ve_njuleg Stærð"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2353
 msgid "Reset the text to its original size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2358
 #, fuzzy
 msgid "_Zoom In"
 msgstr "_Súma inn"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2360
 msgid "Increase the text size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2367
 msgid "Decrease the text size"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2374
 #, fuzzy
 msgid "Cre_ate"
 msgstr "_Búa til"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2381
 #, fuzzy
 msgid "Ch_aracter Encoding"
 msgstr "Sta_fatafla:"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2388
 msgid "F_orward As"
 msgstr ""
 
 #  create the dialog
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2395
 msgid "_Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2402
 #, fuzzy
 msgid "_Go To"
 msgstr "Fara í:"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2409
 msgid "Mar_k As"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2416
 #, fuzzy
 msgid "_Message"
 msgstr "Skilaboð"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2423
 #, fuzzy
 msgid "_Zoom"
 msgstr "Aðdrá_ttur"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2433
 msgid "Create a Search Folder from Mailing _List..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a search folder for this mailing list"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2440
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a search folder for these recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2447
 msgid "Create a Search Folder from Sen_der..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a search folder for this sender"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2454
 msgid "Create a Search Folder from S_ubject..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2456
 msgid "Create a search folder for this subject"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2483
 msgid "Mark for Follo_w Up..."
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2499
 msgid "Mark as _Important"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2498
+#: ../mail/e-mail-reader.c:2503
 msgid "Mark as _Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2502
+#: ../mail/e-mail-reader.c:2507
 msgid "Mark as _Not Junk"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2506
+#: ../mail/e-mail-reader.c:2511
 msgid "Mar_k as Read"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2523
 msgid "Mark as Uni_mportant"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2522
+#: ../mail/e-mail-reader.c:2527
 msgid "Mark as _Unread"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2566
+#: ../mail/e-mail-reader.c:2571
 msgid "_Caret Mode"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2568
+#: ../mail/e-mail-reader.c:2573
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2574
+#: ../mail/e-mail-reader.c:2579
 msgid "All Message _Headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2581
 msgid "Show messages with all email headers"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:3019
+#: ../mail/e-mail-reader.c:3116
 msgid "Retrieving message"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4027
-#, fuzzy
+#: ../mail/e-mail-reader.c:4138
 #: ../modules/mail/e-mail-attachment-handler.c:206
+#, fuzzy
 msgid "_Forward"
 msgstr "Á_fram"
 
-#: ../mail/e-mail-reader.c:4028
+#: ../mail/e-mail-reader.c:4139
 msgid "Forward the selected message to someone"
 msgstr ""
 
 #  create the dialog
-#: ../mail/e-mail-reader.c:4047
+#: ../mail/e-mail-reader.c:4158
 msgid "Group Reply"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4048
+#: ../mail/e-mail-reader.c:4159
 msgid "Reply to the mailing list, or to all recipients"
 msgstr ""
 
-#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
+#: ../mail/e-mail-reader.c:4225 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Eyða"
 
-#: ../mail/e-mail-reader.c:4126
-#, fuzzy
+#: ../mail/e-mail-reader.c:4237
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#, fuzzy
 msgid "Next"
 msgstr "Næsta"
 
-#: ../mail/e-mail-reader.c:4130
-#, fuzzy
+#: ../mail/e-mail-reader.c:4241
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#, fuzzy
 msgid "Previous"
 msgstr "Fyrri"
 
-#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4250 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr ""
 
+#: ../mail/e-mail-reader.c:5303
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5305
+#, c-format
+msgid "Allow remote content for %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5322
+#, c-format
+msgid "Allow remote content from %s"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:5378
+msgid "Load remote content"
+msgstr ""
+
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr ""
 
 #: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../shell/e-shell.c:867 ../shell/e-shell.c:888
 #: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Óþekkt villa"
 
-#: ../mail/e-mail-reader-utils.c:1033
+#: ../mail/e-mail-reader-utils.c:1045
 msgid "Marking thread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1037
+#: ../mail/e-mail-reader-utils.c:1049
 msgid "Unmarking thread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1053
 msgid "Marking subthread to be ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1045
+#: ../mail/e-mail-reader-utils.c:1057
 msgid "Unmarking subthread from being ignored"
 msgstr ""
 
-#: ../mail/e-mail-reader-utils.c:1280
+#: ../mail/e-mail-reader-utils.c:1296
 #, fuzzy
 #| msgid "Print"
 msgid "Printing"
@@ -15694,7 +15845,7 @@ msgstr "Prentun"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1515
+#: ../mail/e-mail-reader-utils.c:1531
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15705,7 +15856,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/e-mail-reader-utils.c:2345
+#: ../mail/e-mail-reader-utils.c:2361
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] ""
@@ -15716,14 +15867,14 @@ msgstr[1] ""
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2366
+#: ../mail/e-mail-reader-utils.c:2382
 #, fuzzy
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Skilaboð"
-msgstr[1] ""
+msgstr[1] "Skilaboð"
 
-#: ../mail/e-mail-reader-utils.c:2739
+#: ../mail/e-mail-reader-utils.c:2755
 msgid "Parsing message"
 msgstr ""
 
@@ -15735,34 +15886,44 @@ msgstr ""
 msgid "Flag to Follow Up"
 msgstr ""
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr ""
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr ""
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1507
+#: ../mail/em-composer-utils.c:1542
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1513
+#: ../mail/em-composer-utils.c:1548
 msgid "-------- Forwarded Message --------"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:1518
+#: ../mail/em-composer-utils.c:1553
 msgid "-----Original Message-----"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:2668
+#: ../mail/em-composer-utils.c:2766
 msgid "an unknown sender"
 msgstr ""
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3076
+#: ../mail/em-composer-utils.c:3204
 msgid "Posting destination"
 msgstr ""
 
-#: ../mail/em-composer-utils.c:3081
+#: ../mail/em-composer-utils.c:3209
 msgid "Choose folders to post the message to."
 msgstr ""
 
@@ -15845,12 +16006,12 @@ msgstr ""
 msgid "Copying folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
@@ -15892,7 +16053,7 @@ msgid "Subscribe To _All"
 msgstr ""
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -15931,7 +16092,7 @@ msgid "Su_bscribe"
 msgstr ""
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr ""
 
@@ -15940,8 +16101,9 @@ msgid "Collapse all folders"
 msgstr ""
 
 #: ../mail/em-subscription-editor.c:1907
+#, fuzzy
 msgid "C_ollapse All"
-msgstr ""
+msgstr "Fella allt saman"
 
 #: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
@@ -15956,9 +16118,9 @@ msgid "Refresh the folder list"
 msgstr ""
 
 #: ../mail/em-subscription-editor.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 #, fuzzy
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Refresh"
 msgstr "_Hressa"
 
@@ -15967,8 +16129,8 @@ msgid "Stop the current operation"
 msgstr ""
 
 #: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 #, fuzzy
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "_Stop"
 msgstr "_Stopp"
 
@@ -15983,11 +16145,11 @@ msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:176
 msgid "Message Filters"
 msgstr ""
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:922
 #, c-format
 msgid "Messages from %s"
 msgstr ""
@@ -16070,14 +16232,14 @@ msgid "Recipients"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
-#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:14
+#, fuzzy
 msgid "CC"
 msgstr "_Cc:"
 
 #: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
-#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:15
+#, fuzzy
 msgid "BCC"
 msgstr "_Bcc:"
 
@@ -16117,8 +16279,8 @@ msgid "Message Body"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
-#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:25
+#, fuzzy
 msgid "Expression"
 msgstr "FYRIRSPURN"
 
@@ -16148,14 +16310,14 @@ msgid "Date received"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
-#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:31
+#, fuzzy
 msgid "Label"
 msgstr "Merki"
 
 #: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
-#, fuzzy
 #: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+#, fuzzy
 msgid "Score"
 msgstr "Stig"
 
@@ -16170,22 +16332,23 @@ msgid "Replied to"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:40
+#, fuzzy
 msgid "Important"
 msgstr "Mikilvægt"
 
 #. Past tense, as in "has been read".
 #: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
-#, fuzzy
 #: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#, fuzzy
 msgid "Read"
 msgstr "lesa"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:126
+#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
-msgstr ""
+msgstr "Ruslpóstur"
 
 #: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
 #: ../mail/vfoldertypes.xml.in.h:43
@@ -16204,130 +16367,130 @@ msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
-msgstr ""
+#, fuzzy
+#| msgid "% Completed"
+msgid "is Completed"
+msgstr "% lokið"
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
 #: ../mail/vfoldertypes.xml.in.h:47
-msgid "is set"
-msgstr ""
+#, fuzzy
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "% lokið"
 
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
+msgid "Mailing list"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
 #: ../mail/vfoldertypes.xml.in.h:52
-msgid "Mailing list"
+msgid "Regex Match"
 msgstr ""
 
 #: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
 #: ../mail/vfoldertypes.xml.in.h:53
-msgid "Regex Match"
-msgstr ""
-
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Header"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:51
 msgid "Source Account"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Pipe to Program"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:53
 msgid "returns"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:54
 msgid "does not return"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:55
 msgid "returns greater than"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns less than"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:57
 msgid "Junk Test"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Message is Junk"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is not Junk"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Location"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Match All"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
+#, fuzzy
 #: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
-msgstr ""
+msgstr "Eytt"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:74
 #, fuzzy
 msgid "Beep"
 msgstr "_Píp"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr ""
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr ""
 
@@ -16344,57 +16507,89 @@ msgid "Import mail from Elm."
 msgstr ""
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#, fuzzy
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
-msgstr ""
+msgstr "Úttaksma_ppa:"
 
 #: ../mail/importers/evolution-mbox-importer.c:140
-#, fuzzy
+#: ../mail/importers/kmail-importer.c:216
 #: ../plugins/dbx-import/dbx-importer.c:252
 #: ../plugins/pst-import/pst-importer.c:541
+#, fuzzy
 msgid "Select folder"
 msgstr "Veldu möppu"
 
 #: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
 #: ../plugins/dbx-import/dbx-importer.c:253
 #: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 #, fuzzy
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "_Efnislína:"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 #, fuzzy
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Frá:"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../mail/importers/evolution-mbox-importer.c:568
 #: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr ""
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:54
+#: ../mail/importers/kmail-importer.c:263
+#, fuzzy, c-format
+#| msgid "Address"
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "Heimilisfang"
+msgstr[1] "Heimilisfang"
+
+#: ../mail/importers/kmail-importer.c:354
+#, fuzzy
+#| msgid "Evolution LDIF importer"
+msgid "Evolution KMail importer"
+msgstr "Evolution LDIF innflutningur"
+
+#: ../mail/importers/kmail-importer.c:355
+msgid "Import mail and contacts from KMail."
+msgstr ""
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1089
+#, fuzzy
+msgid "Trash"
+msgstr "Rusl"
+
+#: ../mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr ""
 
+#: ../mail/importers/mail-importer.c:61
+msgid "Importing mail and contacts from KMail"
+msgstr ""
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr ""
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:570
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -16478,193 +16673,197 @@ msgstr ""
 msgid "For_mat messages in HTML"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
+#: ../mail/mail-config.ui.h:10
+msgid "Automatically insert _emoticons"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
+msgid "Use Unicode characters for smile_ys"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
 msgid "Send messages through Outbo_x folder"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 #, fuzzy
 msgid "Ch_aracter encoding:"
 msgstr "Sta_fatafla:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 #, fuzzy
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Viðhengi"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 #, fuzzy
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Innfellt (Outlook stíllinn)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "Sig_natures"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Signatures"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 #, fuzzy
 msgid "_Languages"
 msgstr "_Tungumál"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Languages Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid "Check spelling while I _type"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with an _empty subject line"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a _private reply to a mailing list message"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "Sending a reply to a large _number of recipients"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
 msgid "Confirmations"
 msgstr ""
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
 msgid "Use for Folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 msgid "A_dd"
 msgstr "_Bæta við"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:61
 #, fuzzy
 #| msgid "Remove"
 msgid "Re_move"
 msgstr "Fjarlægja"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:63
 msgid "Use for Recipients"
 msgstr ""
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
+#: ../mail/mail-config.ui.h:65 ../modules/mail/em-composer-prefs.c:864
 #, fuzzy
 msgid "Account"
 msgstr "Aðgangur"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "Send account overrides"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -16672,210 +16871,228 @@ msgid ""
 "parts are compared separately."
 msgstr ""
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
 msgid "Send Account"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:1
 #, fuzzy
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:76 ../smime/gui/smime-ui.ui.h:2
 #, fuzzy
 msgid "b"
 msgstr "_B"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 msgid "Start up"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new _messages on start"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "Check for new messa_ges in all active accounts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "Message Display"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "S_tandard Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML fixed width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "Select HTML variable width font"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
 msgid "Fix_ed Width Font:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "_Mark messages as read after"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
 msgid "Highlight _quotations with"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Veldu lit"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
 #, fuzzy
 msgid "color"
 msgstr "litur"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
 msgid "Default character e_ncoding:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:92
 msgid "Apply the same _view settings to all folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
 msgid "F_all back to threading messages by subject"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:92
-#| msgid "Delete"
+#: ../mail/mail-config.ui.h:94
 msgid "Delete Mail"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:95
 msgid "Empty _trash folders"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
 msgid "Confirm _when expunging a folder"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
 msgid "Archive Mail"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:98
 msgid "On This Computer A_rchive folder:"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:101
 msgid "_Show animated images"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:102
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:101
-msgid "Loading Images"
+#: ../mail/mail-config.ui.h:103
+msgid "Loading Remote Content"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:102
-msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:104
+msgid "_Never load remote content from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:103
-msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:105
+msgid "_Load remote content only in messages from contacts"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:104
-msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:106
+msgid "_Always load remote content from the Internet"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "_Bæta við"
+
+#: ../mail/mail-config.ui.h:108
+#, fuzzy
+msgid "Remove"
+msgstr "_Fjarlægja"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Allow for sites:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:110
+msgid "Allow for senders:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:111
 msgid "HTML Messages"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:112 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:113
 msgid "Sender Photograph"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:114
 msgid "_Show the photograph of sender in the message preview"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:115
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:116
 msgid "Displayed Message Headers"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:117
 msgid "Mail Headers Table"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:118
 #: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Dags/tíma form"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:120
 msgid "Check incoming _messages for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:121
 msgid "_Delete junk messages"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:122
 #, fuzzy
-msgid "Just Test Options"
+msgid "Junk Test Options"
 msgstr "Senda Til:"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:123
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:124
 msgid "_Lookup in local address book only"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:125
 msgid "Check cu_stom headers for junk"
 msgstr ""
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:127
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Án dulritunar"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:128
 msgid "TLS encryption"
 msgstr "TLS dulritun"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:129
 msgid "SSL encryption"
 msgstr "SSL dulritun"
 
@@ -16930,12 +17147,14 @@ msgid "Reply to All"
 msgstr ""
 
 #: ../mail/mail-dialogs.ui.h:18
+#, fuzzy
 msgid "Review"
-msgstr ""
+msgstr "Yfirfara"
 
 #: ../mail/mail-dialogs.ui.h:19
+#, fuzzy
 msgid "License Agreement"
-msgstr ""
+msgstr "Notkunarleyfi"
 
 #: ../mail/mail-dialogs.ui.h:20
 msgid "_Tick this to accept the license agreement"
@@ -17120,8 +17339,8 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:39
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 #, fuzzy
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "_Empty Trash"
 msgstr "_Tæma ruslið"
 
@@ -17320,7 +17539,6 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:90
 #, fuzzy
-#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "Gera óvirkt"
 
@@ -17491,12 +17709,10 @@ msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:134
-#| msgid "Always"
 msgid "_Yes, Always"
 msgstr ""
 
 #: ../mail/mail.error.xml.h:135
-#| msgid "Never"
 msgid "_No, Never"
 msgstr ""
 
@@ -17606,7 +17822,6 @@ msgid ""
 msgstr ""
 
 #: ../mail/mail.error.xml.h:162
-#| msgid "Save in folder..."
 msgid "Failed to open folder."
 msgstr ""
 
@@ -17680,9 +17895,36 @@ msgstr ""
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 
+#: ../mail/mail.error.xml.h:181
+msgid "Remote content download had been blocked for this message."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:182
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:184
+#, fuzzy
+msgid "{0}, Completed on {1}"
+msgstr "Lokið"
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:186
+msgid "{0} by {1}"
+msgstr ""
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:188
+msgid "Overdue: {0} by {1}"
+msgstr ""
+
 #: ../mail/mail-send-recv.c:191
+#, fuzzy
 msgid "Canceling..."
-msgstr ""
+msgstr "Hætti við..."
 
 #: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
@@ -17692,7 +17934,7 @@ msgstr ""
 msgid "Cancel _All"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1248
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
 #, fuzzy
 msgid "Updating..."
 msgstr "Uppfæri..."
@@ -17707,17 +17949,17 @@ msgstr "Bíð"
 msgid "Checking for new mail at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1421
+#: ../mail/mail-send-recv.c:1434
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1423
+#: ../mail/mail-send-recv.c:1436
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr ""
 
-#: ../mail/mail-send-recv.c:1425
+#: ../mail/mail-send-recv.c:1438
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr ""
@@ -17775,7 +18017,7 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:5969
+#: ../mail/message-list.c:459 ../mail/message-list.c:6044
 msgid "Generating message list"
 msgstr ""
 
@@ -17804,20 +18046,21 @@ msgstr ""
 msgid "%b %d %Y"
 msgstr "%b %-d %Y"
 
-#: ../mail/message-list.c:2960
+#: ../mail/message-list.c:2967
 msgid "Select all visible messages"
 msgstr ""
 
-#: ../mail/message-list.c:3610 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3632 ../mail/message-list.etspec.h:17
+#, fuzzy
 msgid "Messages"
-msgstr ""
+msgstr "Skilaboð"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4918
+#: ../mail/message-list.c:4988
 msgid "Follow-up"
 msgstr ""
 
-#: ../mail/message-list.c:5906
+#: ../mail/message-list.c:5981
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -17825,7 +18068,7 @@ msgid ""
 "by changing the query above."
 msgstr ""
 
-#: ../mail/message-list.c:5914
+#: ../mail/message-list.c:5989
 msgid "There are no messages in this folder."
 msgstr ""
 
@@ -17862,43 +18105,43 @@ msgstr ""
 msgid "Any header"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Recipients contain"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Message contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2123
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Subject contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2116
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Sender contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2088
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2115
 msgid "Body contains"
 msgstr ""
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Free form expression"
 msgstr ""
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1234
+#: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Table column:"
 msgstr ""
 
@@ -17952,7 +18195,7 @@ msgid "_Contact"
 msgstr "Hafa samband"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Búa til nýjan tengilið"
 
@@ -17963,17 +18206,18 @@ msgid "Contact _List"
 msgstr "Tengiliðalisti: "
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1088
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Búa til nýjan tengiliðalista"
 
 #: ../modules/addressbook/e-book-shell-backend.c:284
+#, fuzzy
 msgctxt "New"
 msgid "Address _Book"
-msgstr ""
+msgstr "Nafnaskrá"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:1004
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Búa til nýja nafnaskrá"
 
@@ -17986,249 +18230,252 @@ msgid "Address Book Properties"
 msgstr "Stillingar fyrir nafnaskrá"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:578
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 #, fuzzy
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "Save as vCard"
 msgstr "Vista sem vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#, fuzzy
 msgid "D_elete Address Book"
-msgstr ""
+msgstr "Eyða nafnaskrá '{0}'?"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Ný tengiliðabók"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#, fuzzy
 msgid "Address _Book Properties"
-msgstr ""
+msgstr "Stillingar fyrir nafnaskrá"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 #: ../modules/calendar/e-cal-shell-view-actions.c:1254
 #: ../modules/calendar/e-memo-shell-view-actions.c:578
 #: ../modules/calendar/e-task-shell-view-actions.c:703
+#, fuzzy
 msgid "Re_fresh"
 msgstr "_Hressa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
 #: ../modules/calendar/e-cal-shell-view-actions.c:1261
 #: ../modules/calendar/e-memo-shell-view-actions.c:585
 #: ../modules/calendar/e-task-shell-view-actions.c:710
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
+#, fuzzy
 msgid "_Rename..."
 msgstr "Endu_rnefna..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1032
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 #, fuzzy
 msgid "_Copy Contact To..."
 msgstr "Afrita tengilið í"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1060
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#, fuzzy
 msgid "_Forward Contact..."
-msgstr ""
+msgstr "_Áframsenda tengilið"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 #, fuzzy
 msgid "_Move Contact To..."
 msgstr "Flytja tengilið í"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "_Nýr tengiliður..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1086
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Nýr tengiliða_listi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1100
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1109
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
 #: ../modules/calendar/e-cal-shell-view-actions.c:1417
 #: ../modules/calendar/e-task-shell-view-actions.c:768
+#, fuzzy
 msgid "_Actions"
 msgstr "Aðgerðir"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
 #: ../modules/calendar/e-memo-shell-view-actions.c:622
 #: ../modules/calendar/e-task-shell-view-actions.c:775
-#: ../modules/mail/e-mail-shell-view-actions.c:1875
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
+#, fuzzy
 #| msgid "Preview:"
 msgid "_Preview"
 msgstr "_Forsýning"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1179
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
 #: ../modules/calendar/e-memo-shell-view-actions.c:692
 #: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_Classic View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 #: ../modules/calendar/e-memo-shell-view-actions.c:699
 #: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Vertical View"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1222
-#, fuzzy
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1594
 #: ../modules/calendar/e-memo-shell-view-actions.c:716
 #: ../modules/calendar/e-task-shell-view-actions.c:916
+#, fuzzy
 msgid "Unmatched"
 msgstr "Engin samsvörun"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
 #: ../modules/calendar/e-cal-shell-view-actions.c:1604
 #: ../modules/calendar/e-memo-shell-view-actions.c:726
 #: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2081
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1279
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr ""
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1296
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr ""
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1302
-#: ../modules/addressbook/e-book-shell-view-actions.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Vista sem vCard..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1304
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr ""
 
@@ -18274,35 +18521,40 @@ msgstr ""
 msgid "Restore from Backup"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../modules/backup-restore/evolution-backup-restore.c:217
 msgid "Select name of the Evolution backup file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr ""
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../modules/backup-restore/evolution-backup-restore.c:359
 msgid "Back up Evolution data and settings to an archive file"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../modules/backup-restore/evolution-backup-restore.c:366
 msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 
@@ -18328,7 +18580,7 @@ msgstr ""
 
 #. FIXME Will the versioned setting always work?
 #: ../modules/backup-restore/evolution-backup-tool.c:281
-#: ../modules/backup-restore/evolution-backup-tool.c:475
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr ""
 
@@ -18345,65 +18597,65 @@ msgid "Back up complete"
 msgstr ""
 
 #: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:665
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:481
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:488
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:650
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:853
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:854
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:858
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:859
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:928
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:929
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Please wait while Evolution is backing up your data."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:931
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:932
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr ""
 
-#: ../modules/backup-restore/evolution-backup-tool.c:954
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 
@@ -18412,7 +18664,7 @@ msgid "Invalid Evolution backup file"
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
+msgid "File '{0}' is not a valid Evolution backup file."
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
@@ -18426,7 +18678,7 @@ msgid ""
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
+msgid "Close and _Back up Evolution"
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
@@ -18443,7 +18695,7 @@ msgid ""
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
+msgid "Close and _Restore Evolution"
 msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
@@ -18454,28 +18706,28 @@ msgstr ""
 msgid "The selected folder is not writable."
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr ""
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:539
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr ""
@@ -18484,71 +18736,71 @@ msgstr ""
 msgid "Junk filter using Bogofilter"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
 msgid "Standard LDAP Port"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
 msgid "LDAP over SSL (deprecated)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr ""
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Þjóns upplýsingar"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 #, fuzzy
 msgid "Port:"
 msgstr "Hlið:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 #, fuzzy
 msgid "Encryption:"
 msgstr "_Dulritun"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Auðkenni"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 #, fuzzy
 msgid "Anonymous"
 msgstr "Nafnlaust"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr "Nota póstfang"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 #, fuzzy
 msgid "Method:"
 msgstr "_Aðferð"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -18556,36 +18808,36 @@ msgid ""
 msgstr ""
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Leita"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Find Possible Search Bases"
 msgstr "Finna hugsanlega leitargrunna"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -18593,31 +18845,32 @@ msgid ""
 "the entries one level beneath your search base."
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr ""
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Sæki gögn"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+#, fuzzy
 msgid "Limit:"
-msgstr ""
+msgstr "Takmörk"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 #, fuzzy
 msgid "contacts"
 msgstr "tengiliðir"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Browse until limit is reached"
 msgstr ""
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#, fuzzy
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
+#, fuzzy
 msgid "URL:"
 msgstr "Vefslóð:"
 
@@ -18625,65 +18878,39 @@ msgstr "Vefslóð:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
-#, c-format
-msgid "HTTP Error: %s"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
-#, fuzzy
-msgid "Could not parse response"
-msgstr "Ekki tókst að þátta svarið"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
-msgid "Empty response"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
-msgid "Unexpected reply from server"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
-msgid "Could not locate user's calendars"
-msgstr ""
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
-#, fuzzy
-msgid "Path"
-msgstr "Slóð"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:198
-#| msgid "New Calendar"
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:213
 msgid "Choose a Calendar"
 msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:217
 msgid "Choose a Memo List"
 msgstr ""
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-google/e-google-chooser-button.c:221
 msgid "Choose a Task List"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr ""
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 #, fuzzy
 msgid "Email:"
 msgstr "Email 2"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr ""
 
@@ -18695,38 +18922,28 @@ msgstr ""
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr ""
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:125
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr ""
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr ""
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr ""
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr ""
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
-#| msgid "Calendar"
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr ""
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr ""
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 #, fuzzy
 msgid "File:"
 msgstr "_Skrá"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr ""
 
@@ -18736,7 +18953,7 @@ msgstr ""
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
 #, fuzzy
 msgctxt "locale-metric"
 msgid "default:mm"
@@ -18744,29 +18961,29 @@ msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr ""
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr ""
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr ""
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 #, fuzzy
 msgid "Units:"
 msgstr "Einingar:"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:287
-#, fuzzy
 #: ../smime/gui/smime-ui.ui.h:9
+#, fuzzy
 msgid "I_mport"
 msgstr "Flytja _inn"
 
@@ -18783,14 +19000,13 @@ msgid "Importing a task"
 msgstr ""
 
 #: ../modules/calendar/e-cal-attachment-handler.c:403
-#| msgid "New Calendar"
+#, fuzzy
 msgid "Select a Calendar"
-msgstr ""
+msgstr "Veldu dagatal"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:410
-#, fuzzy
 msgid "Select a Memo List"
-msgstr "Valið:"
+msgstr "Veldu minnismiðalista"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
@@ -18805,9 +19021,8 @@ msgid "I_mport to Memo List"
 msgstr ""
 
 #: ../modules/calendar/e-cal-attachment-handler.c:438
-#, fuzzy
 msgid "I_mport to Task List"
-msgstr "Forsýn:"
+msgstr "Flytja _inn í verkefnalista"
 
 #: ../modules/calendar/e-cal-base-shell-backend.c:186
 #: ../modules/calendar/e-cal-shell-view-actions.c:162
@@ -18824,57 +19039,57 @@ msgstr "Nýr minnismiða listi"
 msgid "New Task List"
 msgstr "Nýr verka listi"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:548
 #, c-format
 msgid "Copying an event into the calendar '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:549
 #, c-format
 msgid "Moving an event into the calendar '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:658
 msgid "Calendar Selector"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:664
 msgid "Memo List Selector"
 msgstr ""
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:669
 msgid "Task List Selector"
 msgstr ""
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-calendar-preferences.c:517
 msgid "Selected Calendars for Alarms"
 msgstr "Valn dagatöl fyrir áminningar"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "Ti_me and date:"
 msgstr "_Tími og dagsetning:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:926
 msgid "_Date only:"
 msgstr "_Dagsetning bara:"
 
@@ -19080,10 +19295,6 @@ msgstr ""
 msgid "Default Free/Busy Server"
 msgstr "Sjálfgefinn laus/upptekinn vefþjónn"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Sniðmát:"
-
 #: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -19094,9 +19305,10 @@ msgid "Publishing Information"
 msgstr ""
 
 #: ../modules/calendar/e-cal-shell-backend.c:114
+#, fuzzy
 msgctxt "New"
 msgid "_Appointment"
-msgstr ""
+msgstr "Atburður"
 
 #: ../modules/calendar/e-cal-shell-backend.c:116
 #: ../modules/calendar/e-cal-shell-view-actions.c:1361
@@ -19113,9 +19325,10 @@ msgid "Create a new all-day appointment"
 msgstr ""
 
 #: ../modules/calendar/e-cal-shell-backend.c:128
+#, fuzzy
 msgctxt "New"
 msgid "M_eeting"
-msgstr ""
+msgstr "Fundur"
 
 #: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
@@ -19134,7 +19347,7 @@ msgstr ""
 
 #: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
-msgstr ""
+msgstr "Dagatal og verkefni"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
@@ -19174,21 +19387,21 @@ msgstr "vidburdur"
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:276
 #: ../modules/calendar/e-memo-shell-view-actions.c:469
 #: ../modules/calendar/e-task-shell-view-actions.c:587
-#| msgid "New Calendar"
 msgid "Save as iCalendar"
 msgstr ""
 
 #  create the dialog
 #: ../modules/calendar/e-cal-shell-view-actions.c:1191
-#, fuzzy
 #: ../modules/calendar/e-memo-shell-view-actions.c:550
 #: ../modules/calendar/e-task-shell-view-actions.c:675
+#, fuzzy
 msgid "_Copy..."
 msgstr "_Afrita"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#, fuzzy
 msgid "D_elete Calendar"
-msgstr ""
+msgstr "Eyða dagatali '{0}'?"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
@@ -19203,8 +19416,9 @@ msgid "Go Forward"
 msgstr ""
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#, fuzzy
 msgid "Select today"
-msgstr ""
+msgstr "Velja í _dag"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1226
 #, fuzzy
@@ -19222,9 +19436,10 @@ msgid "_New Calendar"
 msgstr "_Nýtt dagatal"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#, fuzzy
 #: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
-msgstr ""
+msgstr "Henda"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
@@ -19399,8 +19614,9 @@ msgid "Show one month"
 msgstr ""
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#, fuzzy
 msgid "Week"
-msgstr ""
+msgstr "Vika"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
@@ -19423,19 +19639,20 @@ msgid "Occurs Less Than 5 Times"
 msgstr ""
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#, fuzzy
 #: ../modules/calendar/e-memo-shell-view-actions.c:740
 #: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
-msgstr ""
+msgstr "Lýsing inniheldur"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#, fuzzy
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
-msgstr ""
+msgstr "Samantekt inniheldur"
 
 #: ../modules/calendar/e-cal-shell-view-actions.c:1635
-#, fuzzy
 #: ../modules/calendar/e-cal-shell-view-actions.c:1649
 #: ../modules/calendar/e-cal-shell-view-memopad.c:273
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
@@ -19443,6 +19660,7 @@ msgstr ""
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:957
 #: ../modules/calendar/e-task-shell-view-actions.c:971
+#, fuzzy
 #| msgid "Print"
 msgid "Print..."
 msgstr "Prenta"
@@ -19471,10 +19689,9 @@ msgstr "Fara í:"
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:206
-#, fuzzy
 #: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
-msgstr "Minnismiði"
+msgstr "minnismiði"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:249
 #: ../modules/calendar/e-memo-shell-view-actions.c:599
@@ -19542,12 +19759,12 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:274
 #: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
-msgstr ""
+msgstr "verkefni"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:309
 #: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
-msgstr ""
+msgstr "Úthlut_a verkefni"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:323
 #: ../modules/calendar/e-task-shell-view-actions.c:724
@@ -19571,7 +19788,7 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:337
 #: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
-msgstr ""
+msgstr "_Nýtt verkefni"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:339
 #: ../modules/calendar/e-task-shell-backend.c:64
@@ -19582,7 +19799,7 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:344
 #: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
-msgstr ""
+msgstr "_Opna verkefni"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:346
 #: ../modules/calendar/e-task-shell-view-actions.c:747
@@ -19595,10 +19812,9 @@ msgid "Print the selected task"
 msgstr ""
 
 #: ../modules/calendar/e-memo-shell-backend.c:63
-#, fuzzy
 msgctxt "New"
 msgid "Mem_o"
-msgstr "Minnismiði"
+msgstr "M_innismiði"
 
 #: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
@@ -19642,7 +19858,7 @@ msgstr ""
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
-msgstr ""
+msgstr "_Eyða minnismiðalista"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
@@ -19650,7 +19866,7 @@ msgstr ""
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
-msgstr ""
+msgstr "_Nýr minnismiðalisti"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
@@ -19665,9 +19881,8 @@ msgid "Show _Only This Memo List"
 msgstr ""
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:671
-#| msgid "Preview:"
 msgid "Memo _Preview"
-msgstr ""
+msgstr "_Forskoðun minnismiða"
 
 #: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
@@ -19713,7 +19928,7 @@ msgstr "%d valið"
 #: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
-msgstr ""
+msgstr "Ver_kefni"
 
 #: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
@@ -19727,7 +19942,7 @@ msgstr ""
 #: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
-msgstr ""
+msgstr "Verke_fnalisti"
 
 #: ../modules/calendar/e-task-shell-backend.c:81
 #: ../modules/calendar/e-task-shell-view-actions.c:691
@@ -19757,7 +19972,7 @@ msgstr ""
 
 #: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
-msgstr ""
+msgstr "_Eyða verkefni"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
@@ -19769,7 +19984,7 @@ msgstr ""
 
 #: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
-msgstr ""
+msgstr "_Eyða verkefnalista"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
@@ -19777,7 +19992,7 @@ msgstr ""
 
 #: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
-msgstr ""
+msgstr "_Nýr verkefnalisti"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
@@ -19800,10 +20015,9 @@ msgid "Delete completed tasks"
 msgstr ""
 
 #: ../modules/calendar/e-task-shell-view-actions.c:836
-#, fuzzy
 #| msgid "Preview:"
 msgid "Task _Preview"
-msgstr "_Forsýning verks"
+msgstr "_Forskoðun verkefnis"
 
 #: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
@@ -19847,18 +20061,18 @@ msgstr ""
 
 #: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
-msgstr ""
+msgstr "Eyða verkefnum"
 
 #: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
-msgstr ""
+msgstr "Eyða verkefni"
 
 #: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d verkefni"
+msgstr[1] "%d verkefni"
 
 #: ../modules/itip-formatter/e-mail-formatter-itip.c:149
 msgid "ITIP"
@@ -20231,286 +20445,285 @@ msgstr ""
 msgid "%s has canceled the following shared memo:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:676
 #, fuzzy
 msgid "All day:"
 msgstr "Allan daginn"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:1517
 #, fuzzy
-#: ../modules/itip-formatter/itip-view.c:1494
 msgid "Start time:"
 msgstr "Upphafstími:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:691
 msgid "End day:"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:691
+#, fuzzy
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "End time:"
-msgstr ""
+msgstr "_Loka tími:"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1041
 #, fuzzy
 msgid "Ope_n Calendar"
 msgstr "Opna dagatal"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Decline all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1047
 #, fuzzy
 msgid "_Decline"
 msgstr "Hafna"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1050
 msgid "_Tentative all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1053
+#, fuzzy
 msgid "_Tentative"
-msgstr ""
+msgstr "Bráðabirgða"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1056
 msgid "Acce_pt all"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1059
 #, fuzzy
 msgid "Acce_pt"
 msgstr "Samþykkja"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1062
 msgid "Send _Information"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1065
 msgid "_Update Attendee Status"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1047
-#, fuzzy
+#: ../modules/itip-formatter/itip-view.c:1068
 #: ../smime/gui/certificate-manager.c:1664
+#, fuzzy
 msgid "_Update"
 msgstr "_Uppfæra"
 
 #  create the dialog
-#: ../modules/itip-formatter/itip-view.c:1497
+#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1568
+#: ../modules/itip-formatter/itip-view.c:1639
 #, fuzzy
-#: ../modules/itip-formatter/itip-view.c:1545
-#: ../modules/itip-formatter/itip-view.c:1616
 msgid "Comment:"
 msgstr "Athugasemd:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1533
+#: ../modules/itip-formatter/itip-view.c:1556
 msgid "Send reply to sender"
 msgstr ""
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1548
+#: ../modules/itip-formatter/itip-view.c:1571
 msgid "Send _updates to attendees"
 msgstr ""
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1551
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Apply to all instances"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1552
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Show time as _free"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1553
+#: ../modules/itip-formatter/itip-view.c:1576
 msgid "_Preserve my reminder"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1577
 msgid "_Inherit reminder"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:1884
-#, fuzzy
+#: ../modules/itip-formatter/itip-view.c:1910
 msgid "_Tasks:"
-msgstr "Verkefni"
+msgstr "Ver_kefni:"
 
-#: ../modules/itip-formatter/itip-view.c:1887
-#, fuzzy
+#: ../modules/itip-formatter/itip-view.c:1913
 msgid "_Memos:"
-msgstr "Minni_smiðar"
+msgstr "_Minnismiðar:"
 
-#: ../modules/itip-formatter/itip-view.c:3115
+#: ../modules/itip-formatter/itip-view.c:3219
 #, fuzzy
 msgid "Sa_ve"
 msgstr "Vista"
 
-#: ../modules/itip-formatter/itip-view.c:3575
-#: ../modules/itip-formatter/itip-view.c:5022
+#: ../modules/itip-formatter/itip-view.c:3681
+#: ../modules/itip-formatter/itip-view.c:5130
 msgid "Attendee status updated"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3754
+#: ../modules/itip-formatter/itip-view.c:3861
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3783
+#: ../modules/itip-formatter/itip-view.c:3890
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3896
+#: ../modules/itip-formatter/itip-view.c:4003
 msgid "Unable to find any calendars"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3904
+#: ../modules/itip-formatter/itip-view.c:4011
 msgid "Unable to find this meeting in any calendar"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3909
+#: ../modules/itip-formatter/itip-view.c:4016
 msgid "Unable to find this task in any task list"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4021
 msgid "Unable to find this memo in any memo list"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4258
+#: ../modules/itip-formatter/itip-view.c:4366
 msgid "Opening the calendar. Please wait..."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4263
+#: ../modules/itip-formatter/itip-view.c:4371
 msgid "Searching for an existing version of this appointment"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4658
+#: ../modules/itip-formatter/itip-view.c:4766
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4673
+#: ../modules/itip-formatter/itip-view.c:4781
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4786
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4792
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4690
+#: ../modules/itip-formatter/itip-view.c:4798
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4711
-#: ../modules/itip-formatter/itip-view.c:5168
-#: ../modules/itip-formatter/itip-view.c:5274
+#: ../modules/itip-formatter/itip-view.c:4819
+#: ../modules/itip-formatter/itip-view.c:5277
+#: ../modules/itip-formatter/itip-view.c:5383
 msgid "Saving changes to the calendar. Please wait..."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4752
+#: ../modules/itip-formatter/itip-view.c:4860
 msgid "Unable to parse item"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4945
+#: ../modules/itip-formatter/itip-view.c:5053
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4962
+#: ../modules/itip-formatter/itip-view.c:5070
 msgid "Sent a cancelation notice to the delegate"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:4966
+#: ../modules/itip-formatter/itip-view.c:5074
 msgid "Could not send the cancelation notice to the delegate"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5014
+#: ../modules/itip-formatter/itip-view.c:5122
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5057
+#: ../modules/itip-formatter/itip-view.c:5166
 msgid "The meeting is invalid and cannot be updated"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:5242
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5205
-#: ../modules/itip-formatter/itip-view.c:5244
+#: ../modules/itip-formatter/itip-view.c:5314
+#: ../modules/itip-formatter/itip-view.c:5353
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Staða þáttakanda var ekki uppfærð vegna þess að hlutur er ekki lengur til"
 
-#: ../modules/itip-formatter/itip-view.c:5307
+#: ../modules/itip-formatter/itip-view.c:5416
 msgid "Meeting information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5312
+#: ../modules/itip-formatter/itip-view.c:5421
 msgid "Task information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5426
 msgid "Memo information sent"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5328
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5333
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Unable to send task information, the task does not exist"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Unable to send memo information, the memo does not exist"
 msgstr ""
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5403
+#: ../modules/itip-formatter/itip-view.c:5512
 msgid "calendar.ics"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5408
-#| msgid "New Calendar"
+#: ../modules/itip-formatter/itip-view.c:5517
 msgid "Save Calendar"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5457
-#: ../modules/itip-formatter/itip-view.c:5470
+#: ../modules/itip-formatter/itip-view.c:5566
+#: ../modules/itip-formatter/itip-view.c:5579
 msgid "The calendar attached is not valid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5458
-#: ../modules/itip-formatter/itip-view.c:5471
+#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5580
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5513
-#: ../modules/itip-formatter/itip-view.c:5543
-#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5622
+#: ../modules/itip-formatter/itip-view.c:5652
+#: ../modules/itip-formatter/itip-view.c:5753
 msgid "The item in the calendar is not valid"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5514
-#: ../modules/itip-formatter/itip-view.c:5544
-#: ../modules/itip-formatter/itip-view.c:5645
+#: ../modules/itip-formatter/itip-view.c:5623
+#: ../modules/itip-formatter/itip-view.c:5653
+#: ../modules/itip-formatter/itip-view.c:5754
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -20518,34 +20731,35 @@ msgstr ""
 "Þessi skilaboð innihalda dagatal en það inniheldur enda viðburði, verk eða "
 "laus/upptekinn upplýsingar"
 
-#: ../modules/itip-formatter/itip-view.c:5559
+#: ../modules/itip-formatter/itip-view.c:5668
 msgid "The calendar attached contains multiple items"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:5560
+#: ../modules/itip-formatter/itip-view.c:5669
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6062
+#: ../modules/itip-formatter/itip-view.c:6171
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Enginn"
 
-#: ../modules/itip-formatter/itip-view.c:6078
+#: ../modules/itip-formatter/itip-view.c:6187
+#, fuzzy
 msgid "Tentatively Accepted"
-msgstr ""
+msgstr "Samþykkt með semingi"
 
-#: ../modules/itip-formatter/itip-view.c:6238
+#: ../modules/itip-formatter/itip-view.c:6347
 msgid "This meeting recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6241
+#: ../modules/itip-formatter/itip-view.c:6350
 msgid "This task recurs"
 msgstr ""
 
-#: ../modules/itip-formatter/itip-view.c:6244
+#: ../modules/itip-formatter/itip-view.c:6353
 msgid "This memo recurs"
 msgstr ""
 
@@ -20642,17 +20856,17 @@ msgid "Choose a mbox spool directory"
 msgstr ""
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#, fuzzy
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
+#, fuzzy
 msgid "Configuration"
 msgstr "Uppsetning"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#, fuzzy
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
+#, fuzzy
 msgid "_Server:"
 msgstr "Þ_jónn:"
 
@@ -20662,8 +20876,8 @@ msgid "_Port:"
 msgstr "_Gátt"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#, fuzzy
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#, fuzzy
 msgid "User_name:"
 msgstr "Notandanafn:"
 
@@ -20673,14 +20887,14 @@ msgid "Encryption _method:"
 msgstr ""
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#, fuzzy
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+#, fuzzy
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS eftir tengingu"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#, fuzzy
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+#, fuzzy
 msgid "SSL on a dedicated port"
 msgstr "SSL á frátekinni gátt"
 
@@ -20736,367 +20950,389 @@ msgid_plural "%d attached messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-backend.c:348
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:350
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:358
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:360
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:367
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:682
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:691
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:700
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-backend.c:710
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr ""
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1002
+#: ../modules/mail/e-mail-shell-backend.c:1007
 #, fuzzy
 msgctxt "label"
 msgid "None"
 msgstr "Ekkert"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:752
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#, fuzzy
+#| msgid "Go to Today"
+msgid "Go to Folder"
+msgstr "Fara í daginn í dag"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#, fuzzy
+msgid "_Select"
+msgstr "Velja"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1642
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1656
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1663
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
-#: ../modules/mail/e-mail-shell-view-actions.c:1777
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 #, fuzzy
 msgid "_New..."
 msgstr "_Ný..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 #, fuzzy
 msgid "Empty _Trash"
 msgstr "_Tæma ruslið"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+#, fuzzy
+#| msgid "Go to Today"
+msgid "Go to _Folder"
+msgstr "Fara í daginn í dag"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+msgid "Opens a dialog to select a folder to go to"
+msgstr ""
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 #, fuzzy
 msgid "N_one"
 msgstr "En_ginn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1770
-#: ../modules/mail/e-mail-shell-view-actions.c:1854
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 #, fuzzy
-#: ../modules/mail/e-mail-shell-view-actions.c:1803
 #| msgid "Send / Receive"
 msgid "Send / _Receive"
 msgstr "_Senda / Sækja"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1789
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1796
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1798
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1826
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1831
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1838
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1845
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1852
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 #, fuzzy
 msgid "F_older"
 msgstr "Mappa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 #, fuzzy
 msgid "_Label"
 msgstr "_Merki"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1892
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1894
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1933
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Ný mappa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1961
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1963
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1969
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show deleted messages with a line through them"
 msgstr ""
 
 #  create the dialog
-#: ../modules/mail/e-mail-shell-view-actions.c:1977
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1979
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1985
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1987
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2007
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Show message preview below the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Show message preview alongside the message list"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2029
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2036
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2130
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2140
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2147
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 msgid "Current Account"
 msgstr ""
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2154
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr ""
 
@@ -21159,51 +21395,53 @@ msgid_plural "%d unread, "
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../modules/mail/e-mail-shell-view-private.c:1063
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../modules/mail/e-mail-shell-view-private.c:1082
-#, fuzzy
-msgid "Trash"
-msgstr "Rusl"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1569
+#: ../modules/mail/e-mail-shell-view-private.c:1581
 msgid "Send / Receive"
 msgstr "Senda / Sækja"
 
-#: ../modules/mail/em-composer-prefs.c:394
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:854
+#: ../modules/mail/em-composer-prefs.c:884
 #, fuzzy
 msgid "Folder"
 msgstr "Mappa"
 
-#: ../modules/mail/em-composer-prefs.c:890
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1157
+#: ../modules/mail/em-composer-prefs.c:1199
 msgid "Keep in Outbox"
 msgstr ""
 
-#: ../modules/mail/em-composer-prefs.c:1158
+#: ../modules/mail/em-composer-prefs.c:1200
 #, fuzzy
 msgid "Send immediately"
 msgstr "Vista Sem"
 
-#: ../modules/mail/em-composer-prefs.c:1159
+#: ../modules/mail/em-composer-prefs.c:1201
 #, fuzzy
 #| msgid "05 minutes"
 msgid "Send after 5 minutes"
 msgstr "05 mínútur"
 
-#: ../modules/mail/em-composer-prefs.c:1232
+#: ../modules/mail/em-composer-prefs.c:1274
 msgid "Language(s)"
 msgstr ""
 
@@ -21227,21 +21465,21 @@ msgstr ""
 msgid "Immediately, on folder leave"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:420
 #, fuzzy
 msgid "Header"
 msgstr "haus"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:424
 msgid "Contains Value"
 msgstr ""
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1236
+#: ../modules/mail/em-mailer-prefs.c:1554
 msgid "_Date header:"
 msgstr ""
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../modules/mail/em-mailer-prefs.c:1555
 msgid "Show _original header value"
 msgstr ""
 
@@ -21303,8 +21541,9 @@ msgid "Author(s)"
 msgstr ""
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:253
+#, fuzzy
 msgid "Plugin Manager"
-msgstr ""
+msgstr "Umsjón viðbóta"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
@@ -21317,8 +21556,8 @@ msgid "Overview"
 msgstr "Yfirlit"
 
 #: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#, fuzzy
 #: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#, fuzzy
 msgid "Plugin"
 msgstr "Íforrit"
 
@@ -21402,41 +21641,41 @@ msgstr ""
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr ""
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr ""
@@ -21481,11 +21720,11 @@ msgstr "Forsníða %1 sem %2"
 msgid "_Other languages"
 msgstr ""
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr ""
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr ""
 
@@ -21684,31 +21923,26 @@ msgstr ""
 
 #: ../modules/text-highlight/languages.c:323
 #, fuzzy
-msgid "_PostScript"
-msgstr "Postscript"
-
-#: ../modules/text-highlight/languages.c:328
-#, fuzzy
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr ""
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr ""
 
@@ -21755,8 +21989,8 @@ msgid "_Do not show this message again."
 msgstr "_Ekki sýna þessi skilaboð framar"
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:584
-#, fuzzy
 #: ../plugins/templates/templates.c:478
+#, fuzzy
 msgid "Keywords"
 msgstr "Stikkorð"
 
@@ -21911,9 +22145,10 @@ msgid "Key"
 msgstr "Lykill"
 
 #: ../plugins/email-custom-header/email-custom-header.c:879
+#, fuzzy
 #: ../plugins/templates/templates.c:487
 msgid "Values"
-msgstr ""
+msgstr "Gildi"
 
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:1
 msgid "Custom Header"
@@ -21942,8 +22177,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:467
 #: ../plugins/external-editor/external-editor.c:469
+#: ../plugins/external-editor/external-editor.c:471
 msgid "Compose in External Editor"
 msgstr ""
 
@@ -22158,8 +22393,8 @@ msgid ""
 "Header: {0}"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:394
+#: ../plugins/mail-notification/mail-notification.c:430
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -22168,56 +22403,55 @@ msgstr[1] ""
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr ""
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:436
 msgid "New email in Evolution"
 msgstr ""
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
-#, c-format
+#: ../plugins/mail-notification/mail-notification.c:471
+#, fuzzy, c-format
 msgid "Show %s"
-msgstr ""
+msgstr "Birta „_%s“"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:673
 msgid "_Play sound when a new message arrives"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:705
 #, fuzzy
 msgid "_Beep"
 msgstr "_Píp"
 
-#: ../plugins/mail-notification/mail-notification.c:706
-#| msgid "Use underline"
+#: ../plugins/mail-notification/mail-notification.c:718
 msgid "Use sound _theme"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _file:"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr ""
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
 msgstr ""
 
@@ -22235,7 +22469,30 @@ msgstr ""
 msgid "Created from a mail by %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#, fuzzy
+#| msgid "France"
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "_Hætta við"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+#, fuzzy
+#| msgid "_Edit"
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "_Breyta"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+#, fuzzy
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Nýtt"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -22244,21 +22501,21 @@ msgstr ""
 "Valið dagatal inniheldur viðburðinn '%s' nú þegar. Viltu breyta eldri "
 "viðburðinum?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -22269,7 +22526,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -22280,7 +22537,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -22291,76 +22548,76 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
 #, fuzzy
 msgid "[No Summary]"
 msgstr "* Enginn úrdráttur *"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
+#: ../plugins/mail-to-task/mail-to-task.c:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:858
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1266
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create an _Appointment"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "Búa til nýjan viðburð úr völdum pósti"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1273
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
-msgstr ""
+msgstr "Búa til ver_kefni"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1290
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr ""
 
-#: ../plugins/mail-to-task/mail-to-task.c:1292
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr ""
 
@@ -22386,8 +22643,9 @@ msgid "_Mail"
 msgstr "Tölvu_póstur"
 
 #: ../plugins/pst-import/pst-importer.c:555
+#, fuzzy
 msgid "Destination folder:"
-msgstr ""
+msgstr "Úttaksma_ppa:"
 
 #: ../plugins/pst-import/pst-importer.c:565
 #, fuzzy
@@ -22400,7 +22658,6 @@ msgid "A_ppointments"
 msgstr "Atburðir"
 
 #: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
-#, fuzzy
 msgid "_Tasks"
 msgstr "_Verkefni"
 
@@ -22448,24 +22705,18 @@ msgstr ""
 msgid "Mount of %s failed:"
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#, fuzzy
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "Virkja"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
 msgid "Are you sure you want to remove this location?"
 msgstr ""
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1144
+#: ../plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr ""
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr ""
 
@@ -22528,13 +22779,13 @@ msgid "Publishing _Frequency:"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
-#| msgid "Time _zone:"
 msgid "Time _duration:"
 msgstr ""
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:20
+#, fuzzy
 msgid "Sources"
-msgstr ""
+msgstr "Heimildir"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
 #, fuzzy
@@ -22557,8 +22808,8 @@ msgid "_Username:"
 msgstr "_Notandanafn:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#, fuzzy
 #: ../smime/gui/certificate-manager.c:772
+#, fuzzy
 msgid "_Password:"
 msgstr "_Lykilorð:"
 
@@ -22680,8 +22931,9 @@ msgstr ""
 
 #  FIXME: get the toplevel window...
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
+#, fuzzy
 msgid "Save Selected"
-msgstr ""
+msgstr "Vista valið"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Save a calendar or task list to disk."
@@ -22734,38 +22986,42 @@ msgid ""
 "an email you are replying to."
 msgstr ""
 
-#: ../plugins/templates/templates.c:1199
+#: ../plugins/templates/templates.c:1245
 #, fuzzy
 #| msgid "Job Title"
 msgid "No Title"
 msgstr "Enginn starfstitill"
 
-#: ../plugins/templates/templates.c:1308
+#: ../plugins/templates/templates.c:1354
 #, fuzzy
 msgid "Save as _Template"
 msgstr "Vista sem sniðmá_t..."
 
-#: ../plugins/templates/templates.c:1310
+#: ../plugins/templates/templates.c:1356
 #, fuzzy
 msgid "Save as Template"
 msgstr "Vista sem sniðmá_t..."
 
-#: ../shell/e-shell.c:320
+#: ../shell/e-shell.c:337
 msgid "Preparing to go offline..."
 msgstr ""
 
-#: ../shell/e-shell.c:373
+#: ../shell/e-shell.c:390
 msgid "Preparing to go online..."
 msgstr ""
 
-#: ../shell/e-shell.c:480
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit"
 msgstr ""
 
-#: ../shell/e-shell.c:486
+#: ../shell/e-shell.c:507
 msgid "Preparing to quit..."
 msgstr ""
 
+#: ../shell/e-shell.c:915
+msgid "Credentials are required to connect to the destination host."
+msgstr ""
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr ""
@@ -22909,8 +23165,9 @@ msgid "_Quit"
 msgstr "_Hætta"
 
 #: ../shell/e-shell-window-actions.c:994
+#, fuzzy
 msgid "Exit the program"
-msgstr ""
+msgstr "Hætta í forritinu"
 
 #: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
@@ -22981,146 +23238,156 @@ msgstr ""
 msgid "Lay_out"
 msgstr "Umbrot"
 
-#: ../shell/e-shell-window-actions.c:1106
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:1100
+#, fuzzy
+msgid "_New"
+msgstr "_Nýtt"
+
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "_Leita"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1128
 #, fuzzy
 msgid "_Window"
 msgstr "Gluggi"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1164
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1166
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1174
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1180
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1204
+#: ../shell/e-shell-window-actions.c:1205
 #, fuzzy
 msgid "_Icons Only"
 msgstr "Einungis táknmyndir"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1211
+#: ../shell/e-shell-window-actions.c:1212
 #, fuzzy
 msgid "_Text Only"
 msgstr "Bara texti"
 
-#: ../shell/e-shell-window-actions.c:1213
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1219
+#, fuzzy
 msgid "Icons _and Text"
-msgstr ""
+msgstr "Táknmyndir og texti"
 
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1226
 #, fuzzy
 msgid "Tool_bar Style"
 msgstr "Stíll tólstiku"
 
-#: ../shell/e-shell-window-actions.c:1227
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1235
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1242
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1244
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1261
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1263
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1271
+#: ../shell/e-shell-window-actions.c:1272
 #, fuzzy
 #| msgid "Page Setup:"
 msgid "Page Set_up..."
 msgstr "_Uppsetning síðu..."
 
-#: ../shell/e-shell-window-actions.c:1273
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
 msgid "Delete view: %s"
 msgstr ""
 
-#: ../shell/e-shell-window-actions.c:1868
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr ""
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:505
 #, fuzzy
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "Nýtt"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
+#: ../shell/e-shell-window-private.c:640
 #, c-format
 msgid "%s - Evolution"
 msgstr ""
@@ -23203,18 +23470,18 @@ msgid ""
 "System error: %s"
 msgstr ""
 
-#: ../shell/main.c:454 ../shell/main.c:459
+#: ../shell/main.c:457 ../shell/main.c:462
 msgid "- The Evolution PIM and Email Client"
 msgstr ""
 
-#: ../shell/main.c:517
+#: ../shell/main.c:520
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run '%s --help' for more information.\n"
 msgstr ""
 
-#: ../shell/main.c:523
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -23223,7 +23490,7 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
-msgstr ""
+msgstr "Uppfærsla frá fyrri útgáfu mistókst:"
 
 #: ../shell/shell.error.xml.h:3
 msgid ""
@@ -23235,11 +23502,11 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:7
 msgid "Continue Anyway"
-msgstr ""
+msgstr "Halda samt áfram"
 
 #: ../shell/shell.error.xml.h:8
 msgid "Quit Now"
-msgstr ""
+msgstr "Hætta núna"
 
 #: ../shell/shell.error.xml.h:9
 msgid "Cannot upgrade directly from version {0}"
@@ -23269,8 +23536,45 @@ msgstr ""
 
 #: ../shell/shell.error.xml.h:14
 msgid "Keep _Waiting"
+msgstr "_Halda áfram að bíða"
+
+#: ../shell/shell.error.xml.h:15
+#, fuzzy
+msgid "Failed to get values from '{0}'"
+msgstr "Eyða"
+
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Eyða"
+
+#: ../shell/shell.error.xml.h:17
+#, fuzzy
+msgid "Failed to connect to '{0}'"
+msgstr "Eyða"
+
+#: ../shell/shell.error.xml.h:18
+msgid "_Reconnect"
+msgstr "Endu_rtengja"
+
+#: ../shell/shell.error.xml.h:19
+#, fuzzy
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Eyða"
+
+#: ../shell/shell.error.xml.h:20
+#, fuzzy
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Eyða"
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
 msgstr ""
 
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr "Ástæða: {1}"
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23283,7 +23587,7 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
-msgstr ""
+msgstr "Heiti skilríkis"
 
 #: ../smime/gui/certificate-manager.c:85
 #: ../smime/gui/certificate-manager.c:105
@@ -23299,19 +23603,19 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
-msgstr ""
+msgstr "Raðnúmer"
 
 #: ../smime/gui/certificate-manager.c:88
 #: ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
-msgstr ""
+msgstr "Tilgangur"
 
 #: ../smime/gui/certificate-manager.c:89
 #: ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
-msgstr ""
+msgstr "Gefið út af"
 
 #: ../smime/gui/certificate-manager.c:90
 #: ../smime/gui/certificate-manager.c:110
@@ -23329,30 +23633,30 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
-msgstr ""
+msgstr "Gefið út"
 
 #: ../smime/gui/certificate-manager.c:93
 #: ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
-msgstr ""
+msgstr "Rennur út"
 
 #: ../smime/gui/certificate-manager.c:94
 #: ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
-msgstr ""
+msgstr "SHA1 fingrafar"
 
 #: ../smime/gui/certificate-manager.c:95
 #: ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
-msgstr ""
+msgstr "MD5 fingrafar"
 
 #: ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
-msgstr ""
+msgstr "Tölvupóstfang"
 
 #: ../smime/gui/certificate-manager.c:650
 msgid "Select a file to backup your key and certificate..."
@@ -23366,24 +23670,21 @@ msgstr ""
 #: ../smime/gui/certificate-manager.c:662
 #, c-format
 msgid "%s-backup.p12"
-msgstr ""
+msgstr "%s-backup.p12"
 
 #: ../smime/gui/certificate-manager.c:676
-#, fuzzy
 #: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Allar skrár"
 
 #: ../smime/gui/certificate-manager.c:728
-#, fuzzy
 msgid "Backup Certificate"
-msgstr "Valið:"
+msgstr "Taka öryggisafrit af skilríki"
 
 #. filename selection
 #: ../smime/gui/certificate-manager.c:742
-#, fuzzy
 msgid "_File name:"
-msgstr "Skáarheiti:"
+msgstr "S_kráarheiti:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../smime/gui/certificate-manager.c:747
@@ -23393,7 +23694,7 @@ msgstr "Valið:"
 
 #: ../smime/gui/certificate-manager.c:761
 msgid "_Include certificate chain in the backup"
-msgstr ""
+msgstr "Hafa vottunarkeðju (certificate chain) með í öryggisafriti"
 
 #. To Translators: this text was copied from Firefox
 #: ../smime/gui/certificate-manager.c:767
@@ -23404,12 +23705,10 @@ msgid ""
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:786
-#, fuzzy
 msgid "_Repeat Password:"
-msgstr "%sLykilorð fyrir %s (notandann %s)"
+msgstr "Endu_rtaka lykilorð"
 
 #: ../smime/gui/certificate-manager.c:805
-#, fuzzy
 msgid "Passwords do not match"
 msgstr "Lykilorðin stemma ekki"
 
@@ -23432,19 +23731,18 @@ msgstr ""
 
 #: ../smime/gui/certificate-manager.c:951
 msgid "Select a certificate to import..."
-msgstr ""
+msgstr "Veldu skilríki til að flytja inn..."
 
 #: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
-msgstr ""
+msgstr "Mistókst að flytja inn skilríki"
 
 #: ../smime/gui/certificate-manager.c:1117
 msgctxt "CamelTrust"
 msgid "Ask when used"
-msgstr ""
+msgstr "Spyrja við notkun"
 
 #: ../smime/gui/certificate-manager.c:1119
-#, fuzzy
 #| msgid "Never"
 msgctxt "CamelTrust"
 msgid "Never"
@@ -23453,45 +23751,43 @@ msgstr "Aldrei"
 #: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Marginal"
-msgstr ""
+msgstr "Á mörkunum"
 
 #: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
 msgid "Fully"
-msgstr ""
+msgstr "Fullt"
 
 #: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Ultimate"
-msgstr ""
+msgstr "Hámarks"
 
 #: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
 msgid "Temporary"
-msgstr ""
+msgstr "Tímabundið"
 
 #: ../smime/gui/certificate-manager.c:1333
-#, fuzzy
 msgid "Change certificate trust"
-msgstr "Valið:"
+msgstr "Breyta trausti skilríkis"
 
 #: ../smime/gui/certificate-manager.c:1345
 #, c-format
 msgid "Change trust for the host '%s':"
-msgstr ""
+msgstr "Breyta trausti hýsilvélar '%s':"
 
 #: ../smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Ask when used"
-msgstr ""
+msgstr "Spyrja við _notkun"
 
 #: ../smime/gui/certificate-manager.c:1370
 msgctxt "CamelTrust"
 msgid "_Temporary (this session only)"
-msgstr ""
+msgstr "_Tímabundið (aðeins í þessari setu)"
 
 #: ../smime/gui/certificate-manager.c:1371
-#, fuzzy
 #| msgid "Never"
 msgctxt "CamelTrust"
 msgid "_Never"
@@ -23500,17 +23796,17 @@ msgstr "_Aldrei"
 #: ../smime/gui/certificate-manager.c:1372
 msgctxt "CamelTrust"
 msgid "_Marginal"
-msgstr ""
+msgstr "Á _mörkunum"
 
 #: ../smime/gui/certificate-manager.c:1373
 msgctxt "CamelTrust"
 msgid "_Fully"
-msgstr ""
+msgstr "_Fullt"
 
 #: ../smime/gui/certificate-manager.c:1374
 msgctxt "CamelTrust"
 msgid "_Ultimate"
-msgstr ""
+msgstr "_Hámarks"
 
 #: ../smime/gui/certificate-manager.c:1378
 msgid ""
@@ -23519,38 +23815,36 @@ msgid ""
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:1393
-#, fuzzy
 msgid "_Display certificate"
-msgstr "Valið:"
+msgstr "_Birta skilríki"
 
 #: ../smime/gui/certificate-manager.c:1598
 msgid "You have certificates on file that identify these mail servers:"
 msgstr ""
 
 #: ../smime/gui/certificate-manager.c:1629
-#, fuzzy
 msgid "Host name"
-msgstr "Hýsilnafn:"
+msgstr "_Vélarheiti"
 
 #: ../smime/gui/certificate-manager.c:1631
 msgid "Issuer"
-msgstr ""
+msgstr "Útgefandi"
 
 #: ../smime/gui/certificate-manager.c:1632
 msgid "Fingerprint"
-msgstr ""
+msgstr "Fingrafar"
 
 #: ../smime/gui/certificate-manager.c:1633
 msgid "Trust"
-msgstr ""
+msgstr "Traust"
 
 #: ../smime/gui/certificate-manager.c:1654
 msgid "_Edit Trust"
-msgstr ""
+msgstr "Br_eyta trausti"
 
 #: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
-msgstr ""
+msgstr "Allar PKCS12 skrár"
 
 #: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
@@ -23577,12 +23871,12 @@ msgstr ""
 #: ../smime/gui/component.c:55
 #, c-format
 msgid "Enter the password for '%s', token '%s'"
-msgstr ""
+msgstr "Sláðu inn lykilorðið fyrir '%s', teikn '%s'"
 
 #: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
-msgstr ""
+msgstr "Sláðu inn lykilorðið fyrir '%s'"
 
 #. we're setting the password initially
 #: ../smime/gui/component.c:85
@@ -23591,11 +23885,11 @@ msgstr ""
 
 #: ../smime/gui/component.c:88
 msgid "Enter new password"
-msgstr ""
+msgstr "Sláðu inn nýtt lykilorð"
 
 #: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
-msgstr ""
+msgstr "Veldu skilríki"
 
 #: ../smime/gui/smime-ui.ui.h:3
 msgid "You have certificates from these organizations that identify you:"
@@ -23603,20 +23897,20 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:4
 msgid "Certificates Table"
-msgstr ""
+msgstr "Tafla yfir skilríki"
 
 #. This is a verb, as in "make a backup".
 #: ../smime/gui/smime-ui.ui.h:7
 msgid "_Backup"
-msgstr ""
+msgstr "_Gera öryggisafrit"
 
 #: ../smime/gui/smime-ui.ui.h:8
 msgid "Backup _All"
-msgstr ""
+msgstr "Ger_a öryggisafrit af öllu"
 
 #: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
-msgstr ""
+msgstr "Skilríkin þín"
 
 #: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
@@ -23633,23 +23927,23 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
-msgstr ""
+msgstr "Vottunaraðilar"
 
 #: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
-msgstr ""
+msgstr "Traust vottunaraðila (CA)"
 
 #: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _websites."
-msgstr ""
+msgstr "Treysta þessum vottunaraðila til að auðkenna _vefsvæði."
 
 #: ../smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _email users."
-msgstr ""
+msgstr "Treysta þessum vottunaraðila til að auðkenna _tölvupóstnotendur."
 
 #: ../smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _software developers."
-msgstr ""
+msgstr "Treysta þessum vottunaraðila til að auðkenna _hugbúnaðarframleiðendur."
 
 #: ../smime/gui/smime-ui.ui.h:21
 msgid ""
@@ -23658,8 +23952,9 @@ msgid ""
 msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr ""
+#| msgid "Certificates"
+msgid "C_ertificate:"
+msgstr "S_kilríki:"
 
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
@@ -23675,24 +23970,24 @@ msgstr ""
 
 #: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
-msgstr ""
+msgstr "Br_eyta trausti vottunaraðila (CA)"
 
 #: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
-msgstr ""
+msgstr "%d/%m/%Y"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:404
 msgid "Sign"
-msgstr ""
+msgstr "Undirrita"
 
 #: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
-msgstr ""
+msgstr "Dulrita"
 
 #: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
-msgstr ""
+msgstr "Skilríkið er þegar til"
 
 #: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
@@ -23702,43 +23997,42 @@ msgstr ""
 msgid "Enter password for PKCS12 file:"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:329
+#: ../smime/lib/e-pkcs12.c:328
 #, c-format
 msgid "Unable to create export context, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:336
+#: ../smime/lib/e-pkcs12.c:335
 #, c-format
 msgid "Unable to setup password integrity, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:346
+#: ../smime/lib/e-pkcs12.c:345
 #, c-format
 msgid "Unable to create safe bag, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:364
+#: ../smime/lib/e-pkcs12.c:363
 #, c-format
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:382
+#: ../smime/lib/e-pkcs12.c:381
 #, c-format
 msgid "Unable to write store to disk, err_code: %i"
 msgstr ""
 
-#: ../smime/lib/e-pkcs12.c:409
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
-msgstr ""
+msgstr "Innflutt skilríki"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr ""
 
 #: ../views/addressbook/galview.xml.h:2 ../views/calendar/galview.xml.h:5
-#, fuzzy
 msgid "_List View"
-msgstr "Listasýn"
+msgstr "_Listasýn"
 
 #: ../views/addressbook/galview.xml.h:3
 msgid "By _Company"
@@ -23762,7 +24056,7 @@ msgstr ""
 
 #: ../views/mail/galview.xml.h:1
 msgid "_Messages"
-msgstr ""
+msgstr "_Skilaboð"
 
 #: ../views/mail/galview.xml.h:2
 msgid "As _Sent Folder"
@@ -23793,9 +24087,8 @@ msgid "As Sent Folder for Wi_de View"
 msgstr ""
 
 #: ../views/memos/galview.xml.h:1
-#, fuzzy
 msgid "_Memos"
-msgstr "Minnismiðar"
+msgstr "_Minnismiðar"
 
 #: ../views/tasks/galview.xml.h:2
 msgid "With _Due Date"
@@ -23806,6 +24099,25 @@ msgid "With _Status"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not parse response"
+#~ msgstr "Ekki tókst að þátta svarið"
+
+#, fuzzy
+#~ msgid "Path"
+#~ msgstr "Slóð"
+
+#~ msgid "Template:"
+#~ msgstr "Sniðmát:"
+
+#, fuzzy
+#~ msgid "_PostScript"
+#~ msgstr "Postscript"
+
+#, fuzzy
+#~ msgid "E_nable"
+#~ msgstr "Virkja"
+
+#, fuzzy
 #~ msgid "search bar"
 #~ msgstr "_Leita"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]