[geary] Update Swedish translation

[Translations User D-L <translations src gnome org>]

commit 96755ab09e7145ebf5f960e9439e02cac15962b0
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Sat Oct 10 12:07:22 2020 +0000

    Update Swedish translation
    
    (cherry picked from commit a7f9f7a27cf8c0d12e6af2e7b04bb89576aff93b)

 po/sv.po | 892 ++++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 476 insertions(+), 416 deletions(-)
---
diff --git a/po/sv.po b/po/sv.po
index bfe7dee13..0c1e06a69 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2020-07-30 04:08+0000\n"
-"PO-Revision-Date: 2020-07-30 13:17+0200\n"
+"POT-Creation-Date: 2020-09-29 22:35+0000\n"
+"PO-Revision-Date: 2020-10-10 14:04+0200\n"
 "Last-Translator: Anders Jonsson <anders jonsson norsjovallen se>\n"
 "Language-Team: Swedish <tp-sv listor tp-sv se>\n"
 "Language: sv\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3.1\n"
+"X-Generator: Poedit 2.4.1\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -41,8 +41,8 @@ msgstr "Skicka filer med Geary"
 #: desktop/geary-autostart.desktop.in.in:3
 #: desktop/org.gnome.Geary.appdata.xml.in.in:11
 #: desktop/org.gnome.Geary.desktop.in.in:3
-#: src/client/accounts/accounts-editor-servers-pane.vala:555
-#: src/client/application/application-main-window.vala:601
+#: src/client/accounts/accounts-editor-servers-pane.vala:560
+#: src/client/application/application-main-window.vala:608
 msgid "Geary"
 msgstr "Geary"
 
@@ -55,7 +55,7 @@ msgstr "E-post"
 #: desktop/geary-autostart.desktop.in.in:5
 #: desktop/org.gnome.Geary.appdata.xml.in.in:15
 #: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/application-client.vala:32
+#: src/client/application/application-client.vala:33
 msgid "Send and receive email"
 msgstr "Skicka och ta emot e-post"
 
@@ -370,13 +370,13 @@ msgstr "Alla andra"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:316
+#: src/client/accounts/accounts-editor-servers-pane.vala:321
 msgid "Check your receiving login and password"
 msgstr "Kontrollera din inloggning och lösenord för mottagning"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:329
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
 msgid "Check your receiving server details"
 msgstr "Kontrollera dina detaljer för mottagande server"
 
@@ -386,13 +386,13 @@ msgstr "Kontrollera dina detaljer för mottagande server"
 #. specify custom creds here
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:232
-#: src/client/accounts/accounts-editor-servers-pane.vala:350
+#: src/client/accounts/accounts-editor-servers-pane.vala:355
 msgid "Check your sending login and password"
 msgstr "Kontrollera din inloggning och lösenord för sändning"
 
 #. Translators: In-app notification label
 #: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:363
+#: src/client/accounts/accounts-editor-servers-pane.vala:368
 msgid "Check your sending server details"
 msgstr "Kontrollera dina detaljer för sändande server"
 
@@ -448,14 +448,14 @@ msgstr "person example com"
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:593
-#: src/client/accounts/accounts-editor-servers-pane.vala:884
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
 msgid "Login name"
 msgstr "Inloggningsnamn"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
 #: src/client/accounts/accounts-editor-add-pane.vala:607
-#: src/client/accounts/accounts-editor-servers-pane.vala:1006
+#: src/client/accounts/accounts-editor-servers-pane.vala:1011
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "Lösenord"
@@ -465,7 +465,7 @@ msgstr "Lösenord"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:629
-#: src/client/accounts/accounts-editor-servers-pane.vala:728
+#: src/client/accounts/accounts-editor-servers-pane.vala:733
 msgid "IMAP server"
 msgstr "IMAP-server"
 
@@ -480,7 +480,7 @@ msgstr "email exempel se"
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
 #: src/client/accounts/accounts-editor-add-pane.vala:638
-#: src/client/accounts/accounts-editor-servers-pane.vala:734
+#: src/client/accounts/accounts-editor-servers-pane.vala:739
 msgid "SMTP server"
 msgstr "SMTP-server"
 
@@ -625,55 +625,54 @@ msgstr[0] "%d dag tillbaka"
 msgstr[1] "%d dagar tillbaka"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2038
+#: src/client/application/application-main-window.vala:2066
 msgid "Undo"
 msgstr "Ångra"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2021
+#: src/client/application/application-main-window.vala:2049
 msgid "Redo"
 msgstr "Gör om"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:362
-#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-list-pane.vala:458
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
 #: src/client/accounts/accounts-editor-list-pane.vala:366
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:462
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:384
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has been disabled"
 msgstr "Detta konto har inaktiverats"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:393
+#: src/client/accounts/accounts-editor-list-pane.vala:397
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Detta konto har stött på ett problem och är ej tillgängligt"
 
-#. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: src/client/accounts/accounts-editor-list-pane.vala:466
 msgid "Other email providers"
 msgstr "Andra e-postleverantörer"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:560
+#: src/client/accounts/accounts-editor-list-pane.vala:572
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Kontot ”%s” togs bort"
@@ -681,7 +680,7 @@ msgstr "Kontot ”%s” togs bort"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:567
+#: src/client/accounts/accounts-editor-list-pane.vala:579
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Kontot ”%s” återställdes"
@@ -694,30 +693,30 @@ msgstr "Dra för att flytta detta objekt"
 #. Translators: Label describes the service provider
 #. hosting the email account, e.g. Gmail, Yahoo, or some
 #. other generic IMAP service.
-#: src/client/accounts/accounts-editor-row.vala:295
+#: src/client/accounts/accounts-editor-row.vala:299
 msgid "Service provider"
 msgstr "Tjänsteleverantör"
 
 #. Translators: This label describes what form of transport
 #. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
 #. service.
-#: src/client/accounts/accounts-editor-row.vala:469
+#: src/client/accounts/accounts-editor-row.vala:473
 msgid "Connection security"
 msgstr "Anslutningssäkerhet"
 
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
-#: src/client/accounts/accounts-editor-row.vala:480
-#: src/client/accounts/accounts-editor-servers-pane.vala:755
-#: src/client/accounts/accounts-editor-servers-pane.vala:970
+#: src/client/accounts/accounts-editor-row.vala:484
+#: src/client/accounts/accounts-editor-servers-pane.vala:760
+#: src/client/accounts/accounts-editor-servers-pane.vala:975
 msgid "None"
 msgstr "Ingen"
 
