[geary] Update Polish translation

[Piotr Drąg <piotrdrag src gnome org>]

commit fcb3939944856e11345fb618e2966869782e6915
Author: Piotr Drąg <piotrdrag gmail com>
Date:   Sun Nov 10 13:00:11 2019 +0100

    Update Polish translation

 po/pl.po | 828 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 426 insertions(+), 402 deletions(-)
---
diff --git a/po/pl.po b/po/pl.po
index 6182da6a..f5746184 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-08-18 11:39+0000\n"
-"PO-Revision-Date: 2019-08-18 15:37+0200\n"
+"POT-Creation-Date: 2019-11-07 01:41+0000\n"
+"PO-Revision-Date: 2019-11-10 12:58+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <community-poland mozilla org>\n"
 "Language: pl\n"
@@ -36,36 +36,37 @@ msgid "Send files using Geary"
 msgstr "Wysyłanie plików za pomocą programu Geary"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:12
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "Poczta"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:16
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:24
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/geary-application.vala:31
 msgid "Send and receive email"
 msgstr "Wysyłanie i odbieranie poczty"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;Poczta;Skrzynka;Wiadomość;Wiadomości;mejl;majl;"
 
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:14
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Zespół programistów Geary"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:18
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -75,7 +76,7 @@ msgstr ""
 "wątków. Umożliwia czytanie, wyszukiwanie i wysyłanie wiadomości za pomocą "
 "prostego, nowoczesnego interfejsu."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:23
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -83,53 +84,53 @@ msgstr ""
 "Wątki umożliwiają czytanie pełnych dyskusji bez potrzeby wyszukiwania "
 "i klikania poszczególnych wiadomości."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:27
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Funkcje programu Geary:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "Szybkie ustawianie konta poczty"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Shows related messages together in conversations"
 msgstr "Wyświetlanie powiązanych wiadomości w jednym wątku"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Szybkie wyszukiwanie w wiadomościach i słowach kluczowych"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Wiele funkcji tworzenia wiadomości HTML i w zwykłym tekście"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "Powiadomienia o nowych wiadomościach na pulpicie"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:34
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Zgodność z serwisami Gmail, Yahoo! Mail, Outlook.com i innymi serwerami IMAP"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:48
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "Widok wątku"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:59
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 msgid "Geary showing the rich text composer"
 msgstr "Okno tworzenia wiadomości z formatowaniem"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr ""
 "Poczta;Mail;E-mail;Email;Emajl;Emejl;Imail;Imejl;Imajl;Mejl;Majl;Wiadomości;"
 "IMAP;Gmail;Dżimejl;Dżimajl;Yahoo;Jahu;Hotmail;Hotmejl;Outlook;Ałtluk;"
 
-#: desktop/org.gnome.Geary.desktop.in:22
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Utwórz wiadomość"
 
@@ -237,79 +238,63 @@ msgid ""
 msgstr "Lista języków zawsze wyświetlanych w oknie sprawdzania pisowni."
 
 #: desktop/org.gnome.Geary.gschema.xml:82
-msgid "Enable notification sounds"
-msgstr "Dźwięki powiadomień"
-
-#: desktop/org.gnome.Geary.gschema.xml:83
-msgid "True to play sounds for notifications and sending."
-msgstr "Odtwarzanie dźwięków powiadomień i wysyłania."
-
-#: desktop/org.gnome.Geary.gschema.xml:88
-msgid "Show notifications for new mail"
-msgstr "Powiadomienia o nowych wiadomościach"
-
-#: desktop/org.gnome.Geary.gschema.xml:89
-msgid "True to show notification bubbles."
-msgstr "Wyświetlanie powiadomień."
-
-#: desktop/org.gnome.Geary.gschema.xml:94
 msgid "Notify of new mail at startup"
 msgstr "Powiadamianie o nowych wiadomościach po uruchomieniu"
 
-#: desktop/org.gnome.Geary.gschema.xml:95
+#: desktop/org.gnome.Geary.gschema.xml:83
 msgid "True to notify of new mail at startup."
 msgstr "Powiadamianie o nowych wiadomościach po uruchomieniu."
 
-#: desktop/org.gnome.Geary.gschema.xml:100
+#: desktop/org.gnome.Geary.gschema.xml:88
 msgid "Ask when opening an attachment"
 msgstr "Pytanie podczas otwierania załącznika"
 
-#: desktop/org.gnome.Geary.gschema.xml:101
+#: desktop/org.gnome.Geary.gschema.xml:89
 msgid "True to ask when opening an attachment."
 msgstr "Pytanie podczas otwierania załącznika."
 
-#: desktop/org.gnome.Geary.gschema.xml:106
+#: desktop/org.gnome.Geary.gschema.xml:94
 msgid "Whether to compose emails in HTML"
 msgstr "Tworzenie wiadomości w formacie HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:107
+#: desktop/org.gnome.Geary.gschema.xml:95
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 "Tworzenie wiadomości w formacie HTML. Wyłączenie powoduje tworzenie "
 "wiadomości w zwykłym tekście."
 
-#: desktop/org.gnome.Geary.gschema.xml:112
+#: desktop/org.gnome.Geary.gschema.xml:100
 msgid "Advisory strategy for full-text searching"
 msgstr "Strategia wyszukiwania w treści"
 
-#: desktop/org.gnome.Geary.gschema.xml:113
+#: desktop/org.gnome.Geary.gschema.xml:101
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Przyjmowane wartości: „exact” (dokładna), „conservative” (konserwatywna), "
 "„aggressive” (agresywna) i „horizon” (horyzontalna)."
 
-#: desktop/org.gnome.Geary.gschema.xml:118
+#: desktop/org.gnome.Geary.gschema.xml:106
 msgid "Zoom of conversation viewer"
 msgstr "Powiększenie widoku wątku"
 
