[geary: 61/66] Merge branch 'mainline' into remove-old-msgs-beyond-storage-pref

[Michael Gratton <mjog src gnome org>]

commit 71262f0e7905193a9ff901780cc56378fc8da8e6
Merge: a85535996 9f6484ea5
Author: Chris Heywood <15127-creywood users noreply gitlab gnome org>
Date:   Sun May 17 12:03:30 2020 +1000

    Merge branch 'mainline' into remove-old-msgs-beyond-storage-pref

 desktop/org.gnome.Geary.gschema.xml                |    2 +-
 help/LINGUAS                                       |    1 +
 help/uk/uk.po                                      | 1540 ++++++++++++++++++++
 meson.build                                        |    2 +-
 org.gnome.Geary.json                               |    2 +-
 po/es.po                                           |  155 +-
 po/ja.po                                           |  505 ++++---
 po/sk.po                                           |   30 +-
 po/tr.po                                           |  141 +-
 po/uk.po                                           |  126 +-
 src/client/accounts/accounts-manager.vala          |   15 +-
 src/client/components/count-badge.vala             |    4 +-
 src/client/composer/composer-email-entry.vala      |   11 +-
 src/client/composer/composer-widget.vala           |    8 +-
 .../conversation-list/conversation-list-store.vala |    1 -
 .../formatted-conversation-data.vala               |  110 +-
 .../conversation-viewer/conversation-message.vala  |    2 +-
 .../plugin/desktop-notifications/meson.build       |    3 +-
 src/client/plugin/email-templates/meson.build      |    3 +-
 src/client/plugin/folder-highlight/meson.build     |    3 +-
 src/client/plugin/messaging-menu/meson.build       |    3 +-
 src/client/plugin/notification-badge/meson.build   |    3 +-
 src/client/plugin/sent-sound/meson.build           |    3 +-
 src/client/plugin/special-folders/meson.build      |    3 +-
 .../sidebar/sidebar-count-cell-renderer.vala       |    2 +-
 src/engine/api/geary-composed-email.vala           |   11 +-
 src/engine/api/geary-email.vala                    |    8 +-
 src/engine/imap-db/imap-db-attachment.vala         |    2 +-
 src/engine/imap-db/imap-db-message-row.vala        |   40 +-
 src/engine/imap/api/imap-email-properties.vala     |    8 +-
 src/engine/imap/api/imap-folder-session.vala       |   10 +-
 src/engine/imap/message/imap-message-data.vala     |   12 +-
 .../imap/response/imap-fetch-data-decoder.vala     |    4 +-
 src/engine/mime/mime-content-parameters.vala       |   14 +-
 src/engine/mime/mime-content-type.vala             |   12 +-
 src/engine/outbox/outbox-folder.vala               |    2 +-
 src/engine/rfc822/rfc822-error.vala                |    6 +-
 src/engine/rfc822/rfc822-mailbox-address.vala      |   51 +-
 src/engine/rfc822/rfc822-mailbox-addresses.vala    |   63 +-
 src/engine/rfc822/rfc822-message-data.vala         |  290 ++--
 src/engine/rfc822/rfc822-message.vala              |  332 +++--
 src/engine/rfc822/rfc822-part.vala                 |   16 +-
 src/engine/rfc822/rfc822-utils.vala                |  497 +++----
 src/engine/rfc822/rfc822.vala                      |   94 +-
 src/engine/smtp/smtp-client-connection.vala        |   49 +-
 src/engine/smtp/smtp-client-session.vala           |    6 +-
 test/engine/api/geary-attachment-test.vala         |    2 +-
 test/engine/app/app-conversation-monitor-test.vala |    2 +-
 test/engine/app/app-conversation-set-test.vala     |    2 +-
 test/engine/app/app-conversation-test.vala         |    2 +-
 test/engine/{ => mime}/mime-content-type-test.vala |   21 +
 .../{ => rfc822}/rfc822-mailbox-address-test.vala  |   16 +-
 .../rfc822-mailbox-addresses-test.vala             |    8 +-
 .../{ => rfc822}/rfc822-message-data-test.vala     |   12 +-
 test/engine/{ => rfc822}/rfc822-message-test.vala  |  113 +-
 test/engine/{ => rfc822}/rfc822-part-test.vala     |   10 +-
 test/engine/{ => rfc822}/rfc822-utils-test.vala    |    2 +-
 test/integration/smtp/client-session.vala          |    3 +-
 test/meson.build                                   |   14 +-
 test/test-engine.vala                              |    4 +-
 test/test-server.vala                              |    4 +
 ui/gtk/help-overlay.ui                             |   26 +-
 62 files changed, 3127 insertions(+), 1319 deletions(-)
---