-#: src/client/accounts/accounts-editor-row.vala:487
+#: src/client/accounts/accounts-editor-row.vala:491
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:494
+#: src/client/accounts/accounts-editor-row.vala:498
 msgid "TLS"
 msgstr "TLS"
 
@@ -725,35 +724,35 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Translators: An info bar button label
-#: src/client/accounts/accounts-editor-row.vala:535
-#: src/client/application/application-main-window.vala:553
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
 msgid "Login"
 msgstr "Inloggning"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (none) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:542
+#: src/client/accounts/accounts-editor-row.vala:546
 msgid "No login needed"
 msgstr "Ingen inloggning krävs"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (use IMAP) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:550
+#: src/client/accounts/accounts-editor-row.vala:554
 msgid "Use same login as receiving"
 msgstr "Använd samma inloggning som för mottagning"
 
 #. Translators: ComboBox value for source of SMTP
 #. authentication credentials (custom) when adding a new
 #. account
-#: src/client/accounts/accounts-editor-row.vala:558
+#: src/client/accounts/accounts-editor-row.vala:562
 msgid "Use a different login"
 msgstr "Använd en annan inloggning"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:377
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
 #, c-format
 msgid "Account not updated: %s"
 msgstr "Konto inte uppdaterat: %s"
@@ -761,23 +760,23 @@ msgstr "Konto inte uppdaterat: %s"
 #. Translators: This label describes the program that
 #. created the account, e.g. an SSO service like GOA, or
 #. locally by Geary.
-#: src/client/accounts/accounts-editor-servers-pane.vala:540
+#: src/client/accounts/accounts-editor-servers-pane.vala:545
 msgid "Account source"
 msgstr "Kontokälla"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
 msgid "GNOME Online Accounts"
 msgstr "GNOME Nätkonton"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#: src/client/accounts/accounts-editor-servers-pane.vala:616
 msgid "Save draft email on server"
 msgstr "Spara meddelandeutkast på server"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#: src/client/accounts/accounts-editor-servers-pane.vala:671
 msgid "Save sent email on server"
 msgstr "Spara skickad e-post på server"
 
@@ -786,12 +785,12 @@ msgstr "Spara skickad e-post på server"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:956
+#: src/client/accounts/accounts-editor-servers-pane.vala:961
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s använder OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:966
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
 msgid "Use receiving server login"
 msgstr "Använd inloggning för mottagningsserver"
 
@@ -824,143 +823,143 @@ msgstr ""
 msgid "_Replace"
 msgstr "E_rsätt"
 
-#: src/client/application/application-client.vala:33
+#: src/client/application/application-client.vala:34
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/application-client.vala:34
+#: src/client/application/application-client.vala:35
 msgid "Copyright 2016-2020 Geary Development Team."
 msgstr "Copyright 2016-2020 Gearys utvecklingsgrupp."
 
-#: src/client/application/application-client.vala:36
+#: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "Besök Gearys webbplats"
 
 #. / Command line option
-#: src/client/application/application-client.vala:96
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Skriv ut felsökningsloggning"
 
 #. / Command line option
-#: src/client/application/application-client.vala:99
+#: src/client/application/application-client.vala:100
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Starta Geary med huvudfönstret dolt (föråldrat)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:102
+#: src/client/application/application-client.vala:103
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Aktivera WebKitGTK-inspektör i webbvyer"
 
 #. / Command line option
-#: src/client/application/application-client.vala:105
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Logga konversationsövervakning"
 
 #. / Command line option
-#: src/client/application/application-client.vala:108
+#: src/client/application/application-client.vala:109
 msgid "Log IMAP network deserialization"
 msgstr "Logga avserialisering av IMAP-nätverksdata"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:112
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Logga mappsynkronisering"
 
 #. / Command line option
-#: src/client/application/application-client.vala:115
+#: src/client/application/application-client.vala:116
 msgid "Log IMAP network activity"
 msgstr "Logga IMAP-nätverksaktivitet"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/application-client.vala:120
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP replay queue"
 msgstr "Logga IMAP-händelser"
 
 #. / Command line option
-#: src/client/application/application-client.vala:123
+#: src/client/application/application-client.vala:124
 msgid "Log SMTP network activity"
 msgstr "Logga SMTP-nätverksaktivitet"
 
 #. / Command line option
-#: src/client/application/application-client.vala:126
+#: src/client/application/application-client.vala:127
 msgid "Log database queries (generates lots of messages)"
 msgstr "Logga databasförfrågningar (detta genererar många meddelanden)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:129
+#: src/client/application/application-client.vala:130
 msgid "Perform a graceful quit"
 msgstr "Avsluta"
 
-#: src/client/application/application-client.vala:131
+#: src/client/application/application-client.vala:132
 msgid "Open a new window"
 msgstr "Öppna ett nytt fönster"
 
 #. / Command line option
-#: src/client/application/application-client.vala:134
+#: src/client/application/application-client.vala:135
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Återkalla alla nålade TLS-servercertifikat"
 
 #. / Command line option
-#: src/client/application/application-client.vala:137
+#: src/client/application/application-client.vala:138
 msgid "Display program version"
 msgstr "Visa programversion"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:261
+#: src/client/application/application-client.vala:262
 msgid "Geary version"
 msgstr "Geary-version"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:263
+#: src/client/application/application-client.vala:264
 msgid "Geary revision"
 msgstr "Geary-revision"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:265
+#: src/client/application/application-client.vala:266
 msgid "GTK version"
 msgstr "GTK-version"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:272
+#: src/client/application/application-client.vala:273
 msgid "GLib version"
 msgstr "GLib-version"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:279
+#: src/client/application/application-client.vala:280
 msgid "WebKitGTK version"
 msgstr "WebKitGTK-version"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:286
+#: src/client/application/application-client.vala:287
 msgid "Desktop environment"
 msgstr "Skrivbordsmiljö"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:288
+#: src/client/application/application-client.vala:289
 #: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Okänd"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:318
+#: src/client/application/application-client.vala:293
 msgid "Distribution name"
 msgstr "Distributionsnamn"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:323
+#: src/client/application/application-client.vala:298
 msgid "Distribution release"
 msgstr "Distributionsutgåva"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:331
+#: src/client/application/application-client.vala:303
 msgid "Installation prefix"
 msgstr "Installationsprefix"
 
-#: src/client/application/application-client.vala:584
+#: src/client/application/application-client.vala:559
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
@@ -968,7 +967,7 @@ msgstr "Om %s"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada taro example com>
-#: src/client/application/application-client.vala:588
+#: src/client/application/application-client.vala:563
 msgid "translator-credits"
 msgstr ""
 "Joachim Johansson <joachim j gmail com>\n"