-#: desktop/org.gnome.Geary.gschema.xml:119
+#: desktop/org.gnome.Geary.gschema.xml:107
 msgid "The zoom to apply on the conservation view."
 msgstr "Powiększenie widoku wątku."
 
-#: desktop/org.gnome.Geary.gschema.xml:124
+#: desktop/org.gnome.Geary.gschema.xml:112
 msgid "Size of detached composer window"
 msgstr "Rozmiar odłączonego okna tworzenia wiadomości"
 
-#: desktop/org.gnome.Geary.gschema.xml:125
+#: desktop/org.gnome.Geary.gschema.xml:113
 msgid "The last recorded size of the detached composer window."
 msgstr "Ostatnio zapisany rozmiar odłączonego okna tworzenia wiadomości."
 
-#: desktop/org.gnome.Geary.gschema.xml:130
+#: desktop/org.gnome.Geary.gschema.xml:118
 msgid "Whether we migrated the old settings"
 msgstr "Poprzednie ustawienia zostały migrowane"
 
-#: desktop/org.gnome.Geary.gschema.xml:131
+#: desktop/org.gnome.Geary.gschema.xml:119
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -319,7 +304,7 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:203
+#: src/client/accounts/accounts-editor.vala:204
 msgid "Failed to store certificate"
 msgstr "Zachowanie certyfikatu się nie powiodło"
 
@@ -586,55 +571,56 @@ msgstr[0] "ostatni %d dzień"
 msgstr[1] "ostatnie %d dni"
 msgstr[2] "ostatnie %d dni"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:243
-#: src/client/application/application-controller.vala:2405
+#: src/client/accounts/accounts-editor-list-pane.vala:248
+#: src/client/components/main-window.vala:1623
 msgid "Undo"
 msgstr "Cofnij"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:251
+#: src/client/accounts/accounts-editor-list-pane.vala:257
+#: src/client/components/main-window.vala:1613
 msgid "Redo"
 msgstr "Ponów"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:345
-#: src/client/accounts/accounts-editor-list-pane.vala:433
+#: src/client/accounts/accounts-editor-list-pane.vala:351
+#: src/client/accounts/accounts-editor-list-pane.vala:439
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:349
-#: src/client/accounts/accounts-editor-list-pane.vala:437
+#: src/client/accounts/accounts-editor-list-pane.vala:355
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-list-pane.vala:359
+#: src/client/accounts/accounts-editor-list-pane.vala:447
 #: 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:371
+#: src/client/accounts/accounts-editor-list-pane.vala:377
 msgid "This account has been disabled"
 msgstr "To konto jest wyłączone"
 
 #. 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:380
+#: src/client/accounts/accounts-editor-list-pane.vala:386
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Wystąpił problem z tym kontem i jest niedostępne"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:430
+#: src/client/accounts/accounts-editor-list-pane.vala:436
 msgid "Other email providers"
 msgstr "Inni dostawcy poczty"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:547
+#: src/client/accounts/accounts-editor-list-pane.vala:553
 #, c-format
 msgid "Account “%s” removed"
 msgstr "Usunięto konto „%s”"
@@ -642,7 +628,7 @@ msgstr "Usunięto konto „%s”"
 #. 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:554
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” restored"
 msgstr "Przywrócono konto „%s”"
@@ -687,7 +673,7 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
+#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:347
 msgid "Login"
 msgstr "Login"
 
@@ -758,34 +744,156 @@ msgstr "Login serwera odbierania"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:59
+#: src/client/application/application-attachment-manager.vala:21
 msgid "Untitled"
 msgstr "Bez tytułu"
 
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?"
+
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr "Plik w „%s” już istnieje. Zastąpienie go nadpisze jego zawartość."
+
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "_Zastąp"
+
 #. / Notification title.
-#: src/client/application/application-controller.vala:564
+#: src/client/application/application-controller.vala:454
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "Wystąpił problem podczas wysyłania wiadomości z konta %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:568
+#: src/client/application/application-controller.vala:458
 msgid "Email will not be sent until re-connected"
 msgstr "Wiadomości nie będą wysyłane do czasu ponownego połączenia"
 
-#: src/client/application/application-controller.vala:919
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:564
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Oznaczono wątek"
+msgstr[1] "Oznaczono wątki"
+msgstr[2] "Oznaczono wątki"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:570
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Usunięto oznaczenie wątku"
+msgstr[1] "Usunięto oznaczenie wątków"
+msgstr[2] "Usunięto oznaczenie wątków"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:596
+#: src/client/application/application-controller.vala:680
+#, c-format
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Przeniesiono wątek do „%s”"
+msgstr[1] "Przeniesiono wątki do „%s”"
+msgstr[2] "Przeniesiono wątki do „%s”"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / 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:604
+#: src/client/application/application-controller.vala:626
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Przywrócono wątek do „%s”"
+msgstr[1] "Przywrócono wątki do „%s”"
+msgstr[2] "Przywrócono wątki do „%s”"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:647
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Przeniesiono wątek do archiwum"
+msgstr[1] "Przeniesiono wątki do archiwum"
+msgstr[2] "Przeniesiono wątki do archiwum"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:703
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Przywrócono wiadomość do „%s”"
+msgstr[1] "Przywrócono wiadomości do „%s”"
+msgstr[2] "Przywrócono wiadomości do „%s”"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:724
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Przeniesiono wiadomość do archiwum"
+msgstr[1] "Przeniesiono wiadomości do archiwum"
+msgstr[2] "Przeniesiono wiadomości do archiwum"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:759
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Przeniesiono wiadomość do „%s”"
+msgstr[1] "Przeniesiono wiadomości do „%s”"
+msgstr[2] "Przeniesiono wiadomości do „%s”"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:787
+#, c-format
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Dodano etykietę „%s”"
+msgstr[1] "Dodano etykietę „%s”"
+msgstr[2] "Dodano etykietę „%s”"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:795
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Usunięto etykietę „%s”"
+msgstr[1] "Usunięto etykietę „%s”"
+msgstr[2] "Usunięto etykietę „%s”"
+
+#: src/client/application/application-controller.vala:1193
 msgid "Labels"
 msgstr "Etykiety"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: src/client/application/application-controller.vala:932
+#: src/client/application/application-controller.vala:1206
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "Nie można otworzyć bazy danych dla %s"
 
-#: src/client/application/application-controller.vala:933
+#: src/client/application/application-controller.vala:1207
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -810,20 +918,20 @@ msgstr ""
 "Przebudowanie bazy danych usunie wszystkie lokalne wiadomości e-mail i ich "
 "załączniki. <b>Poczta na serwerze nie zostanie usunięta.</b>"
 
-#: src/client/application/application-controller.vala:935
+#: src/client/application/application-controller.vala:1209
 msgid "_Rebuild"
 msgstr "P_rzebuduj"
 
-#: src/client/application/application-controller.vala:935
+#: src/client/application/application-controller.vala:1209
 msgid "E_xit"
 msgstr "Za_kończ"
 
-#: src/client/application/application-controller.vala:944
+#: src/client/application/application-controller.vala:1218
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "Nie można przebudować bazy danych dla „%s”"
 
-#: src/client/application/application-controller.vala:945
+#: src/client/application/application-controller.vala:1219
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -834,258 +942,154 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/application-controller.vala:1739
-#, c-format
-msgid "Moved %d message to %s"
-msgid_plural "Moved %d messages to %s"
-msgstr[0] "Przeniesiono %d wiadomość do „%s”"
-msgstr[1] "Przeniesiono %d wiadomości do „%s”"
-msgstr[2] "Przeniesiono %d wiadomości do „%s”"
-
-#: src/client/application/application-controller.vala:1749
-msgid "Are you sure you want to open these attachments?"
-msgstr "Na pewno otworzyć te załączniki?"
-
-#: src/client/application/application-controller.vala:1750
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"Załączniki po otwarciu mogą uszkodzić system. Należy otwierać załączniki "
-"pochodzące tylko z zaufanych źródeł."
-
-#: src/client/application/application-controller.vala:1751
-msgid "Don’t _ask me again"
-msgstr "_Bez pytania ponownie"
-
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/application-controller.vala:1874
-#, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?"
-
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/application-controller.vala:1881
-#, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
-msgstr "Plik w „%s” już istnieje. Zastąpienie go nadpisze jego zawartość."
-
-#: src/client/application/application-controller.vala:1885
-msgid "_Replace"
-msgstr "_Zastąp"
-
-#: src/client/application/application-controller.vala:2245
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Usunąć wszystkie wiadomości z katalogu %s?"
-
-#: src/client/application/application-controller.vala:2246
-msgid "This removes the email from Geary and your email server."
-msgstr "Spowoduje to usunięcie wiadomości z programu Geary i serwera poczty."
-
-#: src/client/application/application-controller.vala:2247
-msgid "This cannot be undone."
-msgstr "Tego nie można cofnąć."
-
-#: src/client/application/application-controller.vala:2248
-#, c-format
-msgid "Empty %s"
-msgstr "Opróżnij %s"
-
-#: src/client/application/application-controller.vala:2265
-#, c-format
-msgid "Error emptying %s"
-msgstr "Błąd podczas opróżniania %s"
-
-#: src/client/application/application-controller.vala:2296
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Trwale usunąć tę wiadomość?"
-msgstr[1] "Trwale usunąć te wiadomości?"
-msgstr[2] "Trwale usunąć te wiadomości?"
-
-#: src/client/application/application-controller.vala:2298
-msgid "Delete"
-msgstr "Usuń"
-
-#: src/client/application/application-controller.vala:2312
-#, c-format
-msgid "Trashed %d message"
-msgid_plural "Trashed %d messages"
-msgstr[0] "Przeniesiono %d wiadomość do kosza"
-msgstr[1] "Przeniesiono %d wiadomości do kosza"
-msgstr[2] "Przeniesiono %d wiadomości do kosza"
-
-#: src/client/application/application-controller.vala:2359
-#, c-format
-msgid "Archived %d message"
-msgid_plural "Archived %d messages"
-msgstr[0] "Przeniesiono %d wiadomość do archiwum"
-msgstr[1] "Przeniesiono %d wiadomości do archiwum"
-msgstr[2] "Przeniesiono %d wiadomości do archiwum"
-
 #. 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:2487
+#: src/client/application/application-controller.vala:1642
 #, c-format
 msgid "Successfully sent mail to %s."
 msgstr "Pomyślnie wysłano wiadomość do: %s."
 
-#: src/client/application/application-controller.vala:2565
-msgid "Failed to open default text editor."
-msgstr "Otwarcie domyślnego edytora tekstu się nie powiodło."
-
-#: src/client/application/geary-application.vala:25
+#: src/client/application/geary-application.vala:32
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:26
+#: src/client/application/geary-application.vala:33
 msgid "Copyright 2016-2019 Geary Development Team."
 msgstr "Copyright 2016-2019 Zespół programistów Geary"
 
-#: src/client/application/geary-application.vala:28
+#: src/client/application/geary-application.vala:35
 msgid "Visit the Geary web site"
 msgstr "Witryna programu Geary"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:104
+#: src/client/application/geary-application.vala:110
 msgid "Print debug logging"
 msgstr "Wyświetla komunikaty dziennika debugowania"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:107