@@ -981,37 +980,37 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1049
+#: src/client/application/application-client.vala:1045
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "Flaggan ”--hidden” är föråldrad och kommer att tas bort i framtiden."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1082
+#: src/client/application/application-client.vala:1078
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Okänt programargument: ”%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:499
+#: src/client/application/application-controller.vala:479
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Ett problem uppstod då e-post skickades för %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:503
+#: src/client/application/application-controller.vala:483
 msgid "Email will not be sent until re-connected"
 msgstr "E-post kommer inte att skickas innan du är ansluten igen"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:602
+#: src/client/application/application-controller.vala:582
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "Konversation markerad"
 msgstr[1] "Konversationer markerade"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:588
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "Konversation avmarkerad"
@@ -1020,8 +1019,8 @@ msgstr[1] "Konversationer avmarkerade"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:634
-#: src/client/application/application-controller.vala:718
+#: src/client/application/application-controller.vala:614
+#: src/client/application/application-controller.vala:698
 #, c-format
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
@@ -1033,8 +1032,8 @@ msgstr[1] "Konversationer flyttades till %s"
 #. / of the source folder.
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:642
-#: src/client/application/application-controller.vala:664
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
 #, c-format
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
@@ -1042,7 +1041,7 @@ msgstr[0] "Konversation återställd till %s"
 msgstr[1] "Konversationer återställda till %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:685
+#: src/client/application/application-controller.vala:665
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "Konversation arkiverad"
@@ -1050,7 +1049,7 @@ msgstr[1] "Konversationer arkiverade"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:741
+#: src/client/application/application-controller.vala:721
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1058,7 +1057,7 @@ msgstr[0] "Meddelande återställt till %s"
 msgstr[1] "Meddelanden återställda till %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:762
+#: src/client/application/application-controller.vala:742
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "Meddelande arkiverat"
@@ -1067,7 +1066,7 @@ msgstr[1] "Meddelanden arkiverade"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:797
+#: src/client/application/application-controller.vala:777
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1077,7 +1076,7 @@ msgstr[1] "Meddelanden flyttade till %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:825
+#: src/client/application/application-controller.vala:805
 #, c-format
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
@@ -1087,19 +1086,19 @@ msgstr[1] "Konversationer etiketterade som %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:833
+#: src/client/application/application-controller.vala:813
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
 msgstr[0] "Konversation inte längre etiketterad som %s"
 msgstr[1] "Konversationer inte längre etiketterade som %s"
 
-#: src/client/application/application-controller.vala:1319
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Kunde inte öppna databasen för %s"
 
-#: src/client/application/application-controller.vala:1320
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1122,20 +1121,20 @@ msgstr ""
 "Att bygga om databasen medför att alla lokala e-postmeddelanden och bifogade "
 "filer förstörs. <b>E-post på din server är inte berörda av felet.</b>"
 
-#: src/client/application/application-controller.vala:1322
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
 msgstr "_Bygg om"
 
-#: src/client/application/application-controller.vala:1322
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "_Avsluta"
 
-#: src/client/application/application-controller.vala:1332
+#: src/client/application/application-controller.vala:1333
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Kunde inte bygga om databasen för ”%s”"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1148,90 +1147,89 @@ msgstr ""
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:1492
+#: src/client/application/application-controller.vala:1501
 #, c-format
 msgid "Email sent to %s"
 msgstr "E-post skickad till %s"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2515
+#: src/client/application/application-controller.vala:2491
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "E-post till %s köad för leverans"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2579
+#: src/client/application/application-controller.vala:2555
 #, c-format
 msgid "Email to %s saved"
 msgstr "E-post till %s sparad"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2594
-#: src/client/application/application-controller.vala:2652
+#: src/client/application/application-controller.vala:2570
+#: src/client/application/application-controller.vala:2628
 msgid "Composer could not be restored"
 msgstr "Redigeraren kunde inte återställas"
 
 #. / Translators: The label for an in-app notification. The
 #. / string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2637
+#: src/client/application/application-controller.vala:2613
 #, c-format
 msgid "Email to %s discarded"
 msgstr "E-post till %s förkastad"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:539
+#: src/client/application/application-main-window.vala:540
 msgid "Working offline"
 msgstr "Arbetar frånkopplad"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:541
+#: src/client/application/application-main-window.vala:542
 msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
 "Du kommer inte att kunna skicka eller ta emot e-post innan du är ansluten "
 "igen."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:548
+#: src/client/application/application-main-window.vala:549
 msgid "Login problem"
 msgstr "Inloggningsproblem"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:550
+#: src/client/application/application-main-window.vala:551
 msgid "An account has reported an incorrect login or password."
 msgstr "Ett konto har rapporterat en felaktig inloggning eller lösenord."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:557
+#: src/client/application/application-main-window.vala:558
 msgid "Retry login, you will be prompted for your password"
 msgstr "Försök igen att logga in, du kommer att efterfrågas om ditt lösenord"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:564
+#: src/client/application/application-main-window.vala:565
 msgid "Security problem"
 msgstr "Säkerhetsproblem"
 
-# TODO: Doubled period
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:566
-msgid "An account has reported an untrusted server.."
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
 msgstr "Ett konto har rapporterat en opålitlig server."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:569
+#: src/client/application/application-main-window.vala:570
 msgid "Check"
 msgstr "Kontrollera"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:573
+#: src/client/application/application-main-window.vala:574
 msgid "Check the security details for the connection"
 msgstr "Kontrollera anslutningens säkerhetsdetaljer"
 
 #. / Translators: Main window title, first string
 #. / substitution being the currently selected folder name,
 #. / the second being the selected account name.
-#: src/client/application/application-main-window.vala:606
+#: src/client/application/application-main-window.vala:617
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1239,49 +1237,49 @@ msgstr "%s — %s"
 #. Translators: The name of the folder group containing
 #. folders created by people (as opposed to special-use
 #. folders)
-#: src/client/application/application-main-window.vala:983
+#: src/client/application/application-main-window.vala:996
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "Etiketter"
 
-#: src/client/application/application-main-window.vala:1272
+#: src/client/application/application-main-window.vala:1298
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Ta bort alla e-postmeddelanden från din mapp %s?"
 
-#: src/client/application/application-main-window.vala:1273
+#: src/client/application/application-main-window.vala:1299
 msgid "This removes the email from Geary and your email server."
 msgstr "Detta tar bort e-postmeddelanden från Geary och din e-postserver."
 