+#: src/client/application/geary-application.vala:113
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Uruchamia z ukrytym głównym oknem (przestarzałe)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:110
+#: src/client/application/geary-application.vala:116
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Włącza Inspektora biblioteki WebKitGTK w widokach WWW"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:113
+#: src/client/application/geary-application.vala:119
 msgid "Log conversation monitoring"
 msgstr "Zapisuje w dzienniku monitoring wątków"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:116
+#: src/client/application/geary-application.vala:122
 msgid "Log IMAP network deserialization"
 msgstr "Zapisuje w dzienniku deserializację sieciową IMAP"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/geary-application.vala:120
+#: src/client/application/geary-application.vala:126
 msgid "Log folder normalization"
 msgstr "Zapisuje w dzienniku normalizacje katalogów"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:123
+#: src/client/application/geary-application.vala:129
 msgid "Log network activity"
 msgstr "Zapisuje w dzienniku aktywność sieciową"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:126
+#: src/client/application/geary-application.vala:132
 msgid "Log periodic activity"
 msgstr "Zapisuje w dzienniku okresową aktywność"
 
 #. / 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/geary-application.vala:131
+#: src/client/application/geary-application.vala:137
 msgid "Log IMAP replay queue"
 msgstr "Zapisuje w dzienniku kolejkę odpowiedzi IMAP"
 
 #. / Command line option. Serialization is how commands and
 #. / responses are converted into a stream of bytes for
 #. / network transmission
-#: src/client/application/geary-application.vala:136
+#: src/client/application/geary-application.vala:142
 msgid "Log IMAP network serialization"
 msgstr "Zapisuje w dzienniku serializację sieciową IMAP"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:139
+#: src/client/application/geary-application.vala:145
 msgid "Log database queries (generates lots of messages)"
 msgstr ""
 "Zapisuje w dzienniku zapytania do bazy danych (generuje dużo komunikatów)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:142
+#: src/client/application/geary-application.vala:148
 msgid "Perform a graceful quit"
 msgstr "Poprawnie kończy działanie"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:145
+#: src/client/application/geary-application.vala:151
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Unieważnia wszystkie przypięte certyfikaty serwerów TLS"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:148
+#: src/client/application/geary-application.vala:154
 msgid "Display program version"
 msgstr "Wyświetla wersję programu"
 
-#. Use this to specify arguments in the help section
-#. / Command line option
-#: src/client/application/geary-application.vala:152
-msgid "Display program version and revision id"
-msgstr "Wyświetla wersję programu i identyfikator wydania"
-
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:279
+#: src/client/application/geary-application.vala:286
 msgid "Geary version"
 msgstr "Wersja programu Geary"
 
-#: src/client/application/geary-application.vala:280
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:288
 msgid "Geary revision"
 msgstr "Wydanie programu Geary"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:282
+#: src/client/application/geary-application.vala:290
 msgid "GTK version"
 msgstr "Wersja biblioteki GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/geary-application.vala:289
+#: src/client/application/geary-application.vala:297
 msgid "GLib version"
 msgstr "Wersja biblioteki GLib"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:296
+#: src/client/application/geary-application.vala:304
 msgid "WebKitGTK version"
 msgstr "Wersja biblioteki WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:303
+#: src/client/application/geary-application.vala:311
 msgid "Desktop environment"
 msgstr "Środowisko pulpitu"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/geary-application.vala:305
-#: src/client/conversation-viewer/conversation-email.vala:159
+#: src/client/application/geary-application.vala:313
+#: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Nieznany"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:335
+#: src/client/application/geary-application.vala:343
 msgid "Distribution name"
 msgstr "Nazwa dystrybucji"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:340
+#: src/client/application/geary-application.vala:348
 msgid "Distribution release"
 msgstr "Wydanie dystrybucji"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:348
+#: src/client/application/geary-application.vala:356
 msgid "Installation prefix"
 msgstr "Przedrostek instalacji"
 
-#: src/client/application/geary-application.vala:513
+#: src/client/application/geary-application.vala:518
 #, c-format
 msgid "About %s"
 msgstr "O programie %s"
@@ -1093,7 +1097,7 @@ msgstr "O programie %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/geary-application.vala:517
+#: src/client/application/geary-application.vala:522
 msgid "translator-credits"
 msgstr ""
 "scrx <mattpiskorz gmail com>, 2012\n"
@@ -1109,17 +1113,44 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/geary-application.vala:790
+#: src/client/application/geary-application.vala:859
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "Opcja „--hidden” jest przestarzała i zostanie usunięta w przyszłości."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/geary-application.vala:822
+#: src/client/application/geary-application.vala:891
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Nieznany parametr programu: „%s”"
 
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. 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:1666
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Na pewno otworzyć te załączniki?"
+
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"Załączniki po otwarciu mogą uszkodzić system. Należy otwierać załączniki "
+"pochodzące tylko z zaufanych źródeł."
+
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "_Bez pytania ponownie"
+
 #: src/client/components/components-inspector.vala:68
 msgid "Inspector"
 msgstr "Inspektor"
@@ -1222,7 +1253,46 @@ msgstr[0] "Usuwa wątek"
 msgstr[1] "Usuwa wątki"
 msgstr[2] "Usuwa wątki"
 
-#: src/client/components/main-window.vala:733
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/components/main-window.vala:985
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Trwale usunąć ten wątek?"
+msgstr[1] "Trwale usunąć te wątki?"
+msgstr[2] "Trwale usunąć te wątki?"
+
+#: src/client/components/main-window.vala:990
+#: src/client/components/main-window.vala:1005
+msgid "Delete"
+msgstr "Usuń"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/components/main-window.vala:1000
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Trwale usunąć tę wiadomość?"
+msgstr[1] "Trwale usunąć te wiadomości?"
+msgstr[2] "Trwale usunąć te wiadomości?"
+
+#: src/client/components/main-window.vala:1013
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Usunąć wszystkie wiadomości z katalogu %s?"
+
+#: src/client/components/main-window.vala:1016
+msgid "This removes the email from Geary and your email server."
+msgstr "Spowoduje to usunięcie wiadomości z programu Geary i serwera poczty."
+
+#: src/client/components/main-window.vala:1017
+msgid "This cannot be undone."
+msgstr "Tego nie można cofnąć."
+
+#: src/client/components/main-window.vala:1018
+#, c-format
+msgid "Empty %s"
+msgstr "Opróżnij %s"
+
+#: src/client/components/main-window.vala:1361
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1359,15 +1429,15 @@ msgstr "Za_mknij"
 msgid "_Discard"
 msgstr "Od_rzuć"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
 msgid "_Preferences"
 msgstr "_Preferencje"
 
@@ -1384,13 +1454,14 @@ msgstr "Za_kończ"
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "_Zapisz"
 
 #: src/client/components/stock.vala:32
 msgid "_Keep"
-msgstr "_Zachowaj"
+msgstr "Za_chowaj"
 
 #: src/client/composer/composer-link-popover.vala:149
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
@@ -1405,27 +1476,28 @@ msgstr "Nieprawidłowy adres URL odnośnika"
 msgid "Invalid email address"
 msgstr "Nieprawidłowy adres e-mail"
 
-#: src/client/composer/composer-widget.vala:156
+#: src/client/composer/composer-widget.vala:159
 msgid "Saved"
 msgstr "Zapisano"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:160
 msgid "Saving"
 msgstr "Zapisywanie"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:161
 msgid "Error saving"
 msgstr "Błąd podczas zapisywania"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:162
 msgid "Press Backspace to delete quote"
 msgstr "Naciśnięcie klawisza Backspace usunie cytat"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:168
+#. 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:178
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1437,100 +1509,89 @@ 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:1181
+#: src/client/composer/composer-widget.vala:1182
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Zachować lub odrzucić ten szkic?"
 
 #. 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:1211
+#: src/client/composer/composer-widget.vala:1212
 msgid "Do you want to discard this draft message?"
 msgstr "Odrzucić ten szkic?"
 
-#: src/client/composer/composer-widget.vala:1330
+#: src/client/composer/composer-widget.vala:1331
 msgid "Send message with an empty subject and body?"
 msgstr "Wysłać wiadomość niezawierającą tematu i treści?"
 
-#: src/client/composer/composer-widget.vala:1332
+#: src/client/composer/composer-widget.vala:1333
 msgid "Send message with an empty subject?"
 msgstr "Wysłać wiadomość niezawierającą tematu?"
 
-#: src/client/composer/composer-widget.vala:1334
+#: src/client/composer/composer-widget.vala:1335
 msgid "Send message with an empty body?"
 msgstr "Wysłać wiadomość niezawierającą treści?"
 
-#: src/client/composer/composer-widget.vala:1338
+#: src/client/composer/composer-widget.vala:1344
 msgid "Send message without an attachment?"
 msgstr "Wysłać wiadomość niezawierającą załączników?"
 
-#: src/client/composer/composer-widget.vala:1652
+#: src/client/composer/composer-widget.vala:1658
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "Do wiadomości już załączono „%s”."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1660
-#: src/client/conversation-viewer/conversation-email.vala:173
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: src/client/composer/composer-widget.vala:1697
+#: src/client/composer/composer-widget.vala:1703
 #, c-format
 msgid "“%s” could not be found."
 msgstr "Nie można odnaleźć „%s”."
 
-#: src/client/composer/composer-widget.vala:1703
+#: src/client/composer/composer-widget.vala:1709
 #, c-format
 msgid "“%s” is a folder."
 msgstr "„%s” jest katalogiem."
 
-#: src/client/composer/composer-widget.vala:1709
+#: src/client/composer/composer-widget.vala:1715
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "„%s” jest pustym plikiem."
 
-#: src/client/composer/composer-widget.vala:1722
+#: src/client/composer/composer-widget.vala:1728
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "Nie można otworzyć „%s” do odczytania."
 
-#: src/client/composer/composer-widget.vala:1730
+#: src/client/composer/composer-widget.vala:1736
 msgid "Cannot add attachment"
 msgstr "Nie można dodać załącznika"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1787
-#: src/client/conversation-viewer/conversation-email.vala:976
+#: src/client/composer/composer-widget.vala:1793
+#: src/client/conversation-viewer/conversation-email.vala:559
 #: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Do:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1793
-#: src/client/conversation-viewer/conversation-email.vala:981
+#: src/client/composer/composer-widget.vala:1799
+#: src/client/conversation-viewer/conversation-email.vala:564
 #: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "DW:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1799
-#: src/client/conversation-viewer/conversation-email.vala:986
+#: src/client/composer/composer-widget.vala:1805
+#: src/client/conversation-viewer/conversation-email.vala:569
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "UDW:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1805
+#: src/client/composer/composer-widget.vala:1811
 msgid "Reply-To: "
 msgstr "Odpowiedź do: "
 
-#: src/client/composer/composer-widget.vala:1945
+#: src/client/composer/composer-widget.vala:1951
 msgid "Select Color"
 msgstr "Wybór koloru"
 
@@ -1539,20 +1600,20 @@ msgstr "Wybór koloru"
 #. 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:2137
+#: src/client/composer/composer-widget.vala:2143
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s przez %2$s"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2192
+#: src/client/composer/composer-widget.vala:2198
 msgid "_From:"
 msgstr "_Od:"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2472
+#: src/client/composer/composer-widget.vala:2480
 msgid "Images"
 msgstr "Obrazy"
 
@@ -1573,7 +1634,7 @@ msgid "Search for more languages"
 msgstr "Więcej języków"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:337