-#: src/client/application/application-main-window.vala:1274
+#: src/client/application/application-main-window.vala:1300
 msgid "This cannot be undone."
 msgstr "Detta kan inte ångras."
 
-#: src/client/application/application-main-window.vala:1275
+#: src/client/application/application-main-window.vala:1301
 #, c-format
 msgid "Empty %s"
 msgstr "Töm %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1332
+#: src/client/application/application-main-window.vala:1358
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "Vill du radera denna konversation permanent?"
 msgstr[1] "Vill du radera dessa konversationer permanent?"
 
-#: src/client/application/application-main-window.vala:1337
-#: src/client/application/application-main-window.vala:1352
+#: src/client/application/application-main-window.vala:1363
+#: src/client/application/application-main-window.vala:1378
 msgid "Delete"
 msgstr "Radera"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1347
+#: src/client/application/application-main-window.vala:1373
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "Vill du radera detta meddelande permanent?"
 msgstr[1] "Vill du radera dessa meddelanden permanent?"
 
-#: src/client/application/application-main-window.vala:1670
+#: src/client/application/application-main-window.vala:1696
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1292,7 +1290,7 @@ msgstr "%s (%d)"
 #. Document (100.9MB)
 #. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
 #: src/client/components/components-attachment-pane.vala:107
-#: src/client/composer/composer-widget.vala:1930
+#: src/client/composer/composer-widget.vala:1787
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -1320,7 +1318,7 @@ msgstr "Inspektör"
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
 #: src/client/components/components-inspector.vala:93
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "Logs"
 msgstr "Loggar"
 
@@ -1328,46 +1326,46 @@ msgstr "Loggar"
 #. / Translators: Title for problem report system information
 #. / pane
 #: src/client/components/components-inspector.vala:97
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
 msgid "System"
 msgstr "System"
 
 #. Button label for saving problem report information
 #: src/client/components/components-inspector.vala:226
 #: src/client/components/components-inspector.vala:229
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/problem-details-dialog.ui:42
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:220
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:223
+#: ui/problem-details-dialog.ui:47
 msgid "Save As"
 msgstr "Spara som"
 
 #: src/client/components/components-inspector.vala:230
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
-#: ui/accounts_editor_servers_pane.ui:17
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:52
+#: src/client/components/components-preferences-window.vala:124
 msgid "_Automatically select next message"
 msgstr "Välj nästa meddelande _automatiskt"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:62
+#: src/client/components/components-preferences-window.vala:134
 msgid "_Display conversation preview"
 msgstr "_Visa förhandsvisning av konversation"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:72
+#: src/client/components/components-preferences-window.vala:144
 msgid "Use _three pane view"
 msgstr "Använd tredelad vy"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:82
+#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "Använd e-po_stkortkommandon med en tangent"
 
-#: src/client/components/components-preferences-window.vala:84
+#: src/client/components/components-preferences-window.vala:156
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
@@ -1376,22 +1374,22 @@ msgstr ""
 "ned"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:95
+#: src/client/components/components-preferences-window.vala:167
 msgid "_Watch for new mail when closed"
 msgstr "_Kontrollera om det finns ny e-post vid avslut"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:99
+#: src/client/components/components-preferences-window.vala:171
 msgid "Geary will keep running after all windows are closed"
 msgstr "Geary kommer att fortsätta köra efter att alla fönster stängts"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:117
+#: src/client/components/components-preferences-window.vala:189
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:180
+#: src/client/components/components-preferences-window.vala:250
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
@@ -1486,27 +1484,27 @@ msgstr "Sök i konto %s"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:390
+#: src/client/components/components-validator.vala:394
 msgid "An email address is required"
 msgstr "En e-postadress krävs"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:394
+#: src/client/components/components-validator.vala:398
 msgid "Not a valid email address"
 msgstr "Inte en giltig e-postadress"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:440
+#: src/client/components/components-validator.vala:444
 msgid "A server name is required"
 msgstr "Ett servernamn krävs"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:445
+#: src/client/components/components-validator.vala:449
 msgid "Could not look up server name"
 msgstr "Det gick inte att slå upp servernamn"
 
@@ -1566,7 +1564,9 @@ msgstr "Misslyckades med att spara skickat e-postmeddelande"
 msgid "_OK"
 msgstr "_OK"
 
-#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "_Avbryt"
 
@@ -1590,7 +1590,9 @@ msgstr "_Förkasta"
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -1620,6 +1622,10 @@ msgstr "_Spara"
 msgid "_Keep"
 msgstr "_Behåll"
 
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "Välj färg"
+
 #: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr ""
@@ -1634,23 +1640,23 @@ msgid "Invalid email address"
 msgstr "Ogiltig e-postadress"
 
 #. / Translators: Title for an empty composer window
-#: src/client/composer/composer-widget.vala:35
+#: src/client/composer/composer-widget.vala:32
 msgid "New Message"
 msgstr "Nytt meddelande"
 
-#: src/client/composer/composer-widget.vala:239
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "Sparat"
 
-#: src/client/composer/composer-widget.vala:240
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
 msgstr "Sparar"
 
-#: src/client/composer/composer-widget.vala:241
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "Misslyckades med att spara"
 
-#: src/client/composer/composer-widget.vala:242
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "Tryck på Backsteg för att ta bort citat"
 
@@ -1659,7 +1665,7 @@ msgstr "Tryck på Backsteg för att ta bort citat"
 #. checking, include all variants of each word. No spaces are
 #. allowed. The words will be converted to lower case based on
 #. locale and English versions included automatically.
-#: src/client/composer/composer-widget.vala:258
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1670,109 +1676,105 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:913
+#: src/client/composer/composer-widget.vala:865
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Vill du behålla eller förkasta detta utkast?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:939
+#: src/client/composer/composer-widget.vala:891
 msgid "Do you want to discard this draft message?"
 msgstr "Vill du förkasta detta utkast?"
 
-#: src/client/composer/composer-widget.vala:1585
+#: src/client/composer/composer-widget.vala:1443
 msgid "Send message with an empty subject and body?"
 msgstr "Skicka meddelande med en tom ämnesrad och utan innehåll?"
 
-#: src/client/composer/composer-widget.vala:1587
+#: src/client/composer/composer-widget.vala:1445
 msgid "Send message with an empty subject?"
 msgstr "Skicka meddelande med en tom ämnesrad?"
 
-#: src/client/composer/composer-widget.vala:1589
+#: src/client/composer/composer-widget.vala:1447
 msgid "Send message with an empty body?"
 msgstr "Skicka meddelande utan innehåll?"
 