+#: src/client/conversation-list/conversation-list-view.vala:312
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "_Przenieś wątek do kosza"
@@ -1581,45 +1642,45 @@ msgstr[1] "_Przenieś wątki do kosza"
 msgstr[2] "_Przenieś wątki do kosza"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:347
+#: src/client/conversation-list/conversation-list-view.vala:322
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_Usuń wątek"
 msgstr[1] "_Usuń wątki"
 msgstr[2] "_Usuń wątki"
 
-#: src/client/conversation-list/conversation-list-view.vala:356
+#: src/client/conversation-list/conversation-list-view.vala:331
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Oznacz jako p_rzeczytane"
 
-#: src/client/conversation-list/conversation-list-view.vala:359
+#: src/client/conversation-list/conversation-list-view.vala:334
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Oznacz jako niep_rzeczytane"
 
-#: src/client/conversation-list/conversation-list-view.vala:362
+#: src/client/conversation-list/conversation-list-view.vala:337
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "Usuń wy_różnienie"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:339
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Wyróżnij"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:367
+#: src/client/conversation-list/conversation-list-view.vala:342
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:343
 msgid "R_eply All"
 msgstr "O_dpowiedz wszystkim"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:369
+#: src/client/conversation-list/conversation-list-view.vala:344
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "_Przekaż"
@@ -1629,24 +1690,24 @@ msgid "Me"
 msgstr "Ja"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:971
+#: src/client/conversation-viewer/conversation-email.vala:554
 #: src/client/util/util-email.vala:207
 msgid "From:"
 msgstr "Od:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:991
+#: src/client/conversation-viewer/conversation-email.vala:574
 #: src/client/util/util-email.vala:212
 msgid "Date:"
 msgstr "Data:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1001
+#: src/client/conversation-viewer/conversation-email.vala:584
 #: src/client/util/util-email.vala:210
 msgid "Subject:"
 msgstr "Temat:"
 
-#: src/client/conversation-viewer/conversation-message.vala:129
+#: src/client/conversation-viewer/conversation-message.vala:132
 msgid "This email address may have been forged"
 msgstr "Ten adres e-mail może być fałszywy"
 
@@ -1654,20 +1715,20 @@ msgstr "Ten adres e-mail może być fałszywy"
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:445
+#: src/client/conversation-viewer/conversation-message.vala:449
 msgid "No sender"
 msgstr "Brak nadawcy"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:838
+#: src/client/conversation-viewer/conversation-message.vala:841
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:958
+#: src/client/conversation-viewer/conversation-message.vala:961
 msgid "Image"
 msgstr "Obraz"
 
@@ -1853,14 +1914,9 @@ msgstr[0] "%d wynik"
 msgstr[1] "%d wyniki"
 msgstr[2] "%d wyników"
 
-#: src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s — New Messages"
-msgstr "%s — nowe wiadomości"
-
 #. / Notification body text for new email when no other
 #. / new messages are already awaiting.
-#: src/client/notification/notification-desktop.vala:90
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1871,7 +1927,7 @@ msgstr[2] "%d nowych wiadomości"
 #. / Notification body text for new email when
 #. / other new messages have already been notified
 #. / about
-#: src/client/notification/notification-desktop.vala:98
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -1879,7 +1935,7 @@ msgstr[0] "%s, łącznie %d nowa wiadomość"
 msgstr[1] "%s, łącznie %d nowe wiadomości"
 msgstr[2] "%s, łącznie %d nowych wiadomości"
 
-#: src/client/notification/notification-desktop.vala:130
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
 #, c-format
 msgid ""
 "%s\n"
@@ -1897,6 +1953,11 @@ msgstr[2] ""
 "%s\n"
 "(%d innych nowych wiadomości dla %s)"
 
+#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — nowe wiadomości"
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -2112,7 +2173,7 @@ msgstr "Archiwum"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:117
+#: src/engine/imap-db/search/imap-db-search-query.vala:73
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "załącznik"
@@ -2125,7 +2186,7 @@ msgstr "załącznik"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:126
+#: src/engine/imap-db/search/imap-db-search-query.vala:82
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "udw"
@@ -2137,7 +2198,7 @@ msgstr "udw"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/search/imap-db-search-query.vala:90
 msgctxt "Search operator"
 msgid "body"
 msgstr "treść"
@@ -2150,7 +2211,7 @@ msgstr "treść"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:143
+#: src/engine/imap-db/search/imap-db-search-query.vala:99
 msgctxt "Search operator"
 msgid "cc"
 msgstr "dw"
@@ -2163,7 +2224,7 @@ msgstr "dw"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:152
+#: src/engine/imap-db/search/imap-db-search-query.vala:108
 msgctxt "Search operator"
 msgid "from"
 msgstr "od"
@@ -2175,7 +2236,7 @@ msgstr "od"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:160
+#: src/engine/imap-db/search/imap-db-search-query.vala:116
 msgctxt "Search operator"
 msgid "is"
 msgstr "jest"
@@ -2187,7 +2248,7 @@ msgstr "jest"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/imap-db-account.vala:168
+#: src/engine/imap-db/search/imap-db-search-query.vala:124
 msgctxt "Search operator"
 msgid "subject"
 msgstr "temat"
@@ -2200,7 +2261,7 @@ msgstr "temat"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:177
+#: src/engine/imap-db/search/imap-db-search-query.vala:133
 msgctxt "Search operator"
 msgid "to"
 msgstr "do"
@@ -2213,7 +2274,7 @@ msgstr "do"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:198
+#: src/engine/imap-db/search/imap-db-search-query.vala:154
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "ja"
@@ -2225,7 +2286,7 @@ msgstr "ja"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:210
+#: src/engine/imap-db/search/imap-db-search-query.vala:166
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "ja"
@@ -2237,7 +2298,7 @@ msgstr "ja"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:222
+#: src/engine/imap-db/search/imap-db-search-query.vala:178
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "przeczytane"
@@ -2250,7 +2311,7 @@ msgstr "przeczytane"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:233
+#: src/engine/imap-db/search/imap-db-search-query.vala:189
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "wyróżnione"
@@ -2262,7 +2323,7 @@ msgstr "wyróżnione"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:243
+#: src/engine/imap-db/search/imap-db-search-query.vala:199
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "nieprzeczytane"
@@ -2271,7 +2332,7 @@ msgstr "nieprzeczytane"
 #. 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:950
+#: src/engine/imap-engine/imap-engine-generic-account.vala:947
 msgid "Drafts | Draft"
 msgstr "Szkice | Szkic"
 
@@ -2279,13 +2340,13 @@ msgstr "Szkice | Szkic"
 #. 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:959
+#: src/engine/imap-engine/imap-engine-generic-account.vala:956
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Wysłane | Wysłana poczta | Wysłane wiadomości | Skrzynka nadawcza"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:964
+#: src/engine/imap-engine/imap-engine-generic-account.vala:961
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Elementy wysłane"
@@ -2294,7 +2355,7 @@ msgstr "Elementy wysłane"
 #. 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:974
+#: src/engine/imap-engine/imap-engine-generic-account.vala:971
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2304,13 +2365,13 @@ msgstr "Niechciane | Niechciana poczta | Niechciane wiadomości | Spam"
 #. 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:984
+#: src/engine/imap-engine/imap-engine-generic-account.vala:981
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Kosz | Śmietnik | Usunięta poczta | Usunięte wiadomości"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:989
+#: src/engine/imap-engine/imap-engine-generic-account.vala:986
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Elementy usunięte"
@@ -2319,11 +2380,11 @@ msgstr "Elementy usunięte"
 #. 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:999
+#: src/engine/imap-engine/imap-engine-generic-account.vala:996
 msgid "Archive | Archives"
 msgstr "Archiwum | Archiwa"
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Dodaj konto"
 
@@ -2377,11 +2438,11 @@ msgstr "Usuwa to konto z programu Geary"
 msgid "Accounts"
 msgstr "Konta"
 
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
 msgid "To get started, select an email provider below."
 msgstr "Proszę wybrać dostawcę poczty poniżej, aby rozpocząć."
 
-#: ui/accounts_editor_list_pane.ui:76
+#: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
 msgstr "Witamy w programie Geary"
 
@@ -2633,6 +2694,22 @@ msgstr "Usuwa formatowanie zaznaczonego tekstu (Ctrl+Spacja)"
 msgid "Select spell checking languages"
 msgstr "Wybiera język sprawdzania pisowni"
 
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Zaznacza wszystkie załączniki"
+
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Zapisuje zaznaczone załączniki"
+
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Otwiera zaznaczone załączniki"
+
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "Z_apisz wszystko"
+
 #: ui/components-inspector-error-view.ui:33
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
@@ -2649,14 +2726,6 @@ msgstr ""
 msgid "Details:"
 msgstr "Informacje:"
 
-#: ui/components-inspector-log-view.ui:13
-msgid "Inspector opened"
-msgstr "Otwarto inspektora"
-
-#: ui/components-inspector-log-view.ui:65
-msgid "column"
-msgstr "kolumna"
-
 #. Tooltip for inspector button
 #: ui/components-inspector.ui:20
 msgid "Toggle appending new log entries"
@@ -2738,39 +2807,23 @@ msgstr "Oznacza tę wiadomość jako wyróżnioną"
 msgid "Mark this message as not starred"
 msgstr "Usuwa wyróżnienie tej wiadomości"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Wyświetla menu wiadomości"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Otwiera zaznaczone załączniki"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Zapisuje zaznaczone załączniki"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Zaznacza wszystkie załączniki"
-
-#: ui/conversation-email.ui:240
+#: ui/conversation-email.ui:124
 msgid "Edit Draft"
 msgstr "Modyfikuj szkic"
 
-#: ui/conversation-email.ui:267
+#: ui/conversation-email.ui:151
 msgid "Draft message"
 msgstr "Szkic wiadomości"
 
-#: ui/conversation-email.ui:283
+#: ui/conversation-email.ui:167
 msgid "This message has not yet been sent."
 msgstr "Ta wiadomość nie została jeszcze wysłana."
 
-#: ui/conversation-email.ui:329
+#: ui/conversation-email.ui:213
 msgid "Message not saved"
 msgstr "Niezapisana wiadomość"
 
-#: ui/conversation-email.ui:345
+#: ui/conversation-email.ui:229
 msgid "This message was sent, but has not been saved to your account."
 msgstr "Wysłano tę wiadomość, ale nie zapisano jej na koncie."
 
@@ -2811,10 +2864,6 @@ msgstr "_Usuń wiadomość…"
 msgid "_View Source"
 msgstr "_Wyświetl źródło"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "_Zapisz wszystko"
-
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
@@ -2961,15 +3010,15 @@ msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Przekazanie"
 
-#: ui/gtk/help-overlay.ui:45
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
-msgstr "Oznaczenie/usunięcie odznaczenia jako przeczytane"
+msgstr "Oznaczenie/usunięcie oznaczenia jako przeczytane"
 
 #: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
-msgstr "Oznaczenie/usunięcie odznaczenia jako wyróżnione"
+msgstr "Oznaczenie/usunięcie oznaczenia jako wyróżnione"
 
 #: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
 msgctxt "shortcut window"
@@ -3121,11 +3170,6 @@ msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Odpowiedź do nadawcy"
 