-#: src/client/composer/composer-widget.vala:1598
+#: src/client/composer/composer-widget.vala:1456
 msgid "Send message without an attachment?"
 msgstr "Skicka meddelande utan att bifoga filer?"
 
-#: src/client/composer/composer-widget.vala:1916
+#: src/client/composer/composer-widget.vala:1775
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "”%s” är redan bifogad och kommer att skickas."
 
-#: src/client/composer/composer-widget.vala:1952
-#: src/client/composer/composer-widget.vala:2002
+#: src/client/composer/composer-widget.vala:1807
+#: src/client/composer/composer-widget.vala:1857
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "”%s” är en tom fil."
 
-#: src/client/composer/composer-widget.vala:1990
+#: src/client/composer/composer-widget.vala:1845
 #, c-format
 msgid "“%s” could not be found."
 msgstr "”%s” kunde inte hittas."
 
-#: src/client/composer/composer-widget.vala:1996
+#: src/client/composer/composer-widget.vala:1851
 #, c-format
 msgid "“%s” is a folder."
 msgstr "”%s” är en mapp."
 
-#: src/client/composer/composer-widget.vala:2015
+#: src/client/composer/composer-widget.vala:1870
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "”%s” kunde inte öppnas för läsning."
 
-#: src/client/composer/composer-widget.vala:2023
+#: src/client/composer/composer-widget.vala:1878
 msgid "Cannot add attachment"
 msgstr "Kan inte bifoga din fil"
 
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: src/client/composer/composer-widget.vala:1949
+msgid "Images"
+msgstr "Bilder"
+
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2083
+#: src/client/composer/composer-widget.vala:2013
 #: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:236 ui/conversation-message.ui:312
+#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Till:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:2089
+#: src/client/composer/composer-widget.vala:2019
 #: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:241 ui/conversation-message.ui:357
+#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2095
+#: src/client/composer/composer-widget.vala:2025
 #: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2101
+#: src/client/composer/composer-widget.vala:2031
 msgid "Reply-To: "
 msgstr "Svara-till: "
 
-#: src/client/composer/composer-widget.vala:2353
-msgid "Select Color"
-msgstr "Välj färg"
-
 #. Displayed in the From dropdown to indicate an
 #. "alternate email address" for an account.  The first
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2542
+#: src/client/composer/composer-widget.vala:2149
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s via %2$s"
 
-#. Translators: This is the name of the file chooser filter
-#. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2899
-msgid "Images"
-msgstr "Bilder"
-
 #: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Ta bort detta språk från listan över föredragna språk"
@@ -1786,51 +1788,51 @@ msgid "Search for more languages"
 msgstr "Sök efter fler språk"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:335
+#: src/client/conversation-list/conversation-list-view.vala:339
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Flytta konversation till _papperskorgen"
 msgstr[1] "Flytta konversationer till _papperskorgen"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:351
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_Radera konversation"
 msgstr[1] "_Radera konversationer"
 
-#: src/client/conversation-list/conversation-list-view.vala:360
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Markera som _läst"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:372
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: src/client/conversation-list/conversation-list-view.vala:376
+#: src/client/conversation-list/conversation-list-view.vala:380
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "Markera som ov_iktigt"
 
-#: src/client/conversation-list/conversation-list-view.vala:383
+#: src/client/conversation-list/conversation-list-view.vala:387
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "Markera som _viktigt"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:392
+#: src/client/conversation-list/conversation-list-view.vala:396
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "Sva_ra"
 
-#: src/client/conversation-list/conversation-list-view.vala:398
+#: src/client/conversation-list/conversation-list-view.vala:402
 msgid "R_eply All"
 msgstr "Svara _alla"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:404
+#: src/client/conversation-list/conversation-list-view.vala:408
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "Vidare_befordra"
@@ -1841,19 +1843,19 @@ msgstr "Jag"
 
 #. Translators: Human-readable version of the RFC 822 From header
 #: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:227
+#: src/client/util/util-email.vala:240
 msgid "From:"
 msgstr "Från:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
 #: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:232
+#: src/client/util/util-email.vala:245
 msgid "Date:"
 msgstr "Datum:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
 #: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:230
+#: src/client/util/util-email.vala:243
 msgid "Subject:"
 msgstr "Ämne:"
 
@@ -2050,8 +2052,8 @@ msgstr "Ett fel har uppstått när serverns certifikat hanterades"
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
-#: ui/problem-details-dialog.ui:12
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:99
+#: ui/problem-details-dialog.ui:17
 msgid "Details"
 msgstr "Detaljer"
 
@@ -2103,14 +2105,6 @@ msgid_plural "%d results"
 msgstr[0] "%d resultat"
 msgstr[1] "%d resultat"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
-msgid "Desktop Notifications"
-msgstr "Skrivbordsaviseringar"
-
-#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
-msgid "Displays desktop notifications when new email is delivered"
-msgstr "Visar skrivbordsaviseringar då ny e-post levereras"
-
 #. / Notification body when a message as been received
 #. / and other unread messages have not been
 #. / seen. First string substitution is the message
@@ -2176,29 +2170,30 @@ msgstr "Skapa återanvändbara mallar för att skicka e-post"
 #. the front for the default. English names do not need to be
 #. included.
 #: src/client/plugin/email-templates/email-templates.vala:29
+#: src/client/plugin/mail-merge/mail-merge.vala:29
 msgid "Templates | Template Mail | Template Email | Template E-Mail"
 msgstr "Mallar | E-postmallar | Meddelandemallar"
 
 #. Translators: The name of the folder used to
 #. store email templates
-#: src/client/plugin/email-templates/email-templates.vala:195
+#: src/client/plugin/email-templates/email-templates.vala:201
 msgid "Templates"
 msgstr "Mallar"
 
 #. Translators: Info bar button label for creating a
 #. new email template
-#: src/client/plugin/email-templates/email-templates.vala:276
+#: src/client/plugin/email-templates/email-templates.vala:282
 msgid "New"
 msgstr "Ny"
 
 #. Translators: Infobar status label for an email template
-#: src/client/plugin/email-templates/email-templates.vala:287
+#: src/client/plugin/email-templates/email-templates.vala:293
 msgid "Message template"
 msgstr "Meddelandemall"
 
 #. Translators: Info bar button label for sending an
 #. email template
-#: src/client/plugin/email-templates/email-templates.vala:291
+#: src/client/plugin/email-templates/email-templates.vala:297
 msgid "Send"
 msgstr "Skicka"
 
@@ -2206,18 +2201,73 @@ msgstr "Skicka"
 #. existing email template
 #. Translators: Info bar button label for editing a draft
 #. email
-#: src/client/plugin/email-templates/email-templates.vala:299
-#: src/client/plugin/special-folders/special-folders.vala:180
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
-msgid "Folder Highlight"
-msgstr "Mappfärgmarkering"
-
-#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
-msgid "Highlights folders that have newly delivered mail"
-msgstr "Färgmarkerar mappar som har nyligen levererad e-post"
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "Koppla e-post"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+msgstr "Fyll i och skicka e-postmallar med ett kalkylblad"
+
+#. Translators: Info bar label for starting sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:118
+msgid "Start"
+msgstr "Starta"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "Pausa"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
+#, c-format
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "%u av %u skickat"
+msgstr[1] "%u av %u skickade"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "Mall för e-postkoppling"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "Koppla"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "Infoga fält"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "Kommaseparerade värden (CSV)"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
 msgid "Messaging Menu"
@@ -2227,19 +2277,11 @@ msgstr "Meddelandemeny"
 msgid "Displays Unity Messaging Menu notifications for new email"
 msgstr "Visar Unitys meddelandemenyaviseringar för ny e-post"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:75
+#: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Nya meddelanden"
 
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
-msgid "Notification Badge"
-msgstr "Aviseringsikon"
-
-#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
-msgid "Displays a dock badge showing the number of new messages"
-msgstr "Visar en ikon i dockan som visar antalet nya meddelanden"
-
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
 msgid "Sent Sound"
 msgstr "Skickat-ljud"
@@ -2249,36 +2291,32 @@ msgid "Plays the desktop sent-mail sound when an email is sent"
 msgstr ""
 "Spelar skrivbordets ljud för skickad e-post när ett e-postmeddelande skickas"
 
-#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
-msgid "Special Folders"
-msgstr "Speciella mappar"
-
 #. Translators: Info bar button label for emptying
 #. trash/spam folders
-#: src/client/plugin/special-folders/special-folders.vala:160
+#: src/client/plugin/special-folders/special-folders.vala:167
 msgid "Empty"
 msgstr "Töm"
 
 #. Translators: Info bar status message for a draft email
-#: src/client/plugin/special-folders/special-folders.vala:172
+#: src/client/plugin/special-folders/special-folders.vala:179
 msgid "Draft message"
 msgstr "Utkastmeddelande"
 
 #. Translators: Info bar status description for a draft
 #. email
-#: src/client/plugin/special-folders/special-folders.vala:175
+#: src/client/plugin/special-folders/special-folders.vala:182
 msgid "This message has not yet been sent."
 msgstr "Det här meddelandet har inte skickats ännu."
 
 #. Translators: Info bar status message for an sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:191
+#: src/client/plugin/special-folders/special-folders.vala:198
 msgid "Message not saved"
 msgstr "Meddelandet sparades inte"
 
 #. Translators: Info bar status description for a sent but
 #. unsaved email
-#: src/client/plugin/special-folders/special-folders.vala:194
+#: src/client/plugin/special-folders/special-folders.vala:201
 msgid "This message was sent, but has not been saved to your account."
 msgstr "Detta meddelande har skickats, men sparades inte till ditt konto."
 
@@ -2350,32 +2388,37 @@ msgstr "Igår"
 msgid "%A"
 msgstr "%A"
 
-#. / 12 hours format for datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:216
+#. / 12 hours format for datetime that a message being replied
+#. / to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:218
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%a, %-e %b %Y klockan %l:%M %P"
 
-#. / 24 hours format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:220
+#. / 24 hours format for the datetime that a message being
+#. / replied to was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%a, %-e %b %Y klockan %H:%M"
 
-#. / Format for the datetime that a message being replied to was received
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:224
+#. / Format for the datetime that a message being replied to
+#. / was received See
+#. / http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:230
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %-e %b %Y klockan %X"
 
-#: src/client/util/util-email.vala:38
+#. Translators: Label used when an email has a missing or
+#. an empty subject
+#: src/client/util/util-email.vala:50
 msgid "(No subject)"
 msgstr "(Inget ämne)"
 
 #. / Translators: This is shown for displaying a list of email
 #. / recipients that happens to be empty, i.e. contains no
 #. / email addresses.
-#: src/client/util/util-email.vala:135
+#: src/client/util/util-email.vala:148
 msgid "(No recipients)"
 msgstr "(Inga mottagare)"
 
@@ -2384,7 +2427,7 @@ msgstr "(Inga mottagare)"
 #. / addresses. The first (string) substitution is
 #. / address of the first, the second substitution is
 #. / the number of n - 1 remaining recipients.
-#: src/client/util/util-email.vala:147
+#: src/client/util/util-email.vala:160
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2394,26 +2437,26 @@ msgstr[1] "%s och %d till"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:180
+#: src/client/util/util-email.vala:193
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "%1$s skrev %2$s:"
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:187
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "%s wrote:"
 msgstr "%s skrev:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:193
+#: src/client/util/util-email.vala:206
 #, c-format
 msgid "On %s:"
 msgstr "%s:"
 
-#: src/client/util/util-email.vala:222
+#: src/client/util/util-email.vala:235
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Vidarebefordrat meddelande ----------"
 
@@ -2653,7 +2696,7 @@ msgstr "oläst"
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:929
+#: src/engine/imap-engine/imap-engine-generic-account.vala:998
 msgid "Drafts | Draft"
 msgstr "Utkast | Drafts | Draft"
 
@@ -2661,13 +2704,13 @@ msgstr "Utkast | Drafts | Draft"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:938
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1007
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Skickat | Skickade brev | Sent | Sent Mail | Sent Email | Sent E-Mail"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:943
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1012
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Skickat"
@@ -2676,7 +2719,7 @@ msgstr "Skickat"
 #. Junk/Spam mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1022
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2688,13 +2731,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:963
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1032
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Papperskorg | Papperskorgen | Trash | Rubbish | Rubbish Bin"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:968
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1037
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Borttaget"
@@ -2703,21 +2746,21 @@ msgstr "Borttaget"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:978
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1047
 msgid "Archive | Archives"
 msgstr "Arkiv | Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:531
+#: src/engine/rfc822/rfc822-message.vala:528
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "Kunde inte avgöra mimetyp för ”%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:542
+#: src/engine/rfc822/rfc822-message.vala:539
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr "Kunde inte avgöra innehållstyp för mimetypen ”%s” på ”%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:1001
+#: src/engine/rfc822/rfc822-message.vala:1013
 msgid "(no subject)"
 msgstr "(inget ämne)"
 