-#: ui/gtk/help-overlay.ui:296
-msgctxt "shortcut window"
-msgid "Mark/un-mark read"
-msgstr "Oznaczenie/usunięcie odznaczenia jako przeczytane"
-
 #: ui/gtk/help-overlay.ui:343
 msgid "Composer Shortcuts"
 msgstr "Skróty okna tworzenia wiadomości"
@@ -3246,49 +3290,45 @@ msgstr "Odpowiada wszystkim"
 msgid "Forward"
 msgstr "Przekazuje"
 
-#: ui/main-toolbar.ui:265
+#: ui/main-toolbar.ui:264
 msgid "Toggle find bar"
 msgstr "Przełącza pasek wyszukiwania"
 
-#: ui/main-toolbar.ui:286
+#: ui/main-toolbar.ui:285
 msgid "_Archive"
 msgstr "_Archiwizuj"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Ozna_cz jako niechciana"
+msgid "Toggle as S_pam"
+msgstr "Przełą_cz oznaczenie jako niechciane"
 
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "Ozna_cz jako pożądana"
-
-#: ui/main-toolbar-menus.ui:32
+#: ui/main-toolbar-menus.ui:28
 msgid "Empty _Spam…"
 msgstr "Opróżnij niec_hciane…"
 
-#: ui/main-toolbar-menus.ui:36
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Trash…"
 msgstr "Opróżnij _kosz…"
 
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "Ko_nta"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:46
 msgid "_Keyboard Shortcuts"
 msgstr "_Skróty klawiszowe"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:57
 msgid "_About Geary"
 msgstr "_O programie"
 
 #. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:185
+#: ui/main-window.ui:186
 msgid "Working offline"
 msgstr "Tryb offline"
 
 #. Label and tooltip for offline infobar
-#: ui/main-window.ui:199
+#: ui/main-window.ui:200
 msgid ""
 "Your computer does not appear to be connected to the Internet.\n"
 "You will not be able to send or receive email until it is re-connected."
@@ -3297,29 +3337,29 @@ msgstr ""
 "Nie można wysyłać ani odbierać poczty, dopóki nie zostanie połączony."
 
 #. Label and tooltip for offline infobar
-#: ui/main-window.ui:202
+#: ui/main-window.ui:203
 msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
 "Nie można wysyłać ani odbierać poczty, dopóki komputer nie zostanie "
 "połączony."
 
 #. Button label for retrying TLS cert validation
-#: ui/main-window.ui:249
+#: ui/main-window.ui:250
 msgid "Check"
 msgstr "Sprawdź poprawność"
 
 #. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:253
+#: ui/main-window.ui:254
 msgid "Check the security details for the connection"
 msgstr "Sprawdza poprawność informacji o zabezpieczeniach połączenia"
 
 #. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:282
+#: ui/main-window.ui:283
 msgid "Security problem"
 msgstr "Problem zabezpieczeń"
 
 #. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:296
+#: ui/main-window.ui:297
 msgid ""
 "An account has reported an untrusted server.\n"
 "Please check the server configuration and try again."
@@ -3328,22 +3368,22 @@ msgstr ""
 "Proszę sprawdzić poprawność konfiguracji serwera i spróbować ponownie."
 
 #. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:299
+#: ui/main-window.ui:300
 msgid "An account has reported an untrusted server."
 msgstr "Konto zgłosiło niezaufany serwer."
 
 #. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:350
+#: ui/main-window.ui:351
 msgid "Retry login, you will be prompted for your password"
 msgstr "Ponawia logowanie, zostanie wyświetlona prośba o hasło"
 
 #. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:379
+#: ui/main-window.ui:380
 msgid "Login problem"
 msgstr "Problem z logowaniem"
 
 #. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:393
+#: ui/main-window.ui:394
 msgid ""
 "An account has reported an incorrect login or password.\n"
 "Please check your login name and try again."
@@ -3352,7 +3392,7 @@ msgstr ""
 "Proszę sprawdzić poprawność loginu i spróbować ponownie."
 
 #. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:396
+#: ui/main-window.ui:397
 msgid "An account has reported an incorrect login or password."
 msgstr "Konto zgłosiło niewłaściwy login lub hasło."
 
@@ -3372,46 +3412,30 @@ msgstr "_Zapamiętanie hasła"
 msgid "_Authenticate"
 msgstr "_Uwierzytelnij"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Czytanie"
+#: ui/preferences-dialog.ui:15
+msgid "Preferences"
+msgstr "Preferencje"
 
-#: ui/preferences-dialog.ui:51
+#: ui/preferences-dialog.ui:43
 msgid "_Automatically select next message"
 msgstr "_Automatyczne wybieranie następnej wiadomości"
 
-#: ui/preferences-dialog.ui:70
+#: ui/preferences-dialog.ui:64
 msgid "_Display conversation preview"
 msgstr "P_odgląd wątku"
 
-#: ui/preferences-dialog.ui:89
+#: ui/preferences-dialog.ui:85
 msgid "Use _three pane view"
 msgstr "Widok _trzech paneli"
 
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Powiadomienia"
-
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "_Dźwięki powiadomień"
-
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "_Powiadomienia o nowych wiadomościach"
-
-#: ui/preferences-dialog.ui:164
+#: ui/preferences-dialog.ui:106
 msgid "_Watch for new mail when closed"
 msgstr "_Monitorowanie nowych wiadomości po zamknięciu"
 
-#: ui/preferences-dialog.ui:168
+#: ui/preferences-dialog.ui:110
 msgid "Geary will keep running after all windows are closed"
 msgstr "Program Geary będzie nadal działał po zamknięciu wszystkich okien"
 
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Preferencje"
-
 #: ui/upgrade_dialog.glade:60
 msgid "Geary update in progress…"
 msgstr "Trwa aktualizacja programu Geary…"