@@ -2821,248 +2864,248 @@ msgstr "Li_ta på denna server"
 msgid "_Don’t Trust This Server"
 msgstr "Lita inte på _denna server"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
-msgid "Detach the composer from the window"
-msgstr "Koppla loss redigeraren från fönstret"
-
-#: ui/composer-headerbar.ui:135
-msgid "_Send"
-msgstr "_Skicka"
-
-#: ui/composer-headerbar.ui:162
-msgid "Discard and Close"
-msgstr "Förkasta och stäng"
-
-#: ui/composer-headerbar.ui:186
-msgid "Save and Close"
-msgstr "Spara och stäng"
-
-#. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:42
-msgid "Insert the new link with this URL"
-msgstr "Infoga den nya länken med denna URL"
-
-#: ui/composer-link-popover.ui:43
-msgid "Add"
-msgstr "Lägg till"
-
-#: ui/composer-link-popover.ui:47
-msgid "Link URL"
-msgstr "Länk-URL"
-
-#. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:61
-msgid "Update this link’s URL"
-msgstr "Uppdatera denna länk-URL"
-
-#: ui/composer-link-popover.ui:62
-msgid "Update"
-msgstr "Uppdatera"
-
-#: ui/composer-link-popover.ui:75
-msgid "Delete this link"
-msgstr "Ta bort denna länk"
-
-#: ui/composer-menus.ui:8
-msgid "_Undo"
-msgstr "_Ångra"
-
-#: ui/composer-menus.ui:12
-msgid "_Redo"
-msgstr "_Upprepa"
-
-#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
-msgid "Cu_t"
-msgstr "Klipp u_t"
-
-#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
-#: ui/conversation-message-menus.ui:37
-msgid "_Copy"
-msgstr "_Kopiera"
-
-#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
-msgid "_Paste"
-msgstr "_Klistra in"
-
-#: ui/composer-menus.ui:30
-msgctxt "Clipboard paste as plain text"
-msgid "Paste _Without Formatting"
-msgstr "Klistra in _utan formatering"
-
-#: ui/composer-menus.ui:50
-msgid "Select _All"
-msgstr "Välj _alla"
-
-#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
-msgid "_Inspect…"
-msgstr "_Inspektera…"
-
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:60
-msgid "_From"
-msgstr "_Från"
-
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:130
-msgid "_To"
-msgstr "_Till"
-
-#: ui/composer-widget.ui:158
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr "Visa fälten Cc, Bcc och Svara-till"
-
-#: ui/composer-widget.ui:219
-msgid "_Cc"
-msgstr "_Cc"
-
-#: ui/composer-widget.ui:267
-msgid "_Bcc"
-msgstr "_Bcc"
-
-#: ui/composer-widget.ui:315
-msgid "_Reply-To"
-msgstr "Sva_ra-till"
-
-#: ui/composer-widget.ui:372
-msgid "_Subject"
-msgstr "_Ämne"
-
-#: ui/composer-widget.ui:445
-msgid "Drop files here"
-msgstr "Släpp filer här"
-
-#: ui/composer-widget.ui:461
-msgid "To add them as attachments"
-msgstr "För att bifoga dem"
-
-#: ui/composer-widget.ui:602
+#: ui/composer-editor.ui:100
 msgid "Bold text"
 msgstr "Fet text"
 
-#: ui/composer-widget.ui:626
+#: ui/composer-editor.ui:124
 msgid "Italic text"
 msgstr "Kursiv text"
 
-#: ui/composer-widget.ui:650
+#: ui/composer-editor.ui:148
 msgid "Underline text"
 msgstr "Understryk text"
 
-#: ui/composer-widget.ui:674
+#: ui/composer-editor.ui:172
 msgid "Strikethrough text"
 msgstr "Genomstruken text"
 
-#: ui/composer-widget.ui:707
+#: ui/composer-editor.ui:205
 msgid "Insert bulleted list"
 msgstr "Infoga punktlista"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-editor.ui:229
 msgid "Insert numbered list"
 msgstr "Infoga numrerad lista"
 
-#: ui/composer-widget.ui:764
+#: ui/composer-editor.ui:262
 msgid "Indent or quote text"
 msgstr "Indentera eller citera text"
 
-#: ui/composer-widget.ui:788
+#: ui/composer-editor.ui:286
 msgid "Un-indent or unquote text"
 msgstr "Avindentera eller avcitera text"
 
-#: ui/composer-widget.ui:817
+#: ui/composer-editor.ui:315
 msgid "Remove text formatting"
 msgstr "Ta bort textformatering"
 
-#: ui/composer-widget.ui:836
+#: ui/composer-editor.ui:334
 msgid "Change font type"
 msgstr "Ändra typsnittets typ"
 
-#: ui/composer-widget.ui:851
+#: ui/composer-editor.ui:349
 msgid "Sans Serif"
 msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:862
+#: ui/composer-editor.ui:360
 msgid "Serif"
 msgstr "Serif"
 
-#: ui/composer-widget.ui:873
+#: ui/composer-editor.ui:371
 msgid "Fixed Width"
 msgstr "Fast bredd"
 
-#: ui/composer-widget.ui:899
+#: ui/composer-editor.ui:397
 msgid "Change font color"
 msgstr "Ändra typsnittsfärg"
 
-#: ui/composer-widget.ui:914
+#: ui/composer-editor.ui:412
 msgid "Change font size"
 msgstr "Ändra typsnittsstorlek"
 
-#: ui/composer-widget.ui:949
+#: ui/composer-editor.ui:447
 msgid "Insert or update text link"
 msgstr "Infoga eller uppdatera textlänk"
 
-#: ui/composer-widget.ui:973
+#: ui/composer-editor.ui:471
 msgid "Insert an image"
 msgstr "Infoga en bild"
 
-#: ui/composer-widget.ui:1015
+#: ui/composer-editor.ui:513
 msgid "Undo last edit"
 msgstr "Ångra senaste redigering"
 
-#: ui/composer-widget.ui:1039
+#: ui/composer-editor.ui:537
 msgid "Redo last edit"
 msgstr "Gör om senaste redigering"
 
-#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: ui/composer-widget.ui:1117
+#: ui/composer-editor.ui:615
 msgid "Add original attachments"
 msgstr "Lägg till ursprungliga bilagor"
 
-#: ui/composer-widget.ui:1162
+#: ui/composer-editor.ui:660
 msgid "More options"
 msgstr "Fler inställningar"
 
-#: ui/composer-widget.ui:1182
+#: ui/composer-editor.ui:680
 msgid "Show formatting toolbar"
 msgstr "Visa formateringsverktygsfält"
 
-#: ui/composer-widget.ui:1200
+#: ui/composer-editor.ui:698
 msgid "Select spell checking languages"
 msgstr "Välj språk för stavningskontroll"
 
-#: ui/composer-widget.ui:1263
+#: ui/composer-editor.ui:723
 msgid "S_ans Serif"
 msgstr "S_ans Serif"
 
-#: ui/composer-widget.ui:1268
+#: ui/composer-editor.ui:728
 msgid "S_erif"
 msgstr "S_erif"
 
-#: ui/composer-widget.ui:1273
+#: ui/composer-editor.ui:733
 msgid "_Fixed Width"
 msgstr "_Fast bredd"
 
-#: ui/composer-widget.ui:1283
+#: ui/composer-editor.ui:743
 msgid "_Small"
 msgstr "_Liten"
 
-#: ui/composer-widget.ui:1288
+#: ui/composer-editor.ui:748
 msgid "_Medium"
 msgstr "_Medel"
 
-#: ui/composer-widget.ui:1293
+#: ui/composer-editor.ui:753
 msgid "Lar_ge"
 msgstr "_Stor"
 
-#: ui/composer-widget.ui:1303
+#: ui/composer-editor.ui:763
 msgid "_Rich Text"
 msgstr "_Rich Text"
 
-#: ui/composer-widget.ui:1308
+#: ui/composer-editor.ui:768
 msgid "_Plain Text"
 msgstr "_Vanlig text"
 
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "_Ångra"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "_Upprepa"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "Klipp u_t"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "_Kopiera"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+msgid "_Paste"
+msgstr "_Klistra in"
+
+#: ui/composer-editor-menus.ui:30
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
+msgstr "Klistra in _utan formatering"
+
+#: ui/composer-editor-menus.ui:50
+msgid "Select _All"
+msgstr "Välj _alla"
+
+#: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
+msgid "_Inspect…"
+msgstr "_Inspektera…"
+
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Koppla loss redigeraren från fönstret"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_Skicka"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "Förkasta och stäng"
+
+#: ui/composer-headerbar.ui:186
+msgid "Save and Close"
+msgstr "Spara och stäng"
+
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:42
+msgid "Insert the new link with this URL"
+msgstr "Infoga den nya länken med denna URL"
+
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Lägg till"
+
+#: ui/composer-link-popover.ui:47
+msgid "Link URL"
+msgstr "Länk-URL"
+
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ui/composer-link-popover.ui:61
+msgid "Update this link’s URL"
+msgstr "Uppdatera denna länk-URL"
+
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Uppdatera"
+
+#: ui/composer-link-popover.ui:75
+msgid "Delete this link"
+msgstr "Ta bort denna länk"
+
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:61
+msgid "_From"
+msgstr "_Från"
+
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:131
+msgid "_To"
+msgstr "_Till"
+
+#: ui/composer-widget.ui:159
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Visa fälten Cc, Bcc och Svara-till"
+
+#: ui/composer-widget.ui:220
+msgid "_Cc"
+msgstr "_Cc"
+
+#: ui/composer-widget.ui:268
+msgid "_Bcc"
+msgstr "_Bcc"
+
+#: ui/composer-widget.ui:316
+msgid "_Reply-To"
+msgstr "Sva_ra-till"
+
+#: ui/composer-widget.ui:373
+msgid "_Subject"
+msgstr "_Ämne"
+
+#: ui/composer-widget.ui:446
+msgid "Drop files here"
+msgstr "Släpp filer här"
+
+#: ui/composer-widget.ui:462
+msgid "To add them as attachments"
+msgstr "För att bifoga dem"
+
 #: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
 msgid "Select all attachments"
 msgstr "Markera alla bifogade filer"
@@ -3079,7 +3122,7 @@ msgstr "Öppna markerade bifogade filer"
 msgid "Save _All"
 msgstr "Spara _alla"
 
-#: ui/components-inspector-error-view.ui:33
+#: ui/components-inspector-error-view.ui:31
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "one of the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>contact "
@@ -3091,13 +3134,13 @@ msgstr ""
 "\">kontaktvägarna</a> eller bifoga dem till en <a href=\"https://wiki.gnome.";
 "org/Apps/Geary/ReportingABug\">ny felrapport</a>."
 
-#: ui/components-inspector-error-view.ui:49
+#: ui/components-inspector-error-view.ui:47
 msgid "Details:"
 msgstr "Detaljer:"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:19
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
 msgid "Search for matching log entries"
 msgstr "Sök matchande loggposter"
 
@@ -3113,13 +3156,13 @@ msgstr "Lägg till en markörpost till loggen"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:46
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
 msgid "Save logs entries and details"
 msgstr "Spara loggposter och detaljer"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:62
+#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
 msgid "Copy to clipboard"
 msgstr "Kopiera till urklipp"
 
@@ -3680,6 +3723,27 @@ msgstr "_Autentisera"
 msgid "Geary update in progress…"
 msgstr "Geary-uppgradering pågår…"
 
+#~ msgid "Desktop Notifications"
+#~ msgstr "Skrivbordsaviseringar"
+
+#~ msgid "Displays desktop notifications when new email is delivered"
+#~ msgstr "Visar skrivbordsaviseringar då ny e-post levereras"
+
+#~ msgid "Folder Highlight"
+#~ msgstr "Mappfärgmarkering"
+
+#~ msgid "Highlights folders that have newly delivered mail"
+#~ msgstr "Färgmarkerar mappar som har nyligen levererad e-post"
+
+#~ msgid "Notification Badge"
+#~ msgstr "Aviseringsikon"
+
+#~ msgid "Displays a dock badge showing the number of new messages"
+#~ msgstr "Visar en ikon i dockan som visar antalet nya meddelanden"
+
+#~ msgid "Special Folders"
+#~ msgstr "Speciella mappar"
+
 #~ msgctxt "shortcut window"
 #~ msgid "Find in current conversations"
 #~ msgstr "Hitta i aktuella konversationer"
@@ -4059,10 +4123,6 @@ msgstr "Geary-uppgradering pågår…"
 #~ msgid "Additional Shortcuts"
 #~ msgstr "Ytterligare genvägar"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Star"
-#~ msgstr "Stjärnmärk"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Unstar"
 #~ msgstr "Ta bort stjärnmärkning"