[geary] Update Hebrew translation



commit 3b7458198c0231da4a3685a1bb93d46b59105c23
Author: Yosef Or Boczko <yoseforb gnome org>
Date:   Sun Mar 28 23:24:57 2021 +0000

    Update Hebrew translation

 po/he.po | 2087 +++++++++++++++++++++++++++++---------------------------------
 1 file changed, 960 insertions(+), 1127 deletions(-)
---
diff --git a/po/he.po b/po/he.po
index 831b0707a..88c33ecb0 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,14 +10,14 @@
 # Yaron Shahrabani <sh yaron gmail com>, 2012-2013
 # yoseforb <yoseforb gmail com>, 2013
 # yoseforb <yoseforb gmail com>, 2013
-# Yosef Or Boczko <yoseforb gmail com>, 2013-2020.
+# Yosef Or Boczko <yoseforb gmail com>, 2013-2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2020-09-19 08:49+0000\n"
-"PO-Revision-Date: 2020-09-29 17:04+0300\n"
+"POT-Creation-Date: 2021-03-03 11:14+0000\n"
+"PO-Revision-Date: 2021-03-29 02:24+0300\n"
 "Last-Translator: Yosef Or Boczko <yoseforb gmail com>\n"
 "Language-Team: Hebrew <yoseforb gmail com>\n"
 "Language: he\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2\n"
-"X-Generator: Gtranslator 3.36.0\n"
+"X-Generator: Gtranslator 3.38.0\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
@@ -39,14 +39,13 @@ msgstr "שליחת קבצים באמצעות 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:560
-#: src/client/application/application-main-window.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
+#: src/client/application/application-main-window.vala:643
 msgid "Geary"
 msgstr "Geary"
 
 #: desktop/geary-autostart.desktop.in.in:4
 #: desktop/org.gnome.Geary.desktop.in.in:4
-#| msgid "Gmail"
 msgid "Email"
 msgstr "דוא״ל"
 
@@ -104,7 +103,6 @@ msgid "Full-featured HTML and plain text message composer"
 msgstr "תמיכה מלאה ב־HTML וביצירת הודעות בטקסט פשוט"
 
 #: desktop/org.gnome.Geary.appdata.xml.in.in:32
-#| msgid "Show _notifications for new mail"
 msgid "Desktop notification of new mail"
 msgstr "הצגת התרעות על קבלת דואר חדש"
 
@@ -114,7 +112,6 @@ msgstr "תואם עם Gmail, Yahoo! Mail, Outlook.com ושרתי IMAP אחרים
 
 #. Translators: A screenshot description.
 #: desktop/org.gnome.Geary.appdata.xml.in.in:47
-#| msgid "_Display conversation preview"
 msgid "Geary displaying a conversation"
 msgstr "‏Geary מציג תכתובת"
 
@@ -162,78 +159,34 @@ msgid "The last recorded height of the application window."
 msgstr "The last recorded height of the application window."
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Position of folder list pane"
-msgstr "Position of folder list pane"
-
-#: desktop/org.gnome.Geary.gschema.xml:27
-msgid "Position of the folder list Paned grabber."
-msgstr "Position of the folder list Paned grabber."
-
-#: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Position of folder list pane when horizontal"
-msgstr "Position of folder list pane when horizontal"
-
-#: desktop/org.gnome.Geary.gschema.xml:33
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
-"Position of the folder list Paned grabber in the horizontal orientation."
-
-#: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane when vertical"
-msgstr "Position of folder list pane when vertical"
-
-#: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr "Position of the folder list Paned grabber in the vertical orientation."
-
-#: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Orientation of the folder list pane"
-msgstr "Orientation of the folder list pane"
-
-#: desktop/org.gnome.Geary.gschema.xml:45
-msgid "True if the folder list Paned is in the horizontal orientation."
-msgstr "True if the folder list Paned is in the horizontal orientation."
-
-#: desktop/org.gnome.Geary.gschema.xml:50
 msgid "Show/hide formatting toolbar"
 msgstr "Show/hide formatting toolbar"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:27
 msgid "True if the formatting toolbar in the composer is shown."
 msgstr "True if the formatting toolbar in the composer is shown."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Position of message list pane"
-msgstr "Position of message list pane"
-
-#: desktop/org.gnome.Geary.gschema.xml:57
-msgid "Position of the message list Paned grabber."
-msgstr "Position of the message list Paned grabber."
-
-#: desktop/org.gnome.Geary.gschema.xml:62
-#| msgid "_Automatically select next message"
+#: desktop/org.gnome.Geary.gschema.xml:32
 msgid "Autoselect next message"
 msgstr "Autoselect next message"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:33
 msgid "True if we should autoselect the next available conversation."
 msgstr "True if we should autoselect the next available conversation."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
-#| msgid "_Display conversation preview"
+#: desktop/org.gnome.Geary.gschema.xml:38
 msgid "Display message previews"
 msgstr "Display message previews"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:39
 msgid "True if we should display a short preview of each message."
 msgstr "True if we should display a short preview of each message."
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Use single key shortcuts"
 msgstr "Use single key shortcuts"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:45
 msgid ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
@@ -241,11 +194,11 @@ msgstr ""
 "Enables shortcuts for email actions that do not require pressing <Ctrl> to "
 "emulate those used by Gmail."
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:52
 msgid "Languages that shall be used in the spell checker"
 msgstr "Languages that shall be used in the spell checker"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:53
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
@@ -253,11 +206,11 @@ msgstr ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
 
-#: desktop/org.gnome.Geary.gschema.xml:90
+#: desktop/org.gnome.Geary.gschema.xml:60
 msgid "Languages that are displayed in the spell checker popover"
 msgstr "Languages that are displayed in the spell checker popover"
 
-#: desktop/org.gnome.Geary.gschema.xml:91
+#: desktop/org.gnome.Geary.gschema.xml:61
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
@@ -265,67 +218,61 @@ msgstr ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 
-#: desktop/org.gnome.Geary.gschema.xml:96
-#| msgid "Notify of new mail at start_up"
+#: desktop/org.gnome.Geary.gschema.xml:66
 msgid "Notify of new mail at startup"
 msgstr "Notify of new mail at startup"
 
-#: desktop/org.gnome.Geary.gschema.xml:97
-#| msgid "Notify of new mail at start_up"
+#: desktop/org.gnome.Geary.gschema.xml:67
 msgid "True to notify of new mail at startup."
 msgstr "True to notify of new mail at startup."
 
-#: desktop/org.gnome.Geary.gschema.xml:102
+#: desktop/org.gnome.Geary.gschema.xml:72
 msgid "Ask when opening an attachment"
 msgstr "Ask when opening an attachment"
 
-#: desktop/org.gnome.Geary.gschema.xml:103
-#| msgid "To add them as attachments"
+#: desktop/org.gnome.Geary.gschema.xml:73
 msgid "True to ask when opening an attachment."
 msgstr "True to ask when opening an attachment."
 
-#: desktop/org.gnome.Geary.gschema.xml:108
+#: desktop/org.gnome.Geary.gschema.xml:78
 msgid "Whether to compose emails in HTML"
 msgstr "Whether to compose emails in HTML"
 
-#: desktop/org.gnome.Geary.gschema.xml:109
+#: desktop/org.gnome.Geary.gschema.xml:79
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "True to compose emails in HTML; false for plain text."
 
-#: desktop/org.gnome.Geary.gschema.xml:114
+#: desktop/org.gnome.Geary.gschema.xml:84
 msgid "Advisory strategy for full-text searching"
 msgstr "Advisory strategy for full-text searching"
 
-#: desktop/org.gnome.Geary.gschema.xml:115
+#: desktop/org.gnome.Geary.gschema.xml:85
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 
-#: desktop/org.gnome.Geary.gschema.xml:120
-#| msgid "No conversations in folder."
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Zoom of conversation viewer"
 msgstr "Zoom of conversation viewer"
 
-#: desktop/org.gnome.Geary.gschema.xml:121
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid "The zoom to apply on the conservation view."
 msgstr "The zoom to apply on the conservation view."
 
-#: desktop/org.gnome.Geary.gschema.xml:126
-#| msgid "Use %s to open a new composer window"
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Size of detached composer window"
 msgstr "Size of detached composer window"
 
-#: desktop/org.gnome.Geary.gschema.xml:127
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "The last recorded size of the detached composer window."
 msgstr "The last recorded size of the detached composer window."
 
-#: desktop/org.gnome.Geary.gschema.xml:132
-#| msgid "Error sending email"
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Undo sending email delay"
 msgstr "Undo sending email delay"
 
-#: desktop/org.gnome.Geary.gschema.xml:133
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
@@ -333,11 +280,11 @@ msgstr ""
 "The number of seconds to wait before sending an email. Set to zero or less "
 "to disable."
 
-#: desktop/org.gnome.Geary.gschema.xml:139
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "Brief notification display time"
 msgstr "Brief notification display time"
 
-#: desktop/org.gnome.Geary.gschema.xml:140
+#: desktop/org.gnome.Geary.gschema.xml:110
 msgid ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
@@ -345,19 +292,19 @@ msgstr ""
 "The length of time in seconds for which brief notifications should be "
 "displayed."
 
-#: desktop/org.gnome.Geary.gschema.xml:146
+#: desktop/org.gnome.Geary.gschema.xml:116
 msgid "List of optional plugins"
 msgstr "List of optional plugins"
 
-#: desktop/org.gnome.Geary.gschema.xml:147
+#: desktop/org.gnome.Geary.gschema.xml:117
 msgid "Plugins listed here will be loaded on startup."
 msgstr "Plugins listed here will be loaded on startup."
 
-#: desktop/org.gnome.Geary.gschema.xml:152
+#: desktop/org.gnome.Geary.gschema.xml:122
 msgid "Whether we migrated the old settings"
 msgstr "Whether we migrated the old settings"
 
-#: desktop/org.gnome.Geary.gschema.xml:153
+#: desktop/org.gnome.Geary.gschema.xml:123
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -366,25 +313,25 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:210
+#: src/client/accounts/accounts-editor.vala:208
 msgid "Failed to store certificate"
 msgstr "ארע כשל באחסון אישור"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:108
+#: src/client/accounts/accounts-editor-add-pane.vala:98
 msgid "All others"
 msgstr "כל השאר"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:195
-#: src/client/accounts/accounts-editor-servers-pane.vala:321
+#: src/client/accounts/accounts-editor-add-pane.vala:185
+#: src/client/accounts/accounts-editor-servers-pane.vala:313
 msgid "Check your receiving login and password"
 msgstr "בדיקת קבלת ההתחברות והססמה שלך"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:210
-#: src/client/accounts/accounts-editor-servers-pane.vala:334
+#: src/client/accounts/accounts-editor-add-pane.vala:200
+#: src/client/accounts/accounts-editor-servers-pane.vala:326
 msgid "Check your receiving server details"
 msgstr "בדיקת קבלת פרטי השרת שלך"
 
@@ -393,52 +340,51 @@ msgstr "בדיקת קבלת פרטי השרת שלך"
 #. succeeded, so the user probably needs to
 #. 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:355
+#: src/client/accounts/accounts-editor-add-pane.vala:222
+#: src/client/accounts/accounts-editor-servers-pane.vala:347
 msgid "Check your sending login and password"
 msgstr "בדיקת שליחת ההתחברות והססמה שלך"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:246
-#: src/client/accounts/accounts-editor-servers-pane.vala:368
+#: src/client/accounts/accounts-editor-add-pane.vala:236
+#: src/client/accounts/accounts-editor-servers-pane.vala:360
 msgid "Check your sending server details"
 msgstr "בדיקת שליחת פרטי השרת שלך"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:261
+#: src/client/accounts/accounts-editor-add-pane.vala:251
 msgid "Check your email address and password"
 msgstr "בדיקת כתובת הדוא״ל והססמה שלך"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:272
+#: src/client/accounts/accounts-editor-add-pane.vala:262
 msgid "Could not connect, check your network"
 msgstr "לא ניתן להתחבר, יש לבדוק את הרשת שלך"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:285
+#: src/client/accounts/accounts-editor-add-pane.vala:275
 msgid "An unexpected problem occurred"
 msgstr "התרחשה בעיה בלתי צפויה"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:303
+#: src/client/accounts/accounts-editor-add-pane.vala:293
 #, c-format
 msgid "Account not created: %s"
 msgstr "לא נוצר חשבון: ‏%s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:558
+#: src/client/accounts/accounts-editor-add-pane.vala:573
 msgid "Your name"
 msgstr "השם שלך"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:575
-#: src/client/accounts/accounts-editor-edit-pane.vala:513
-#| msgid "Email address:"
+#: src/client/accounts/accounts-editor-add-pane.vala:590
+#: src/client/accounts/accounts-editor-edit-pane.vala:527
 msgid "Email address"
 msgstr "כתובת דוא״ל"
 
@@ -447,8 +393,8 @@ msgstr "כתובת דוא״ל"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:579
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-add-pane.vala:594
+#: src/client/accounts/accounts-editor-edit-pane.vala:493
 msgid "person example com"
 msgstr "person example com"
 
@@ -456,16 +402,16 @@ msgstr "person example com"
 #. when adding an account
 #. 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:889
+#: src/client/accounts/accounts-editor-add-pane.vala:608
+#: src/client/accounts/accounts-editor-servers-pane.vala:881
 msgid "Login name"
 msgstr "שם התחברות"
 
 #. 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:1011
-#: ui/password-dialog.glade:108
+#: src/client/accounts/accounts-editor-add-pane.vala:622
+#: src/client/accounts/accounts-editor-servers-pane.vala:1003
+#: ui/password-dialog.glade:98
 msgid "Password"
 msgstr "ססמה"
 
@@ -473,15 +419,14 @@ msgstr "ססמה"
 #. adding an account.
 #. 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:733
-#| msgid "IMAP username"
+#: src/client/accounts/accounts-editor-add-pane.vala:644
+#: src/client/accounts/accounts-editor-servers-pane.vala:725
 msgid "IMAP server"
 msgstr "שרת IMAP"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:632
+#: src/client/accounts/accounts-editor-add-pane.vala:647
 msgid "imap.example.com"
 msgstr "imap.example.com"
 
@@ -489,23 +434,50 @@ msgstr "imap.example.com"
 #. adding an account.
 #. 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:739
-#| msgid "SMTP username"
+#: src/client/accounts/accounts-editor-add-pane.vala:653
+#: src/client/accounts/accounts-editor-servers-pane.vala:731
 msgid "SMTP server"
 msgstr "שרת SMTP"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:641
+#: src/client/accounts/accounts-editor-add-pane.vala:656
 msgid "smtp.example.com"
 msgstr "smtp.example.com"
 
+#. This is the remove account button in the account settings.
+#: src/client/accounts/accounts-editor-edit-pane.vala:211
+#: ui/accounts_editor_edit_pane.ui:239
+msgid "Remove Account"
+msgstr "הסרת חשבון"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:219
+#, c-format
+#| msgid "Remove Account"
+msgid "Remove Account: %s"
+msgstr "הסרת חשבון: %s"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:221
+#| msgid ""
+#| "Removing an account will remove it from Geary and delete locally cached "
+#| "email data from your computer, but not from your service provider."
+msgid ""
+"This will remove it from Geary and delete locally cached email data from "
+"your computer. Nothing will be deleted from your service provider."
+msgstr ""
+"הסרת החשבון תסיר אותו מ־Geary ותמחק את קובצי נתוני הדוא״ל המקומיים מהמחשב "
+"שלך. דבר לא ימחק מספק השרת שלך."
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:223
+#: src/client/components/stock.vala:19
+#: src/client/plugin/mail-merge/mail-merge.vala:392
+#: ui/password-dialog.glade:182
+msgid "_Cancel"
+msgstr "_ביטול"
+
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:277
-#: ui/accounts_editor_remove_pane.ui:123
-#| msgid "Accounts"
+#: src/client/accounts/accounts-editor-edit-pane.vala:289
 msgid "Account name"
 msgstr "שם החשבון"
 
@@ -513,49 +485,46 @@ msgstr "שם החשבון"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:318
+#: src/client/accounts/accounts-editor-edit-pane.vala:330
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "שינוי שם החשבון חזרה ל־„%s”"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:342
-#| msgid "Remove email address"
+#: src/client/accounts/accounts-editor-edit-pane.vala:354
 msgid "Add a new sender email address"
 msgstr "הוספת כתובת שולח חדשה"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:423
+#: src/client/accounts/accounts-editor-edit-pane.vala:437
 msgid "Name not set"
 msgstr "לא הוגדר שם"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:464
+#: src/client/accounts/accounts-editor-edit-pane.vala:478
 msgid "Sender Name"
 msgstr "שם שולח"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:491
-#| msgid "_Remove"
+#: src/client/accounts/accounts-editor-edit-pane.vala:505
 msgid "Remove"
 msgstr "הסרה"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:506
-#| msgid "Username"
+#: src/client/accounts/accounts-editor-edit-pane.vala:520
 msgid "Sender name"
 msgstr "שם שולח"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:573
+#: src/client/accounts/accounts-editor-edit-pane.vala:587
 #, c-format
 msgid "Remove “%s”"
 msgstr "הסרת „%s”"
@@ -563,7 +532,7 @@ msgstr "הסרת „%s”"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:613
+#: src/client/accounts/accounts-editor-edit-pane.vala:627
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "ביטול השינויים עבור „%s”"
@@ -571,7 +540,7 @@ msgstr "ביטול השינויים עבור „%s”"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:700
+#: src/client/accounts/accounts-editor-edit-pane.vala:714
 #, c-format
 msgid "Add “%s” back"
 msgstr "הוספת „%s” חזרה"
@@ -579,15 +548,14 @@ msgstr "הוספת „%s” חזרה"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:742
+#: src/client/accounts/accounts-editor-edit-pane.vala:756
 msgid "Undo signature changes"
 msgstr "ביטול שינוי חתימה"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:790
-#| msgid "_Download mail"
+#: src/client/accounts/accounts-editor-edit-pane.vala:804
 msgid "Download mail"
 msgstr "הורדת דואר"
 
@@ -596,104 +564,100 @@ msgstr "הורדת דואר"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:822
+#: src/client/accounts/accounts-editor-edit-pane.vala:836
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "שינוי תקופת הורדה ל: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:857
 msgid "Everything"
 msgstr "מאז ומעולם"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:861
 msgid "2 weeks back"
 msgstr "שבועיים אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:865
 msgid "1 month back"
 msgstr "חודש אחד אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:869
 msgid "3 months back"
 msgstr "שלושה חודשים אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:873
 msgid "6 months back"
 msgstr "שישה חודשים אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:863
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 msgid "1 year back"
 msgstr "שנה אחת אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:867
+#: src/client/accounts/accounts-editor-edit-pane.vala:881
 msgid "2 years back"
 msgstr "שנתיים אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:871
+#: src/client/accounts/accounts-editor-edit-pane.vala:885
 msgid "4 years back"
 msgstr "ארבע שנים אחורנית"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#: src/client/accounts/accounts-editor-edit-pane.vala:891
 #, c-format
-#| msgid "1 year back"
 msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "יום אחד אחורה"
 msgstr[1] "‏%d ימים אחורה"
 msgstr[2] "יומיים אחורה"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:255
-#: src/client/application/application-main-window.vala:2061
-#| msgid "_Undo"
+#: src/client/accounts/accounts-editor-list-pane.vala:246
+#: src/client/application/application-main-window.vala:2150
 msgid "Undo"
 msgstr "ביטול"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:264
-#: src/client/application/application-main-window.vala:2044
-#| msgid "_Redo"
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2133
 msgid "Redo"
 msgstr "ביצוע חוזר"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:358
-#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:445
 #: 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:458
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:449
 #: 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:462
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:453
 #: src/client/accounts/accounts-editor-row.vala:287
-#| msgid "Yahoo! Mail"
 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:388
+#: src/client/accounts/accounts-editor-list-pane.vala:379
 msgid "This account has been disabled"
 msgstr "החשבון הושבת"
 
 #. 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:397
+#: src/client/accounts/accounts-editor-list-pane.vala:388
 msgid "This account has encountered a problem and is unavailable"
 msgstr "חשבון זה נתקל בבעיה ולכן אינו זימן"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:466
+#: src/client/accounts/accounts-editor-list-pane.vala:457
 msgid "Other email providers"
 msgstr "ספקי דוא״ל אחרים"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:572
+#: src/client/accounts/accounts-editor-list-pane.vala:563
 #, c-format
 msgid "Account “%s” removed"
 msgstr "חשבון „%s” הוסר"
@@ -701,7 +665,7 @@ msgstr "חשבון „%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:579
+#: src/client/accounts/accounts-editor-list-pane.vala:570
 #, c-format
 msgid "Account “%s” restored"
 msgstr "חשבון „%s” שוחזר"
@@ -728,18 +692,16 @@ msgstr "אבטחת החיבור"
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
 #: 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
+#: src/client/accounts/accounts-editor-servers-pane.vala:752
+#: src/client/accounts/accounts-editor-servers-pane.vala:967
 msgid "None"
 msgstr "כלום"
 
 #: src/client/accounts/accounts-editor-row.vala:491
-#| msgid "_Star"
 msgid "StartTLS"
 msgstr "StartTLS"
 
 #: src/client/accounts/accounts-editor-row.vala:498
-#| msgid "SSL/TLS"
 msgid "TLS"
 msgstr "TLS"
 
@@ -748,7 +710,7 @@ msgstr "TLS"
 #. account
 #. Translators: An info bar button label
 #: src/client/accounts/accounts-editor-row.vala:539
-#: src/client/application/application-main-window.vala:554
+#: src/client/application/application-main-window.vala:589
 msgid "Login"
 msgstr "התחברות"
 
@@ -775,7 +737,7 @@ msgstr "שימוש בהתחברות שונה"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-servers-pane.vala:382
+#: src/client/accounts/accounts-editor-servers-pane.vala:374
 #, c-format
 msgid "Account not updated: %s"
 msgstr "חשבון לא מעודכן: %s"
@@ -783,26 +745,23 @@ msgstr "חשבון לא מעודכן: %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:545
-#| msgid "Accounts"
+#: src/client/accounts/accounts-editor-servers-pane.vala:537
 msgid "Account source"
 msgstr "מקור החשבון"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:557
+#: src/client/accounts/accounts-editor-servers-pane.vala:549
 msgid "GNOME Online Accounts"
 msgstr "חשבונות מקוונים GNOME"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:616
-#| msgid "Save dra_fts on server"
+#: src/client/accounts/accounts-editor-servers-pane.vala:608
 msgid "Save draft email on server"
 msgstr "שמירת טיוטה על השרת"
 
 #. Translators: This label describes an account
 #. preference.
-#: src/client/accounts/accounts-editor-servers-pane.vala:671
-#| msgid "_Save sent mail"
+#: src/client/accounts/accounts-editor-servers-pane.vala:663
 msgid "Save sent email on server"
 msgstr "שמירת דואר יוצא על השרת"
 
@@ -811,12 +770,12 @@ msgstr "שמירת דואר יוצא על השרת"
 #. 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:961
+#: src/client/accounts/accounts-editor-servers-pane.vala:953
 #, c-format
 msgid "%s using OAuth2"
 msgstr "‏%s משתמש ב־OAuth2"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:971
+#: src/client/accounts/accounts-editor-servers-pane.vala:963
 msgid "Use receiving server login"
 msgstr "שימוש בשרת ההתחברות המתקבל"
 
@@ -831,7 +790,6 @@ msgstr "ללא כותרת"
 #. / name.
 #: src/client/application/application-attachment-manager.vala:222
 #, c-format
-#| msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "כבר קיים קובץ בשם „%s“. האם להחליפו?"
 
@@ -840,9 +798,6 @@ msgstr "כבר קיים קובץ בשם „%s“. האם להחליפו?"
 #. / 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."
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "הקובץ כבר קיים תחת „%s“. החלפתו תגרום לאיבוד תוכנו."
@@ -852,149 +807,146 @@ msgid "_Replace"
 msgstr "ה_חלפה"
 
 #: src/client/application/application-client.vala:34
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "כל הזכויות שמורות למוסד לחופש התכנה בע״מ. 2016"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright © 2016 Software Freedom Conservancy Inc."
+msgstr "כל הזכויות שמורות © למוסד לחופש התכנה בע״מ. 2016"
 
 #: src/client/application/application-client.vala:35
-msgid "Copyright 2016-2020 Geary Development Team."
-msgstr "כל הזכויות שמורות 2016-2020 צוות פיתוח Geary."
+#| msgid "Copyright 2016-2020 Geary Development Team."
+msgid "Copyright © 2016-2021 Geary Development Team."
+msgstr "כל הזכויות שמורות © 2016-2021 צוות פיתוח Geary."
 
 #: src/client/application/application-client.vala:37
 msgid "Visit the Geary web site"
 msgstr "ביקור באתר Geary"
 
 #. / Command line option
-#: src/client/application/application-client.vala:97
+#: src/client/application/application-client.vala:102
 msgid "Print debug logging"
 msgstr "Print debug logging"
 
 #. / Command line option
-#: src/client/application/application-client.vala:100
-#| msgid "Start Geary with hidden main window"
+#: src/client/application/application-client.vala:105
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Start with the main window hidden (deprecated)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:103
+#: src/client/application/application-client.vala:108
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Enable WebKitGTK Inspector in web views"
 
 #. / Command line option
-#: src/client/application/application-client.vala:106
+#: src/client/application/application-client.vala:111
 msgid "Log conversation monitoring"
 msgstr "Log conversation monitoring"
 
 #. / Command line option
-#: src/client/application/application-client.vala:109
-#| msgid "Log network deserialization"
+#: src/client/application/application-client.vala:114
 msgid "Log IMAP network deserialization"
 msgstr "Log IMAP network deserialization"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/application-client.vala:113
+#: src/client/application/application-client.vala:118
 msgid "Log folder normalization"
 msgstr "ביצוע רישום של folder normalization"
 
 #. / Command line option
-#: src/client/application/application-client.vala:116
-#| msgid "Log network activity"
+#: src/client/application/application-client.vala:121
 msgid "Log IMAP network activity"
 msgstr "Log IMAP network activity"
 
 #. / 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:121
+#: src/client/application/application-client.vala:126
 msgid "Log IMAP replay queue"
 msgstr "Log IMAP replay queue"
 
 #. / Command line option
-#: src/client/application/application-client.vala:124
-#| msgid "Log network activity"
+#: src/client/application/application-client.vala:129
 msgid "Log SMTP network activity"
 msgstr "Log SMTP network activity"
 
 #. / Command line option
-#: src/client/application/application-client.vala:127
+#: src/client/application/application-client.vala:132
 msgid "Log database queries (generates lots of messages)"
 msgstr "Log database queries (generates lots of messages)"
 
 #. / Command line option
-#: src/client/application/application-client.vala:130
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
 msgstr "Perform a graceful quit"
 
-#: src/client/application/application-client.vala:132
-#| msgid "Use %s to open a new composer window"
+#: src/client/application/application-client.vala:137
 msgid "Open a new window"
 msgstr "פתיחת חלון חדש"
 
 #. / Command line option
-#: src/client/application/application-client.vala:135
-#| msgid "Revoke all server certificates with TLS warnings"
+#: src/client/application/application-client.vala:140
 msgid "Revoke all pinned TLS server certificates"
 msgstr "Revoke all pinned TLS server certificates"
 
 #. / Command line option
-#: src/client/application/application-client.vala:138
+#: src/client/application/application-client.vala:143
 msgid "Display program version"
 msgstr "Display program version"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:262
-#| msgid "Mark conversation"
+#: src/client/application/application-client.vala:275
 msgid "Geary version"
 msgstr "גרסת Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:264
+#: src/client/application/application-client.vala:277
 msgid "Geary revision"
 msgstr "עדכון Geary"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:266
+#: src/client/application/application-client.vala:279
 msgid "GTK version"
 msgstr "גרסת GTK"
 
 #. / Applciation runtime information label
-#: src/client/application/application-client.vala:273
+#: src/client/application/application-client.vala:286
 msgid "GLib version"
 msgstr "גרסת GLib"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:280
+#: src/client/application/application-client.vala:293
 msgid "WebKitGTK version"
 msgstr "גרסת WebKitGTK"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:287
+#: src/client/application/application-client.vala:300
 msgid "Desktop environment"
 msgstr "סביבת שולחן עבודה"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/application-client.vala:289
-#: src/client/components/components-attachment-pane.vala:91
+#: src/client/application/application-client.vala:302
+#: src/client/application/application-client.vala:308
+#: src/client/application/application-client.vala:314
+#: src/client/components/components-attachment-pane.vala:88
 msgid "Unknown"
 msgstr "לא ידוע"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:293
+#: src/client/application/application-client.vala:306
 msgid "Distribution name"
 msgstr "שם הפצה"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:298
+#: src/client/application/application-client.vala:312
 msgid "Distribution release"
 msgstr "גרסת הפצה"
 
 #. / Application runtime information label
-#: src/client/application/application-client.vala:303
+#: src/client/application/application-client.vala:318
 msgid "Installation prefix"
 msgstr "תחילית התקנה"
 
-#: src/client/application/application-client.vala:559
+#: src/client/application/application-client.vala:587
 #, c-format
 msgid "About %s"
 msgstr "על אודות %s"
@@ -1002,7 +954,7 @@ msgstr "על אודות %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:563
+#: src/client/application/application-client.vala:591
 msgid "translator-credits"
 msgstr ""
 "דוביקס <dovix2003 gmail com>\n"
@@ -1011,32 +963,30 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/application-client.vala:1045
+#: src/client/application/application-client.vala:1110
 msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr "The `--hidden` option is deprecated and will be removed in the future."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/application-client.vala:1078
+#: src/client/application/application-client.vala:1143
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Unrecognised program argument: “%s”"
 
 #. / Notification title.
-#: src/client/application/application-controller.vala:479
+#: src/client/application/application-controller.vala:500
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "ארעה בעיה בשליחת דואר עבור %s"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:483
+#: src/client/application/application-controller.vala:504
 msgid "Email will not be sent until re-connected"
 msgstr "לא ישלח כל דוא״ל עד שתתבצע התחברות מחודשת"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:582
-#| msgid "%u conversation selected"
-#| msgid_plural "%u conversations selected"
+#: src/client/application/application-controller.vala:603
 msgid "Conversation marked"
 msgid_plural "Conversations marked"
 msgstr[0] "תכתובת סומנה"
@@ -1044,8 +994,7 @@ msgstr[1] "תכתובות סומנו"
 msgstr[2] "תכתובות סומנו"
 
 #. / Translators: Label for in-app notification
-#: src/client/application/application-controller.vala:588
-#| msgid "%s - Conversation Inspector"
+#: src/client/application/application-controller.vala:609
 msgid "Conversation un-marked"
 msgid_plural "Conversations un-marked"
 msgstr[0] "בוטל סימון תכתובת"
@@ -1055,10 +1004,9 @@ msgstr[2] "בוטלו סימון תכתובות"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:614
-#: src/client/application/application-controller.vala:698
+#: src/client/application/application-controller.vala:635
+#: src/client/application/application-controller.vala:719
 #, c-format
-#| msgid "Log conversation monitoring"
 msgid "Conversation moved to %s"
 msgid_plural "Conversations moved to %s"
 msgstr[0] "תכתובת הועברה אל %s"
@@ -1070,10 +1018,9 @@ msgstr[2] "תכתובות הועברו אל %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:622
-#: src/client/application/application-controller.vala:644
+#: src/client/application/application-controller.vala:643
+#: src/client/application/application-controller.vala:665
 #, c-format
-#| msgid "%s - Conversation Inspector"
 msgid "Conversation restored to %s"
 msgid_plural "Conversations restored to %s"
 msgstr[0] "תכתובת שוחזרה אל %s"
@@ -1081,9 +1028,7 @@ msgstr[1] "תכתובות שוחזרו אל %s"
 msgstr[2] "תכתובות שוחזרו אל %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:665
-#| msgid "%u conversation selected"
-#| msgid_plural "%u conversations selected"
+#: src/client/application/application-controller.vala:686
 msgid "Conversation archived"
 msgid_plural "Conversations archived"
 msgstr[0] "תכתובת אורכבה"
@@ -1092,7 +1037,7 @@ msgstr[2] "תכתובות אורכבו"
 
 #. / Translators: Label for in-app notification. String
 #. / substitution is the name of the destination folder.
-#: src/client/application/application-controller.vala:721
+#: src/client/application/application-controller.vala:742
 #, c-format
 msgid "Message restored to %s"
 msgid_plural "Messages restored to %s"
@@ -1101,7 +1046,7 @@ msgstr[1] "הודעות שוחזרו אל %s"
 msgstr[2] "הודעות שוחזרו אל %s"
 
 #. / Translators: Label for in-app notification.
-#: src/client/application/application-controller.vala:742
+#: src/client/application/application-controller.vala:763
 msgid "Message archived"
 msgid_plural "Messages archived"
 msgstr[0] "הודעה אורכבה אל %s"
@@ -1111,7 +1056,7 @@ msgstr[2] "הודעות אורכבו אל %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:777
+#: src/client/application/application-controller.vala:798
 #, c-format
 msgid "Message moved to %s"
 msgid_plural "Messages moved to %s"
@@ -1122,10 +1067,8 @@ msgstr[2] "הודעות הועברו אל %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:805
+#: src/client/application/application-controller.vala:826
 #, c-format
-#| msgid "%u conversation selected"
-#| msgid_plural "%u conversations selected"
 msgid "Conversation labelled as %s"
 msgid_plural "Conversations labelled as %s"
 msgstr[0] "תכתובת סומנה בתווית %s"
@@ -1135,7 +1078,7 @@ msgstr[2] "תכתובות סומנו בתווית %s"
 #. / Translators: Label for in-app
 #. / notification. String substitution is the name
 #. / of the destination folder.
-#: src/client/application/application-controller.vala:813
+#: src/client/application/application-controller.vala:834
 #, c-format
 msgid "Conversation un-labelled as %s"
 msgid_plural "Conversations un-labelled as %s"
@@ -1143,12 +1086,12 @@ msgstr[0] "בוטל סימון תכתובת בתווית %s"
 msgstr[1] "בוטל סימון תכתובות בתווית %s"
 msgstr[2] "בוטל סימון תכתובות בתווית %s"
 
-#: src/client/application/application-controller.vala:1320
+#: src/client/application/application-controller.vala:1341
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "לא ניתן לפתוח את מסד הנתונים עבור %s"
 
-#: src/client/application/application-controller.vala:1321
+#: src/client/application/application-controller.vala:1342
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -1171,21 +1114,20 @@ msgstr ""
 "יצירה מחדש של מסד הנתונים תמחק את כל הדוא״ל המקומי ואת כל הקבצים המצורפים "
 "שלו. <b> הדואר על השרת שלך לא יושפע.</b>"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1344
 msgid "_Rebuild"
 msgstr "_יצירה מחדש"
 
-#: src/client/application/application-controller.vala:1323
+#: src/client/application/application-controller.vala:1344
 msgid "E_xit"
 msgstr "י_ציאה"
 
-#: src/client/application/application-controller.vala:1333
+#: src/client/application/application-controller.vala:1354
 #, c-format
-#| msgid "Unable to rebuild database for \"%s\""
 msgid "Unable to rebuild database for “%s”"
 msgstr "לא ניתן ליצור מחדש מסד נתונים עבור „%s”"
 
-#: src/client/application/application-controller.vala:1334
+#: src/client/application/application-controller.vala:1355
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -1197,88 +1139,100 @@ 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:1501
+#: src/client/application/application-controller.vala:1522
 #, c-format
 msgid "Email sent to %s"
 msgstr "נשלחת הודעה אל %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:2491
+#: src/client/application/application-controller.vala:2516
 #, c-format
 msgid "Email to %s queued for delivery"
 msgstr "הודעה אל %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:2555
+#: src/client/application/application-controller.vala:2580
 #, c-format
 msgid "Email to %s saved"
 msgstr "נשמרה הודעה אל %s"
 
 #. / Translators: A label for an in-app notification.
-#: src/client/application/application-controller.vala:2570
-#: src/client/application/application-controller.vala:2628
-#| msgid "\"%s\" could not be found."
+#: src/client/application/application-controller.vala:2595
+#: src/client/application/application-controller.vala:2653
 msgid "Composer could not be restored"
 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:2613
+#: src/client/application/application-controller.vala:2638
 #, c-format
 msgid "Email to %s discarded"
 msgstr "הודעה אל %s הושלכה"
 
+#. / Translators: Label for account database upgrade dialog
+#: src/client/application/application-database-manager.vala:74
+#| msgid "Geary update in progress…"
+msgid "Account update in progress"
+msgstr "עדכון החשבון בתהליך"
+
+#. / Translators: Window title for account database upgrade
+#. / dialog
+#: src/client/application/application-database-manager.vala:80
+#| msgid "Account name"
+msgid "Account update"
+msgstr "עדכון חשבון"
+
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:540
+#: src/client/application/application-main-window.vala:575
 msgid "Working offline"
 msgstr "פועל בצורה לא מקוונת"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:542
+#: src/client/application/application-main-window.vala:577
 msgid "You will not be able to send or receive email until re-connected."
 msgstr "לא ניתן לשלוח או לקבל הודעות עד להתחברות מחודשת."
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:549
+#: src/client/application/application-main-window.vala:584
 msgid "Login problem"
 msgstr "בעיית התחברות"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:551
+#: src/client/application/application-main-window.vala:586
 msgid "An account has reported an incorrect login or password."
 msgstr "החשבון דיווח על התחברות או ססמה לא נכונה."
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:558
+#: src/client/application/application-main-window.vala:593
 msgid "Retry login, you will be prompted for your password"
 msgstr "יש לנסות להתחבר שוב, ססמתך תידרש"
 
 #. Translators: An info bar status label
-#: src/client/application/application-main-window.vala:565
+#: src/client/application/application-main-window.vala:600
 msgid "Security problem"
 msgstr "בעיית אבטחה"
 
 #. Translators: An info bar description label
-#: src/client/application/application-main-window.vala:567
+#: src/client/application/application-main-window.vala:602
 msgid "An account has reported an untrusted server."
 msgstr "החשבון דיווח על שרת לא אמין."
 
 #. Translators: An info bar button label
-#: src/client/application/application-main-window.vala:570
+#: src/client/application/application-main-window.vala:605
 msgid "Check"
 msgstr "בדיקה"
 
 #. Translators: An info bar button tool-tip
-#: src/client/application/application-main-window.vala:574
+#: src/client/application/application-main-window.vala:609
 msgid "Check the security details for the connection"
 msgstr "בדיקת פרטי אבטחת ההתחברות"
 
 #. / 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:617
+#: src/client/application/application-main-window.vala:652
 #, c-format
 msgid "%s — %s"
 msgstr "%s — %s"
@@ -1286,53 +1240,51 @@ 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:996
+#: src/client/application/application-main-window.vala:1043
 #: src/client/folder-list/folder-list-account-branch.vala:43
 msgid "Labels"
 msgstr "תוויות"
 
-#: src/client/application/application-main-window.vala:1293
+#: src/client/application/application-main-window.vala:1358
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "ריקון כל הדואר מהתיקייה %s?"
 
-#: src/client/application/application-main-window.vala:1294
+#: src/client/application/application-main-window.vala:1359
 msgid "This removes the email from Geary and your email server."
 msgstr "פעולה זו תמחוק את הדואר מ־Geary וכן משרת הדוא״ל שלך."
 
-#: src/client/application/application-main-window.vala:1295
+#: src/client/application/application-main-window.vala:1360
 msgid "This cannot be undone."
 msgstr "פעולה זאת לא ניתנת לביטול."
 
-#: src/client/application/application-main-window.vala:1296
+#: src/client/application/application-main-window.vala:1361
 #, c-format
 msgid "Empty %s"
 msgstr "ריקון %s"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1353
-#| msgid "Do you want to permanently delete this message?"
-#| msgid_plural "Do you want to permanently delete these messages?"
+#: src/client/application/application-main-window.vala:1418
 msgid "Do you want to permanently delete this conversation?"
 msgid_plural "Do you want to permanently delete these conversations?"
 msgstr[0] "האם ברצונך למחוק תכתובת זו לצמיתות?"
 msgstr[1] "האם ברצונך למחוק תכתובות אלה לצמיתות?"
 msgstr[2] "האם ברצונך למחוק תכתובות אלה לצמיתות?"
 
-#: src/client/application/application-main-window.vala:1358
-#: src/client/application/application-main-window.vala:1373
+#: src/client/application/application-main-window.vala:1423
+#: src/client/application/application-main-window.vala:1438
 msgid "Delete"
 msgstr "מחיקה"
 
 #. / Translators: Primary text for a confirmation dialog
-#: src/client/application/application-main-window.vala:1368
+#: src/client/application/application-main-window.vala:1433
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "האם ברצונך למחוק הודעה זו לצמיתות?"
 msgstr[1] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 msgstr[2] "האם ברצונך למחוק הודעות אלה לצמיתות?"
 
-#: src/client/application/application-main-window.vala:1691
+#: src/client/application/application-main-window.vala:1724
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1342,18 +1294,17 @@ msgstr "%s (%d)"
 #. 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:1784
+#: src/client/components/components-attachment-pane.vala:104
+#: src/client/composer/composer-widget.vala:1870
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/components/components-attachment-pane.vala:379
-#| msgid "Are you sure you want to open \"%s\"?"
+#: src/client/components/components-attachment-pane.vala:373
 msgid "Are you sure you want to open these attachments?"
 msgstr "האם אכן ברצונך לפתוח קובץ מצורף זה?"
 
-#: src/client/components/components-attachment-pane.vala:380
+#: src/client/components/components-attachment-pane.vala:374
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -1361,45 +1312,100 @@ msgstr ""
 "קבצים מצורפים עלולים לגרום נזק למערכת שלך. כדאי לפתוח אך ורק קבצים המגיעים "
 "ממקור אמין."
 
-#: src/client/components/components-attachment-pane.vala:381
-#| msgid "Don't _ask me again"
+#: src/client/components/components-attachment-pane.vala:375
 msgid "Don’t _ask me again"
 msgstr "לא ל_שאול אותי שוב"
 
-#: src/client/components/components-inspector.vala:78
-#| msgid "_Inspect"
+#: src/client/components/components-conversation-actions.vala:90
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "סימון תכתובת"
+msgstr[1] "סימון תכתובות"
+msgstr[2] "סימון תכתובות"
+
+#: src/client/components/components-conversation-actions.vala:95
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "הוספת תווית לתכתובת"
+msgstr[1] "הוספת תווית לתכתובות"
+msgstr[2] "הוספת תווית לתכתובות"
+
+#: src/client/components/components-conversation-actions.vala:100
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "העברת תכתובת"
+msgstr[1] "העברת תכתובות"
+msgstr[2] "העברת תכתובות"
+
+#: src/client/components/components-conversation-actions.vala:105
+#: src/client/conversation-list/conversation-list-view.vala:445
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "תיוק תכתובת בארכיון"
+msgstr[1] "תיוק תכתובות בארכיון"
+msgstr[2] "תיוק תכתובות בארכיון"
+
+#: src/client/components/components-conversation-actions.vala:116
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "העברת תכתובת לאשפה"
+msgstr[1] "העברת תכתובות לאשפה"
+msgstr[2] "העברת תכתובות לאשפה"
+
+#: src/client/components/components-conversation-actions.vala:126
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "מחיקת תכתובת"
+msgstr[1] "מחיקת תכתובות"
+msgstr[2] "מחיקת תכתובות"
+
+#: src/client/components/components-info-bar.vala:248
+msgid "Information"
+msgstr "מידע"
+
+#: src/client/components/components-info-bar.vala:252
+msgid "Question"
+msgstr "שאלה"
+
+#: src/client/components/components-info-bar.vala:256
+msgid "Warning"
+msgstr "אזהרה"
+
+#: src/client/components/components-info-bar.vala:260
+msgid "Error"
+msgstr "שגיאה"
+
+#: src/client/components/components-inspector.vala:71
 msgid "Inspector"
 msgstr "מפקח"
 
 #. / 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:101
+#: src/client/components/components-inspector.vala:86
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:98
 msgid "Logs"
 msgstr "יומנים"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:97
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:104
+#: src/client/components/components-inspector.vala:90
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:101
 msgid "System"
 msgstr "מערכת"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:226
-#: src/client/components/components-inspector.vala:229
+#: src/client/components/components-inspector.vala:219
+#: src/client/components/components-inspector.vala:222
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:217
 #: 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..."
+#: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "שמירה בשם"
 
-#: src/client/components/components-inspector.vala:230
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
-#: ui/accounts_editor_servers_pane.ui:17 ui/composer-headerbar.ui:61
-#| msgid "_Cancel"
+#: src/client/components/components-inspector.vala:223
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: ui/accounts_editor_servers_pane.ui:15 ui/composer-headerbar.ui:55
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -1415,45 +1421,38 @@ msgstr "הצגת תצוגה מ_קדימה של שיחה"
 
 #. / Translators: Preferences label
 #: src/client/components/components-preferences-window.vala:144
-msgid "Use _three pane view"
-msgstr "שימוש ב_שלוש חלוניות תצוגה"
-
-#. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:154
 msgid "Use _single key email shortcuts"
 msgstr "שימוש במקש _בודד לקיצורים בדוא״ל"
 
-#: src/client/components/components-preferences-window.vala:156
+#: src/client/components/components-preferences-window.vala:146
 msgid ""
 "Enable keyboard shortcuts for email actions that do not require pressing "
 "<Ctrl>"
 msgstr "מאפשר פעולות בדוא״ל ללא צורך בלחיצה על מקש <Ctrl>"
 
 #. / Translators: Preferences label
-#: src/client/components/components-preferences-window.vala:167
-#| msgid "Always _watch for new mail"
+#: src/client/components/components-preferences-window.vala:157
 msgid "_Watch for new mail when closed"
 msgstr "_קבלת הודעות חדשות גם לאחר סגירת החלון"
 
 #. / Translators: Preferences tooltip
-#: src/client/components/components-preferences-window.vala:171
+#: src/client/components/components-preferences-window.vala:161
 msgid "Geary will keep running after all windows are closed"
 msgstr "‏Geary ימשיך לפעול גם לאחר סגירת כל החלונות"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:189
+#: src/client/components/components-preferences-window.vala:178
 msgid "Preferences"
 msgstr "העדפות"
 
 #. / Translators: Preferences page title
-#: src/client/components/components-preferences-window.vala:250
+#: src/client/components/components-preferences-window.vala:234
 msgid "Plugins"
 msgstr "תוספים"
 
 #. Translators: Info bar title for a generic account
 #. problem.
 #: src/client/components/components-problem-report-info-bar.vala:36
-#| msgid "Accounts"
 msgid "Account problem"
 msgstr "בעיות בחשבון"
 
@@ -1529,7 +1528,6 @@ msgstr "חיפוש"
 
 #. / Translators: Search entry tooltip
 #: src/client/components/components-search-bar.vala:32
-#| msgid "Search all mail in account for keywords (Ctrl+S)"
 msgid "Search all mail in account for keywords"
 msgstr "חיפוש מילים בכל הדואר שבחשבון"
 
@@ -1550,7 +1548,6 @@ msgstr "נדרשת כתובת דוא״ל"
 #. 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:398
-#| msgid "Remove email address"
 msgid "Not a valid email address"
 msgstr "כתובת דוא״ל לא תקינה"
 
@@ -1568,57 +1565,8 @@ msgstr "דרוש שם שרת"
 msgid "Could not look up server name"
 msgstr "לא ניתן למצוא את שם השרת"
 
-#: src/client/components/main-toolbar.vala:116
-#| msgid "Mark conversation"
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "סימון תכתובת"
-msgstr[1] "סימון תכתובות"
-msgstr[2] "סימון תכתובות"
-
-#: src/client/components/main-toolbar.vala:121
-#| msgid "Add label to conversation"
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "הוספת תווית לתכתובת"
-msgstr[1] "הוספת תווית לתכתובות"
-msgstr[2] "הוספת תווית לתכתובות"
-
-#: src/client/components/main-toolbar.vala:126
-#| msgid "Move conversation"
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "העברת תכתובת"
-msgstr[1] "העברת תכתובות"
-msgstr[2] "העברת תכתובות"
-
-#: src/client/components/main-toolbar.vala:131
-#| msgid "Archive conversation (A)"
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "תיוק תכתובת בארכיון"
-msgstr[1] "תיוק תכתובות בארכיון"
-msgstr[2] "תיוק תכתובות בארכיון"
-
-#: src/client/components/main-toolbar.vala:142
-#| msgid "Move conversations"
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "העברת תכתובת לאשפה"
-msgstr[1] "העברת תכתובות לאשפה"
-msgstr[2] "העברת תכתובות לאשפה"
-
-#: src/client/components/main-toolbar.vala:152
-#| msgid "Delete conversation"
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "מחיקת תכתובת"
-msgstr[1] "מחיקת תכתובות"
-msgstr[2] "מחיקת תכתובות"
-
 #. / Displayed in the space-limited status bar while a message is in the process of being sent.
 #: src/client/components/status-bar.vala:26
-#| msgid "Sending..."
 msgid "Sending…"
 msgstr "שולח…"
 
@@ -1637,12 +1585,6 @@ msgstr "שגיאה בשמירת דוא״ל שנשלח"
 msgid "_OK"
 msgstr "_אישור"
 
-#: src/client/components/stock.vala:19
-#: src/client/plugin/mail-merge/mail-merge.vala:392
-#: ui/password-dialog.glade:196
-msgid "_Cancel"
-msgstr "_ביטול"
-
 #: src/client/components/stock.vala:21
 msgid "_About"
 msgstr "על _אודות"
@@ -1675,7 +1617,6 @@ msgstr "הע_דפות"
 
 #. Translators: Menu item to print a single, specific message
 #: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
-#| msgid "_Print..."
 msgid "_Print…"
 msgstr "ה_דפסה…"
 
@@ -1696,20 +1637,19 @@ msgstr "_שמירה"
 msgid "_Keep"
 msgstr "_שמירה"
 
-#: src/client/composer/composer-editor.vala:675
+#: src/client/composer/composer-editor.vala:680
 msgid "Select Color"
 msgstr "בחירת צבע"
 
-#: src/client/composer/composer-link-popover.vala:139
+#: src/client/composer/composer-link-popover.vala:135
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr "קישור URL לא מובנה כראוי, לדוגמה http://example.com";
 
-#: src/client/composer/composer-link-popover.vala:146
+#: src/client/composer/composer-link-popover.vala:142
 msgid "Invalid link URL"
 msgstr "קישור URL לא תקין"
 
-#: src/client/composer/composer-link-popover.vala:146
-#| msgid "Remove email address"
+#: src/client/composer/composer-link-popover.vala:142
 msgid "Invalid email address"
 msgstr "כתובת דוא״ל לא תקינה"
 
@@ -1718,19 +1658,19 @@ msgstr "כתובת דוא״ל לא תקינה"
 msgid "New Message"
 msgstr "הודעה חדשה"
 
-#: src/client/composer/composer-widget.vala:167
+#: src/client/composer/composer-widget.vala:233
 msgid "Saved"
 msgstr "נשמר"
 
-#: src/client/composer/composer-widget.vala:168
+#: src/client/composer/composer-widget.vala:234
 msgid "Saving"
 msgstr "שומר"
 
-#: src/client/composer/composer-widget.vala:169
+#: src/client/composer/composer-widget.vala:235
 msgid "Error saving"
 msgstr "שגיאת בשמירה"
 
-#: src/client/composer/composer-widget.vala:170
+#: src/client/composer/composer-widget.vala:236
 msgid "Press Backspace to delete quote"
 msgstr "יש להקיש על Backspace למחיקת ציטוט"
 
@@ -1739,109 +1679,132 @@ msgstr "יש להקיש על Backspace למחיקת ציטוט"
 #. 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:186
+#: src/client/composer/composer-widget.vala:252
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
 msgstr "לצרף|צירוף|מצורף|צרף|קובץ מצורף|צורף|נספח"
 
+#. / Translators: Label for composer From address entry
+#: src/client/composer/composer-widget.vala:483
+msgid "_From"
+msgstr "_מאת"
+
+#. / Translators: Label for composer To address entry
+#: src/client/composer/composer-widget.vala:493
+msgid "_To"
+msgstr "_אל"
+
+#. / Translators: Label for composer CC address entry
+#: src/client/composer/composer-widget.vala:502
+msgid "_Cc"
+msgstr "_עותק"
+
+#. / Translators: Label for composer BCC address entry
+#: src/client/composer/composer-widget.vala:510
+msgid "_Bcc"
+msgstr "עותק _מוסתר"
+
+#. / Translators: Label for composer Reply-To address entry
+#: src/client/composer/composer-widget.vala:518
+#| msgid "Reply to:"
+msgid "_Reply to"
+msgstr "לה_שיב אל"
+
+#. / Translators: Label for composer Subject line entry
+#: src/client/composer/composer-widget.vala:526
+msgid "_Subject"
+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:862
-#| msgid "Do you want to discard this message?"
+#: src/client/composer/composer-widget.vala:904
 msgid "Do you want to keep or discard this draft message?"
 msgstr "האם ברצונך לשמור או למחוק את טיוטת הודעה זו?"
 
 #. 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:888
-#| msgid "Do you want to discard this message?"
+#: src/client/composer/composer-widget.vala:930
 msgid "Do you want to discard this draft message?"
 msgstr "האם ברצונך למחוק טיוטת הודעה זו?"
 
-#: src/client/composer/composer-widget.vala:1440
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "האם לשלוח את ההודעה ללא כותרת ותוכן?"
 
-#: src/client/composer/composer-widget.vala:1442
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "האם לשלוח את ההודעה ללא כותרת?"
 
-#: src/client/composer/composer-widget.vala:1444
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "האם לשלוח את ההודעה ללא תוכן?"
 
-#: src/client/composer/composer-widget.vala:1453
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "האם לשלוח את ההודעה ללא קובץ מצורף?"
 
-#: src/client/composer/composer-widget.vala:1772
+#: src/client/composer/composer-widget.vala:1858
 #, c-format
-#| msgid "\"%s\" already attached for delivery."
 msgid "“%s” already attached for delivery."
 msgstr "‏„%s” כבר מצורף למכתב."
 
-#: src/client/composer/composer-widget.vala:1804
-#: src/client/composer/composer-widget.vala:1854
+#: src/client/composer/composer-widget.vala:1890
+#: src/client/composer/composer-widget.vala:1940
 #, c-format
-#| msgid "\"%s\" is an empty file."
 msgid "“%s” is an empty file."
 msgstr "‏„%s” הוא קובץ ריק."
 
-#: src/client/composer/composer-widget.vala:1842
+#: src/client/composer/composer-widget.vala:1928
 #, c-format
-#| msgid "\"%s\" could not be found."
 msgid "“%s” could not be found."
 msgstr "‏„%s” לא נמצא."
 
-#: src/client/composer/composer-widget.vala:1848
+#: src/client/composer/composer-widget.vala:1934
 #, c-format
-#| msgid "\"%s\" is a folder."
 msgid "“%s” is a folder."
 msgstr "‏„%s” היא תיקייה."
 
-#: src/client/composer/composer-widget.vala:1867
+#: src/client/composer/composer-widget.vala:1953
 #, c-format
-#| msgid "\"%s\" could not be opened for reading."
 msgid "“%s” could not be opened for reading."
 msgstr "לא ניתן לפתוח את „%s” לקריאה."
 
-#: src/client/composer/composer-widget.vala:1875
+#: src/client/composer/composer-widget.vala:1961
 msgid "Cannot add attachment"
 msgstr "לא ניתן לצרף את הקובץ המבוקש"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:1946
-#| msgid "Show Images"
+#: src/client/composer/composer-widget.vala:2032
 msgid "Images"
 msgstr "תמונות"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:2010
-#: src/client/conversation-viewer/conversation-email.vala:542
-#: src/client/util/util-email.vala:249 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:2096
+#: src/client/conversation-viewer/conversation-email.vala:536
+#: src/client/util/util-email.vala:267 ui/conversation-message.ui:283
 msgid "To:"
 msgstr "אל:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:2016
-#: src/client/conversation-viewer/conversation-email.vala:547
-#: src/client/util/util-email.vala:254 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:2102
+#: src/client/conversation-viewer/conversation-email.vala:541
+#: src/client/util/util-email.vala:272 ui/conversation-message.ui:324
 msgid "Cc:"
 msgstr "עותק:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:2022
-#: src/client/conversation-viewer/conversation-email.vala:552
-#: ui/conversation-message.ui:402
+#: src/client/composer/composer-widget.vala:2108
+#: src/client/conversation-viewer/conversation-email.vala:546
+#: ui/conversation-message.ui:365
 msgid "Bcc:"
 msgstr "עותק מוסתר:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:2028
+#: src/client/composer/composer-widget.vala:2114
 msgid "Reply-To: "
 msgstr "להשיב אל:"
 
@@ -1850,7 +1813,7 @@ msgstr "להשיב אל:"
 #. 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:2146
+#: src/client/composer/composer-widget.vala:2232
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s באמצעות %2$s"
@@ -1868,8 +1831,7 @@ msgid "Search for more languages"
 msgstr "חיפוש שפות נוספות"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:339
-#| msgid "Move conversations"
+#: src/client/conversation-list/conversation-list-view.vala:389
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "העברת תכתובת ל_אשפה"
@@ -1877,46 +1839,45 @@ msgstr[1] "העברת תכתובות ל_אשפה"
 msgstr[2] "העברת תכתובות ל_אשפה"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:351
-#| msgid "Delete conversation"
+#: src/client/conversation-list/conversation-list-view.vala:401
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "_מחיקת תכתובת"
 msgstr[1] "_מחיקת תכתובות"
 msgstr[2] "_מחיקת תכתובות"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:414
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "סימון כ_נקרא"
 
-#: src/client/conversation-list/conversation-list-view.vala:372
+#: src/client/conversation-list/conversation-list-view.vala:422
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "סימון כ_לא נקרא"
 
-#: src/client/conversation-list/conversation-list-view.vala:380
+#: src/client/conversation-list/conversation-list-view.vala:430
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "ה_סרת כוכב"
 
-#: src/client/conversation-list/conversation-list-view.vala:387
+#: src/client/conversation-list/conversation-list-view.vala:437
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "סימון ב_כוכב"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:396
+#: src/client/conversation-list/conversation-list-view.vala:454
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "לה_שיב"
 
-#: src/client/conversation-list/conversation-list-view.vala:402
+#: src/client/conversation-list/conversation-list-view.vala:460
 msgid "R_eply All"
 msgstr "להשיב ל_כולם"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:408
+#: src/client/conversation-list/conversation-list-view.vala:466
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "ה_עברה"
@@ -1926,20 +1887,20 @@ msgid "Me"
 msgstr "אני"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:537
-#: src/client/util/util-email.vala:240
+#: src/client/conversation-viewer/conversation-email.vala:531
+#: src/client/util/util-email.vala:258
 msgid "From:"
 msgstr "מאת:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:557
-#: src/client/util/util-email.vala:245
+#: src/client/conversation-viewer/conversation-email.vala:551
+#: src/client/util/util-email.vala:263
 msgid "Date:"
 msgstr "תאריך:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:567
-#: src/client/util/util-email.vala:243
+#: src/client/conversation-viewer/conversation-email.vala:561
+#: src/client/util/util-email.vala:261
 msgid "Subject:"
 msgstr "נושא:"
 
@@ -1951,7 +1912,6 @@ msgstr "יתכן וכתובת דוא״ל זו זויפה"
 #. many email addresses to be shown by default in an
 #. email's header, but they are all being shown anyway.
 #: src/client/conversation-viewer/conversation-message.vala:234
-#| msgid "Show Images"
 msgid "Show less"
 msgstr "להציג פחות"
 
@@ -1961,75 +1921,75 @@ msgstr "להציג פחות"
 #. number of extra email to be shown.
 #: src/client/conversation-viewer/conversation-message.vala:260
 #, c-format
+#| msgid "%d more…"
 msgid "%d more…"
-msgstr "עוד %d…"
+msgid_plural "%d more…"
+msgstr[0] "עוד %d…"
+msgstr[1] "עוד %d…"
+msgstr[2] "עוד %d…"
 
 #. Compact headers. These are partially done here and partially
 #. 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:529
+#: src/client/conversation-viewer/conversation-message.vala:533
 msgid "No sender"
 msgstr "אין שולח"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:920
+#: src/client/conversation-viewer/conversation-message.vala:1025
 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:1040
-#| msgid "Show Images"
+#: src/client/conversation-viewer/conversation-message.vala:1147
 msgid "Image"
 msgstr "תמונה"
 
 #. Translators: Info bar status message
-#: src/client/conversation-viewer/conversation-message.vala:1305
+#: src/client/conversation-viewer/conversation-message.vala:1419
 msgid "Remote images not shown"
 msgstr "תמונות מרוחקות לא מוצגות"
 
 #. Translators: Info bar description
-#: src/client/conversation-viewer/conversation-message.vala:1307
+#: src/client/conversation-viewer/conversation-message.vala:1421
 msgid "Only show remote images from senders you trust."
 msgstr "הצגת תמונות מרוחקות רק משולחים אמינים לך."
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1311
+#: src/client/conversation-viewer/conversation-message.vala:1425
 msgid "Show"
 msgstr "הצגה"
 
 #. Translators: Info bar button label
-#: src/client/conversation-viewer/conversation-message.vala:1315
-#| msgid "Always Show From Sender"
+#: src/client/conversation-viewer/conversation-message.vala:1429
 msgid "Always show from sender"
 msgstr "תמיד להציג תמונות משולח זה"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#: src/client/conversation-viewer/conversation-viewer.vala:84
 msgid "No conversations selected"
 msgstr "לא נבחרה אף תכתובת"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:87
+#: src/client/conversation-viewer/conversation-viewer.vala:88
 msgid "Selecting a conversation from the list will display it here"
 msgstr "בחירת תכתובת מהרשימה תציג אותה כאן"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:96
-#| msgid "%u conversation selected"
-#| msgid_plural "%u conversations selected"
+#: src/client/conversation-viewer/conversation-viewer.vala:97
 msgid "Multiple conversations selected"
 msgstr "נבחרו מספר תכתובות"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:100
+#: src/client/conversation-viewer/conversation-viewer.vala:101
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "כל פעולה שתיבחר תוחל על כלל התכתובות הנבחרות"
 
@@ -2037,21 +1997,20 @@ msgstr "כל פעולה שתיבחר תוחל על כלל התכתובות הנ
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:109
-#: src/client/conversation-viewer/conversation-viewer.vala:122
-#| msgid "No conversations in folder."
+#: src/client/conversation-viewer/conversation-viewer.vala:110
+#: src/client/conversation-viewer/conversation-viewer.vala:123
 msgid "No conversations found"
 msgstr "לא נמצאו תכתובות"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:113
+#: src/client/conversation-viewer/conversation-viewer.vala:114
 msgid "This folder does not contain any conversations"
 msgstr "תיקייה זו לא מכילה כל תכתובת"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:126
+#: src/client/conversation-viewer/conversation-viewer.vala:127
 msgid "Your search returned no results, try refining your search terms"
 msgstr "החיפוש שלך לא הניב תוצאות, יש לנסות לשנות את מילות החיפוש"
 
@@ -2074,9 +2033,6 @@ msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "המזהה של שרת הדואר %s ב־%s: ‏%u לא ניתן לאימות."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:48
-#| msgid ""
-#| "Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
-#| "your username and password to be transmitted insecurely."
 msgid ""
 "Selecting “Trust This Server” or “Always Trust This Server” may cause your "
 "username and password to be transmitted insecurely."
@@ -2085,9 +2041,6 @@ msgstr ""
 "לעבור באופן לא בטוח."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:56
-#| msgid ""
-#| "Selecting \"Don't Trust This Server\" will cause Geary not to access this "
-#| "server."
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
@@ -2098,9 +2051,6 @@ msgid "Geary will not add or update this email account."
 msgstr "‏Geary לא יוסיף או יעדכן חשבון דוא״ל זה."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:63
-#| msgid ""
-#| "Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
-#| "this account."
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
@@ -2115,46 +2065,38 @@ msgstr ""
 "נושאים אלה."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:76
-#| msgid "The server's certificate is not signed by a known authority"
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "תעודת השרת אינה חתומה על ידי מנפיק מהימן"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:79
-#| msgid "The server's identity does not match the identity in the certificate"
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "מזהה השרת לא תואם את מזהה התעודה"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:82
-#| msgid "The server's certificate has expired"
 msgid "The server’s certificate has expired"
 msgstr "פגה תקפה של תעודת השרת"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:85
-#| msgid "The server's certificate has not been activated"
 msgid "The server’s certificate has not been activated"
 msgstr "תעודת השרת לא הופעלה"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:88
-#| msgid "The server's certificate has been revoked and is now invalid"
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "תעודת השרת בוטלה ואינה תקפה כעת"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:91
-#| msgid "The server's certificate is considered insecure"
 msgid "The server’s certificate is considered insecure"
 msgstr "תעודת השרת אינה בטוחה"
 
 #: src/client/dialogs/certificate-warning-dialog.vala:94
-#| msgid "An error has occurred processing the server's certificate"
 msgid "An error has occurred processing the server’s certificate"
 msgstr "התרחשה שגיאה בעיבוד תעודת השרת"
 
 #. / 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:99
-#: ui/problem-details-dialog.ui:17
-#| msgid "_Details"
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:96
+#: ui/problem-details-dialog.ui:15
 msgid "Details"
 msgstr "פרטים"
 
@@ -2216,12 +2158,6 @@ msgstr[2] "%d תוצאות"
 #. / messages
 #: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
 #, c-format
-#| msgid ""
-#| "%s\n"
-#| "(%d other new message for %s)"
-#| msgid_plural ""
-#| "%s\n"
-#| "(%d other new messages for %s)"
 msgid ""
 "%s\n"
 "(%d other new message)"
@@ -2267,7 +2203,6 @@ msgstr[2] "%s, %d הודעות חדשות סך הכל"
 #. / Notification title when new messages have been
 #. / received
 #: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
-#| msgid "New Message"
 msgid "New message"
 msgid_plural "New messages"
 msgstr[0] "הודעה חדשה"
@@ -2275,7 +2210,6 @@ msgstr[1] "הודעות חדשות"
 msgstr[2] "שתי הודעות חדשות"
 
 #: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
-#| msgid "Email address:"
 msgid "Email Templates"
 msgstr "תבנית הודעה"
 
@@ -2289,7 +2223,6 @@ msgstr "יצירת תבנית לשימוש חוזר עבור הודעות יוצ
 #. included.
 #: src/client/plugin/email-templates/email-templates.vala:29
 #: src/client/plugin/mail-merge/mail-merge.vala:29
-#| msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgid "Templates | Template Mail | Template Email | Template E-Mail"
 msgstr ""
 "תבניות | תבנית דוא״ל | תבנית דואר | תבנית דואל | תבנית אימייל | תבנית מייל"
@@ -2303,7 +2236,6 @@ msgstr "תבניות"
 #. Translators: Info bar button label for creating a
 #. new email template
 #: src/client/plugin/email-templates/email-templates.vala:282
-#| msgid "Now"
 msgid "New"
 msgstr "חדש"
 
@@ -2348,7 +2280,6 @@ msgstr "מילוי ושליחת תבניות באמצעות גיליון אלק
 #. Translators: Info bar label for starting sending a mail
 #. merge
 #: src/client/plugin/mail-merge/mail-merge.vala:118
-#| msgid "_Star"
 msgid "Start"
 msgstr "התחלה"
 
@@ -2397,19 +2328,16 @@ msgid "Messaging Menu"
 msgstr "תפריט הודעה"
 
 #: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
-#, fuzzy
 #| msgid "Show _notifications for new mail"
 msgid "Displays Unity Messaging Menu notifications for new email"
-msgstr "הצגת התרעות על _קבלת דואר חדש"
+msgstr "הצגת תפריט התרעות של Unity על קבלת דואר חדש"
 
 #: src/client/plugin/messaging-menu/messaging-menu.vala:79
 #, c-format
-#| msgid "%s - New Messages"
 msgid "%s — New Messages"
 msgstr "‏%s - הודעות חדשות"
 
 #: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
-#| msgid "not found"
 msgid "Sent Sound"
 msgstr "צליל שליחה"
 
@@ -2425,15 +2353,12 @@ msgstr "ריקון"
 
 #. Translators: Info bar status message for a draft email
 #: src/client/plugin/special-folders/special-folders.vala:179
-#| msgid "%u read message"
-#| msgid_plural "%u read messages"
 msgid "Draft message"
 msgstr "טיוטה"
 
 #. Translators: Info bar status description for a draft
 #. email
 #: src/client/plugin/special-folders/special-folders.vala:182
-#| msgid "This message contains remote images."
 msgid "This message has not yet been sent."
 msgstr "הודעה זו טרם נשלחה."
 
@@ -2446,7 +2371,6 @@ msgstr "הודעה לא נשמרה"
 #. Translators: Info bar status description for a sent but
 #. unsaved email
 #: src/client/plugin/special-folders/special-folders.vala:201
-#| msgid "This message was sent successfully, but could not be saved to %s."
 msgid "This message was sent, but has not been saved to your account."
 msgstr "הודעה זו נשלחה, אך טרם נשמרה בחשבון שלך."
 
@@ -2520,42 +2444,16 @@ msgstr "אתמול"
 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:218
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgid "%a, %b %-e, %Y at %l:%M %P"
-msgstr "%a, %b %-e, %Y בשעה %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:224
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgid "%a, %b %-e, %Y at %H:%M"
-msgstr "%a, %b %-e, %Y בשעה %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:230
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgid "%a, %b %-e, %Y at %X"
-msgstr "%a, %b %-e, %Y בשעה %X"
-
 #. Translators: Label used when an email has a missing or
 #. an empty subject
-#: src/client/util/util-email.vala:50
-#| msgid "(no subject)"
+#: src/client/util/util-email.vala:52
 msgid "(No subject)"
 msgstr "(ללא נושא)"
 
 #. / 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:148
-#| msgid "Edit recipients"
+#: src/client/util/util-email.vala:150
 msgid "(No recipients)"
 msgstr "(אין נמענים)"
 
@@ -2564,7 +2462,7 @@ msgstr "(אין נמענים)"
 #. / 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:160
+#: src/client/util/util-email.vala:162
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -2572,32 +2470,219 @@ msgstr[0] "‏%s ועוד אחד"
 msgstr[1] "‏%s ועוד %d"
 msgstr[2] "‏%s ועוד שניים"
 
+#. / GLib g_date_time_format format string for the date and
+#. / time that a message being replied to was
+#. / received. This should be roughly similar to an RFC
+#. / 822-style date header value with optional additional
+#. / punctuation for readability. Note that this date may
+#. / be sent to someone in a different locale than the
+#. / sender, so should be unambiguous (for example, do not
+#. / use mm/dd/yyyy since it could be confused with
+#. / dd/mm/yyyy) and must include the time zone.
+#: src/client/util/util-email.vala:194
+#| msgid "%a, %b %-e, %Y at %X"
+msgid "%a, %b %-e %Y at %X %Z"
+msgstr "%a %-e ב%b %Y, בשעה %X %Z"
+
 #. / 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:193
+#. / %1$s will be substituted for the date, and %2$s
+#. / will be substituted for the original sender.
+#: src/client/util/util-email.vala:200
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "בתאריך %1$s, %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:200
+#. / 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:211
 #, c-format
 msgid "%s wrote:"
 msgstr "נכתב על ידי %s:"
 
-#. / 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:206
+#. / 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:221
 #, c-format
 msgid "On %s:"
 msgstr "בתאריך %s:"
 
-#: src/client/util/util-email.vala:235
+#: src/client/util/util-email.vala:253
 msgid "---------- Forwarded message ----------"
 msgstr "---------- הודעה שהועברה ----------"
 
+#. / Translators: Can be typed in the search box like
+#. / "attachment:file.txt" to find messages with attachments
+#. / with a particular name.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:605
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "מצורף"
+
+#. / Translators: Can be typed in the search box like
+#. / "bcc:johndoe example com" to find messages bcc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:618
+msgctxt "Search operator"
+msgid "bcc"
+msgstr "מוסתר"
+
+#. / Translators: Can be typed in the search box like
+#. / "body:word" to find "word" only if it occurs in the body
+#. / of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:630
+msgctxt "Search operator"
+msgid "body"
+msgstr "גוף"
+
+#. / Translators: Can be typed in the search box like
+#. / "cc:johndoe example com" to find messages cc'd to a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:642
+msgctxt "Search operator"
+msgid "cc"
+msgstr "עותק"
+
+#. / Translators: Can be typed in the search box like
+#. / "from:johndoe example com" to find messages from a
+#. / particular sender.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:654
+msgctxt "Search operator"
+msgid "from"
+msgstr "מאת"
+
+#. / Translators: Can be typed in the search box like
+#. / "subject:word" to find "word" only if it occurs in the
+#. / subject of a message.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:668
+msgctxt "Search operator"
+msgid "subject"
+msgstr "נושא"
+
+#. / Translators: Can be typed in the search box like
+#. / "to:johndoe example com" to find messages received by a
+#. / particular person.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:680
+msgctxt "Search operator"
+msgid "to"
+msgstr "אל"
+
+#. / Translators: Can be typed in the search box after "to:",
+#. / "cc:" and "bcc:" e.g.: "to:me". Matches conversations that
+#. / are addressed to the user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:691
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr "אני"
+
+#. / Translators: Can be typed in the search box after "from:"
+#. / i.e.: "from:me". Matches conversations were sent by the
+#. / user.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:704
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr "אני"
+
+#. Boolean operators
+#. /////////////////////////////////////////////////////////
+#. / Translators: Can be typed in the search box like
+#. / "is:unread" to find messages that are read, unread, or
+#. / starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:719
+msgctxt "Search operator"
+msgid "is"
+msgstr "זה"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:unread". Matches conversations that are flagged
+#. / unread.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:729
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr "לא נקרא"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:read". Matches conversations that are flagged as
+#. / read.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:739
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr "נקרא"
+
+#. / Translators: Can be typed in the search box after "is:"
+#. / i.e.: "is:starred". Matches conversations that are flagged
+#. / as starred.
+#. /
+#. / The translated string must be a single word (use '-', '_'
+#. / or similar to combine words into one), should be short,
+#. / and also match the translation in "search.page" of the
+#. / Geary User Guide.
+#: src/client/util/util-email.vala:749
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "מסומן בכוכב"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "בתים"
@@ -2631,7 +2716,6 @@ msgid "Drafts"
 msgstr "טיוטות"
 
 #: src/client/util/util-i18n.vala:277
-#| msgid "Sent Mail"
 msgid "Sent"
 msgstr "דואר יוצא"
 
@@ -2663,193 +2747,25 @@ msgstr "בהמתנה לשליחה"
 msgid "Archive"
 msgstr "ארכיון"
 
-#. Map of possibly translated search operator names and values
-#. to English/internal names and values. We include the
-#. English version anyway so that when translations provide a
-#. localised version of the operator names but have not also
-#. translated the user manual, the English version in the
-#. manual still works.
-#. Can be typed in the search box like "attachment:file.txt"
-#. to find messages with attachments with a particular name.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:130
-msgctxt "Search operator"
-msgid "attachment"
-msgstr "מצורף"
-
-#. Can be typed in the search box like
-#. "bcc:johndoe example com" to find messages bcc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:139
-msgctxt "Search operator"
-msgid "bcc"
-msgstr "מוסתר"
-
-#. Can be typed in the search box like "body:word" to find
-#. "word" only if it occurs in the body of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:147
-msgctxt "Search operator"
-msgid "body"
-msgstr "גוף"
-
-#. Can be typed in the search box like
-#. "cc:johndoe example com" to find messages cc'd to a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:156
-msgctxt "Search operator"
-msgid "cc"
-msgstr "עותק"
-
-#. Can be typed in the search box like
-#. "from:johndoe example com" to find messages from a
-#. particular sender.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:165
-msgctxt "Search operator"
-msgid "from"
-msgstr "מאת"
-
-#. Can be typed in the search box like "is:unread" to find
-#. messages that are read, unread, or starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:173
-msgctxt "Search operator"
-msgid "is"
-msgstr "זה"
-
-#. Can be typed in the search box like "subject:word" to find
-#. "word" only if it occurs in the subject of a message.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:181
-msgctxt "Search operator"
-msgid "subject"
-msgstr "נושא"
-
-#. Can be typed in the search box like
-#. "to:johndoe example com" to find messages received by a
-#. particular person.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:190
-msgctxt "Search operator"
-msgid "to"
-msgstr "אל"
-
-#. Can be typed in the search box after "to:", "cc:" and
-#. "bcc:" e.g.: "to:me". Matches conversations that are
-#. addressed to the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:211
-msgctxt "Search operator value - mail addressed to the user"
-msgid "me"
-msgstr "אני"
-
-#. Can be typed in the search box after "from:" i.e.:
-#. "from:me". Matches conversations were sent by the user.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:223
-msgctxt "Search operator value - mail sent by the user"
-msgid "me"
-msgstr "אני"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:read". Matches conversations that are flagged as read.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:235
-msgctxt "'is:' search operator value"
-msgid "read"
-msgstr "נקרא"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:starred". Matches conversations that are flagged as
-#. starred.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:246
-msgctxt "'is:' search operator value"
-msgid "starred"
-msgstr "מסומן בכוכב"
-
-#. Can be typed in the search box after "is:" i.e.:
-#. "is:unread". Matches conversations that are flagged unread.
-#.
-#. The translated string must be a single word (use '-', '_'
-#. 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-search-query.vala:256
-msgctxt "'is:' search operator value"
-msgid "unread"
-msgstr "לא נקרא"
-
-#. List of general possible folder names to match for the
-#. 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:996
-msgid "Drafts | Draft"
-msgstr "טיוטות | טיוטה | Drafts | Draft"
+#. List of general possible folder names to match for the
+#. 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:1006
+msgid "Drafts | Draft"
+msgstr "טיוטות | טיוטה | Drafts | Draft"
 
 #. List of general possible folder names to match for the
 #. 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:1005
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1015
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "דואר יוצא | דואר נשלח | 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:1010
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1020
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "דואר יוצא"
@@ -2858,7 +2774,7 @@ msgstr "דואר יוצא"
 #. 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:1020
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1030
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2870,13 +2786,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:1030
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1040
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "אשפה | זבל | 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:1035
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1045
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "אשפה"
@@ -2885,269 +2801,226 @@ msgstr "אשפה"
 #. 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:1045
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1055
 msgid "Archive | Archives"
 msgstr "ארכיון | ארכיב | ארכיונים | ארכיבים | Archive | Archives"
 
-#: src/engine/rfc822/rfc822-message.vala:528
+#: src/engine/rfc822/rfc822-message.vala:551
 #, c-format
 msgid "Could not determine mime type for “%s”."
 msgstr "לא ניתן לקבוע את סוג הקובץ עבור „%s”"
 
-#: src/engine/rfc822/rfc822-message.vala:539
+#: src/engine/rfc822/rfc822-message.vala:562
 #, c-format
 msgid "Could not determine content type for mime type “%s” on “%s”."
 msgstr "לא ניתן לקבוע את סוג תוכן סוג הקובץ „%s” ב־„%s”."
 
-#: src/engine/rfc822/rfc822-message.vala:1013
+#: src/engine/rfc822/rfc822-message.vala:1015
 msgid "(no subject)"
 msgstr "(ללא נושא)"
 
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
-#| msgid "Add account"
+#: ui/accounts_editor_add_pane.ui:7 ui/accounts_editor_list_pane.ui:122
 msgid "Add an account"
 msgstr "הוספת חשבון"
 
-#: ui/accounts_editor_add_pane.ui:53
+#: ui/accounts_editor_add_pane.ui:47
 msgid "_Create"
 msgstr "_יצירה"
 
-#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+#: ui/accounts_editor_add_pane.ui:119 ui/accounts_editor_servers_pane.ui:115
 msgid "Receiving"
 msgstr "קבלה"
 
-#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
-#| msgid "Sending..."
+#: ui/accounts_editor_add_pane.ui:163 ui/accounts_editor_servers_pane.ui:151
 msgid "Sending"
 msgstr "שליחה"
 
-#: ui/accounts_editor_edit_pane.ui:8
-#| msgid "Edit account"
+#: ui/accounts_editor_edit_pane.ui:7
 msgid "Edit Account"
 msgstr "עריכת חשבון"
 
-#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
-#| msgid "Accounts"
+#: ui/accounts_editor_edit_pane.ui:8 ui/accounts_editor_servers_pane.ui:8
 msgid "Account Name"
 msgstr "שם חשבון"
 
-#: ui/accounts_editor_edit_pane.ui:124
-#| msgid "Email address:"
+#: ui/accounts_editor_edit_pane.ui:114
 msgid "Email addresses"
 msgstr "כתובת דוא״ל"
 
-#: ui/accounts_editor_edit_pane.ui:164
+#: ui/accounts_editor_edit_pane.ui:151
 msgid "Signature"
 msgstr "חתימה"
 
-#: ui/accounts_editor_edit_pane.ui:201
-#| msgid "SMTP settings"
+#: ui/accounts_editor_edit_pane.ui:186
 msgid "Settings"
 msgstr "הגדרות"
 
 #. This is a button in the account settings to show server settings.
-#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
-#| msgid "SMTP settings"
+#: ui/accounts_editor_edit_pane.ui:225 ui/accounts_editor_servers_pane.ui:7
 msgid "Server Settings"
 msgstr "הגדרות שרת"
 
-#. This is the remove account button in the account settings.
-#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
-#| msgid "Remove account"
-msgid "Remove Account"
-msgstr "הסרת חשבון"
-
-#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
-#| msgid "Remove account"
+#: ui/accounts_editor_edit_pane.ui:242
 msgid "Remove this account from Geary"
 msgstr "הסרת חשבון זה מ־Geary"
 
-#: ui/accounts_editor_list_pane.ui:8
+#: ui/accounts_editor_list_pane.ui:7
 msgid "Accounts"
 msgstr "משתמשים"
 
-#: ui/accounts_editor_list_pane.ui:62
+#: ui/accounts_editor_list_pane.ui:59
 msgid "To get started, select an email provider below."
 msgstr "על מנת להתחיל, יש לבחור ספק דוא״ל להלן."
 
-#: ui/accounts_editor_list_pane.ui:75
-#| msgid "Welcome to Geary."
+#: ui/accounts_editor_list_pane.ui:73
 msgid "Welcome to Geary"
 msgstr "ברוך בואך ל־Geary"
 
-#. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
-#: ui/accounts_editor_remove_pane.ui:73
-#, c-format
-msgid "Confirm removing: %s"
-msgstr "אישור הסרה: %s"
-
-#: ui/accounts_editor_remove_pane.ui:91
-msgid ""
-"Removing an account will remove it from Geary and delete locally cached "
-"email data from your computer, but not from your service provider."
-msgstr ""
-"הסרת החשבון תסיר אותו מ־Geary ותמחוק את קובצי נתוני הדוא״ל המקומיים מהמחשב "
-"שלך, אבל לא מספק השרת שלך."
-
-#: ui/accounts_editor_remove_pane.ui:122
-msgid "Remove account"
-msgstr "הסרת חשבון"
-
-#: ui/accounts_editor_servers_pane.ui:47
+#: ui/accounts_editor_servers_pane.ui:42
 msgid "Apply"
 msgstr "החלה"
 
-#: ui/certificate_warning_dialog.glade:7
+#: ui/certificate_warning_dialog.glade:6
 msgid "Untrusted Connection"
 msgstr "חיבור לא מהימן"
 
-#: ui/certificate_warning_dialog.glade:29
+#: ui/certificate_warning_dialog.glade:26
 msgid "_Always Trust This Server"
 msgstr "_תמיד לבטוח בשרת זה"
 
-#: ui/certificate_warning_dialog.glade:43
+#: ui/certificate_warning_dialog.glade:39
 msgid "_Trust This Server"
 msgstr "_לבטוח בשרת זה"
 
-#: ui/certificate_warning_dialog.glade:57
-#| msgid "_Don't Trust This Server"
+#: ui/certificate_warning_dialog.glade:52
 msgid "_Don’t Trust This Server"
 msgstr "ל_א לבטוח בשרת זה"
 
-#: ui/composer-editor.ui:100
+#: ui/composer-editor.ui:89
 msgid "Bold text"
 msgstr "טקסט מודגש"
 
-#: ui/composer-editor.ui:124
-#| msgid "Italic (Ctrl+I)"
+#: ui/composer-editor.ui:111
 msgid "Italic text"
 msgstr "טקסט נטוי"
 
-#: ui/composer-editor.ui:148
-#| msgid "Underline (Ctrl+U)"
+#: ui/composer-editor.ui:133
 msgid "Underline text"
 msgstr "טקסט עם קו תחתי"
 
-#: ui/composer-editor.ui:172
-#| msgid "Strikethrough (Ctrl+K)"
+#: ui/composer-editor.ui:155
 msgid "Strikethrough text"
 msgstr "טקסט עם קו חוצה"
 
-#: ui/composer-editor.ui:205
+#: ui/composer-editor.ui:185
 msgid "Insert bulleted list"
 msgstr "הכנסת רשימת תבליטים"
 
-#: ui/composer-editor.ui:229
+#: ui/composer-editor.ui:207
 msgid "Insert numbered list"
 msgstr "הכנסת רשימה ממסופרת"
 
-#: ui/composer-editor.ui:262
+#: ui/composer-editor.ui:237
 msgid "Indent or quote text"
 msgstr "הזחה או ציטוט טקסט"
 
-#: ui/composer-editor.ui:286
+#: ui/composer-editor.ui:259
 msgid "Un-indent or unquote text"
 msgstr "ביטול הזחה או ביטול ציטוט טקסט"
 
-#: ui/composer-editor.ui:315
-#| msgid "Remove formatting (Ctrl+Space)"
+#: ui/composer-editor.ui:286
 msgid "Remove text formatting"
 msgstr "הסרת טקסט מעוצב"
 
-#: ui/composer-editor.ui:334
+#: ui/composer-editor.ui:303
 msgid "Change font type"
 msgstr "שינוי סוג גופן"
 
-#: ui/composer-editor.ui:349
+#: ui/composer-editor.ui:315
 msgid "Sans Serif"
 msgstr "גופן חסר עיטור"
 
-#: ui/composer-editor.ui:360
+#: ui/composer-editor.ui:325
 msgid "Serif"
 msgstr "גופן מעוטר"
 
-#: ui/composer-editor.ui:371
+#: ui/composer-editor.ui:335
 msgid "Fixed Width"
 msgstr "רוחב קבוע"
 
-#: ui/composer-editor.ui:397
+#: ui/composer-editor.ui:359
 msgid "Change font color"
 msgstr "שינוי צבע גופן"
 
-#: ui/composer-editor.ui:412
+#: ui/composer-editor.ui:372
 msgid "Change font size"
 msgstr "שינוי גודל גופן"
 
-#: ui/composer-editor.ui:447
+#: ui/composer-editor.ui:402
 msgid "Insert or update text link"
 msgstr "הכנסה או עדכון קישור לטקסט"
 
-#: ui/composer-editor.ui:471
+#: ui/composer-editor.ui:424
 msgid "Insert an image"
 msgstr "הכנסת תמונה"
 
-#: ui/composer-editor.ui:513
+#: ui/composer-editor.ui:463
 msgid "Undo last edit"
 msgstr "ביטול העריכה האחרונה"
 
-#: ui/composer-editor.ui:537
+#: ui/composer-editor.ui:485
 msgid "Redo last edit"
 msgstr "ביצוע חוזר של העריכה האחרונה"
 
-#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
-#| msgid "Attach File"
+#: ui/composer-editor.ui:512 ui/composer-editor.ui:534
 msgid "Attach a file"
 msgstr "צירוף קובץ"
 
-#: ui/composer-editor.ui:615
-#| msgid "Include Original Attachments"
+#: ui/composer-editor.ui:556
 msgid "Add original attachments"
 msgstr "הוספת הקבצים המצורפים המקוריים"
 
-#: ui/composer-editor.ui:660
+#: ui/composer-editor.ui:598
 msgid "More options"
 msgstr "אפשרויות נוספות"
 
-#: ui/composer-editor.ui:680
-#| msgid "Remove formatting (Ctrl+Space)"
+#: ui/composer-editor.ui:617
 msgid "Show formatting toolbar"
 msgstr "הצגת סרגל עיצוב"
 
-#: ui/composer-editor.ui:698
-#| msgid "Select spell checking language"
+#: ui/composer-editor.ui:634
 msgid "Select spell checking languages"
 msgstr "בחירת שפות לבדיקת איות"
 
-#: ui/composer-editor.ui:723
+#: ui/composer-editor.ui:658
 msgid "S_ans Serif"
 msgstr "_בלתי מעוטר"
 
-#: ui/composer-editor.ui:728
+#: ui/composer-editor.ui:663
 msgid "S_erif"
 msgstr "_מעוטר"
 
-#: ui/composer-editor.ui:733
+#: ui/composer-editor.ui:668
 msgid "_Fixed Width"
 msgstr "_רוחב קבוע"
 
-#: ui/composer-editor.ui:743
+#: ui/composer-editor.ui:678
 msgid "_Small"
 msgstr "_קטן"
 
-#: ui/composer-editor.ui:748
+#: ui/composer-editor.ui:683
 msgid "_Medium"
 msgstr "_בינוני"
 
-#: ui/composer-editor.ui:753
+#: ui/composer-editor.ui:688
 msgid "Lar_ge"
 msgstr "_גדול"
 
-#: ui/composer-editor.ui:763
+#: ui/composer-editor.ui:698
 msgid "_Rich Text"
 msgstr "טקסט _עשיר"
 
-#: ui/composer-editor.ui:768
-#| msgid "_Rich Text"
+#: ui/composer-editor.ui:703
 msgid "_Plain Text"
 msgstr "טקסט _פשוט"
 
@@ -3173,8 +3046,6 @@ msgid "_Paste"
 msgstr "הד_בקה"
 
 #: ui/composer-editor-menus.ui:30
-#| msgctxt "Clipboard paste with rich text"
-#| msgid "Paste _With Formatting"
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "הדבקה _ללא עיצוב"
@@ -3184,116 +3055,104 @@ msgid "Select _All"
 msgstr "בחירת ה_כול"
 
 #: ui/composer-editor-menus.ui:57 ui/conversation-message-menus.ui:43
-#| msgid "_Inspect"
 msgid "_Inspect…"
 msgstr "_בחינה…"
 
-#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#: ui/composer-headerbar.ui:20 ui/composer-headerbar.ui:96
 msgid "Detach the composer from the window"
 msgstr "ניתוק יוצר ההודעות מהחלון"
 
-#: ui/composer-headerbar.ui:135
+#: ui/composer-headerbar.ui:123
 msgid "_Send"
 msgstr "_שליחה"
 
-#: ui/composer-headerbar.ui:162
+#: ui/composer-headerbar.ui:147
 msgid "Discard and Close"
 msgstr "השלכה וסגירה"
 
-#: ui/composer-headerbar.ui:186
+#: ui/composer-headerbar.ui:169
 msgid "Save and Close"
 msgstr "שמירה וסגירה"
 
 #. 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
+#: ui/composer-link-popover.ui:38
 msgid "Insert the new link with this URL"
 msgstr "הכנסת הקישור החדש עם כתובת זו"
 
-#: ui/composer-link-popover.ui:43
-#| msgid "_Add"
+#: ui/composer-link-popover.ui:39
 msgid "Add"
 msgstr "הוספה"
 
-#: ui/composer-link-popover.ui:47
+#: ui/composer-link-popover.ui:43
 msgid "Link URL"
 msgstr "כתובת קישור"
 
 #. 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
+#: ui/composer-link-popover.ui:56
 msgid "Update this link’s URL"
 msgstr "עדכון כתובת קישור זה"
 
-#: ui/composer-link-popover.ui:62
-#| msgid "_Update"
+#: ui/composer-link-popover.ui:57
 msgid "Update"
 msgstr "עדכון"
 
-#: ui/composer-link-popover.ui:75
-#| msgctxt "Outlook localised name"
-#| msgid "Deleted Items"
+#: ui/composer-link-popover.ui:69
 msgid "Delete this link"
 msgstr "מחיקת הקישור"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:61
-#| msgid "_From:"
-msgid "_From"
-msgstr "_מאת"
-
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:131
-msgid "_To"
-msgstr "_אל"
-
-#: ui/composer-widget.ui:159
-msgid "Show Cc, Bcc, and Reply-To fields"
-msgstr "הצגת נמענים בשדות עותק, עותק מוסתר ולהשיב אל"
-
-#: ui/composer-widget.ui:220
-msgid "_Cc"
-msgstr "_עותק"
-
-#: ui/composer-widget.ui:268
-msgid "_Bcc"
-msgstr "עותק _מוסתר"
-
-#: ui/composer-widget.ui:316
-msgid "_Reply-To"
-msgstr "לה_שיב אל"
-
-#: ui/composer-widget.ui:373
-msgid "_Subject"
-msgstr "_נושא"
-
-#: ui/composer-widget.ui:446
+#: ui/composer-widget.ui:119
 msgid "Drop files here"
 msgstr "יש לגרור קבצים לכאן"
 
-#: ui/composer-widget.ui:462
+#: ui/composer-widget.ui:134
 msgid "To add them as attachments"
 msgstr "כדי להוסיף אותם כקבצים מצורפים"
 
-#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
-#| msgid "Save All A_ttachments..."
+#: ui/composer-widget.ui:217
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "הצגת נמענים בשדות עותק, עותק מוסתר ולהשיב אל"
+
+#: ui/components-attachment-pane.ui:25 ui/components-attachment-pane.ui:41
 msgid "Select all attachments"
 msgstr "בחירת הקבצים הנבחרים"
 
-#: ui/components-attachment-pane.ui:66
-#| msgid "Save All A_ttachments..."
+#: ui/components-attachment-pane.ui:58
 msgid "Save selected attachments"
 msgstr "שמירת הקבצים הנבחרים"
 
-#: ui/components-attachment-pane.ui:85
-#| msgid "Cannot add attachment"
+#: ui/components-attachment-pane.ui:75
 msgid "Open selected attachments"
 msgstr "פתיחת הקבצים הנבחרים"
 
 #: ui/components-attachment-pane-menus.ui:17
-#| msgid "Select _All"
 msgid "Save _All"
 msgstr "_שמירת הכול"
 
-#: ui/components-inspector-error-view.ui:31
+#: ui/components-conversation-actions.ui:76
+msgid "Reply"
+msgstr "להשיב"
+
+#: ui/components-conversation-actions.ui:97
+msgid "Reply All"
+msgstr "להשיב לכולם"
+
+#: ui/components-conversation-actions.ui:118
+msgid "Forward"
+msgstr "העברה"
+
+#: ui/components-conversation-actions.ui:147
+msgid "_Archive"
+msgstr "תיוק ב_ארכיון"
+
+#: ui/components-conversation-actions.ui:191
+msgid "Toggle find bar"
+msgstr "הצגת סרגל החיפוש"
+
+#: ui/components-conversation-header-bar.ui:20 ui/main-toolbar.ui:76
+msgid "Back"
+msgstr "אחורה"
+
+#: ui/components-inspector-error-view.ui:27
 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 "
@@ -3304,106 +3163,98 @@ msgstr ""
 "wiki.gnome.org/Apps/Geary/Contact\">ערוצי הקשר</a> או לצרף אל <a href="
 "\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>דיווח על תקלה חדשה</a>."
 
-#: ui/components-inspector-error-view.ui:47
-#| msgid "_Details"
+#: ui/components-inspector-error-view.ui:42
 msgid "Details:"
 msgstr "פרטים:"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:24
-#| msgid "Search for more languages"
+#: ui/components-inspector.ui:16 ui/problem-details-dialog.ui:21
 msgid "Search for matching log entries"
 msgstr "חיפוש עבור התאמות ברשומות היומן"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:35
+#: ui/components-inspector.ui:30
 msgid "Toggle appending new log entries"
-msgstr ""
+msgstr "הוספת שורות חדשות ליומן"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:55
+#: ui/components-inspector.ui:48
 msgid "Add a marker entry to the log"
-msgstr ""
+msgstr "הוספת שורה מודגשת ליומן"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
+#: ui/components-inspector.ui:71 ui/problem-details-dialog.ui:45
 msgid "Save logs entries and details"
 msgstr "שמירת רשומות היומן ופרטיו"
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
-#: ui/components-inspector.ui:101 ui/problem-details-dialog.ui:67
+#: ui/components-inspector.ui:89 ui/problem-details-dialog.ui:60
 msgid "Copy to clipboard"
 msgstr "העתקה ללוח הגזירים"
 
 #. Tooltip for inspector button
-#: ui/components-inspector.ui:121
+#: ui/components-inspector.ui:107
 msgid "Clears all log entries"
 msgstr "ניקוי כל רשומות היומן"
 
-#: ui/conversation-contact-popover.ui:146
-#| msgid "Move conversation"
+#: ui/conversation-contact-popover.ui:132
 msgid "New Conversation…"
 msgstr "תכתובת חדשה…"
 
-#: ui/conversation-contact-popover.ui:159
-#| msgid "Copy _Email Address"
+#: ui/conversation-contact-popover.ui:144
 msgid "Copy Email Address"
 msgstr "העתקת כתובת דוא״ל"
 
-#: ui/conversation-contact-popover.ui:182
+#: ui/conversation-contact-popover.ui:165
 msgid "Save in Contacts…"
 msgstr "שמירה באנשי הקשר…"
 
-#: ui/conversation-contact-popover.ui:195
-#| msgid "Move conversations"
+#: ui/conversation-contact-popover.ui:177
 msgid "Show Conversations"
 msgstr "הצגת תכתובות"
 
-#: ui/conversation-contact-popover.ui:208
+#: ui/conversation-contact-popover.ui:189
 msgid "Open in Contacts"
 msgstr "פתיחה באנשי קשר"
 
-#: ui/conversation-contact-popover.ui:221
+#: ui/conversation-contact-popover.ui:201
 msgid "Always Load Remote Images"
 msgstr "תמיד לטעון תמונות מרוחקות"
 
 #. Title label on contact popover
-#: ui/conversation-contact-popover.ui:264
-#| msgid "Remove email address"
+#: ui/conversation-contact-popover.ui:240
 msgid "Deceptive email address"
 msgstr "כתובת דוא״ל מטעה"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:294
-#| msgid "Email address:"
+#: ui/conversation-contact-popover.ui:268
 msgid "This email address is:"
 msgstr "כתובת דוא״ל זו היא:"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:319
+#: ui/conversation-contact-popover.ui:291
 msgid "But was forged as:"
 msgstr "אבל הוצגה כ:"
 
 #. Contact popover label
-#: ui/conversation-contact-popover.ui:344
+#: ui/conversation-contact-popover.ui:314
 msgid "The sender may not be trustworthy"
 msgstr "השולח עשוי להיות לא אמין"
 
-#: ui/conversation-email.ui:27
-#| msgid "Save All A_ttachments..."
+#: ui/conversation-email.ui:24
 msgid "Save all attachments"
 msgstr "שמירת כל הקבצים המצורפים"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
-#: ui/conversation-email.ui:50
+#: ui/conversation-email.ui:45
 msgid "Mark this message as starred"
 msgstr "לסמן הודעה זו בכוכב"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
-#: ui/conversation-email.ui:72
+#: ui/conversation-email.ui:65
 msgid "Mark this message as not starred"
 msgstr "לבטל סימון הודעה זו בכוכב"
 
@@ -3415,12 +3266,10 @@ msgstr "להשיב ל_כולם"
 #. Translators: Menu item to mark a specific message as
 #. read.
 #: ui/conversation-email-menus.ui:30
-#| msgid "_Mark as Read"
 msgid "_Mark Read"
 msgstr "סימון כ_נקרא"
 
 #: ui/conversation-email-menus.ui:36
-#| msgid "_Mark as Unread"
 msgid "_Mark Unread"
 msgstr "סימון כ_לא נקרא"
 
@@ -3438,7 +3287,6 @@ msgstr "העברת הודעה ל_אשפה"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-#| msgid "Select _Message"
 msgid "_Delete message…"
 msgstr "_מחיקת הודעה…"
 
@@ -3447,484 +3295,423 @@ msgstr "_מחיקת הודעה…"
 msgid "_View Source"
 msgstr "צפייה ב_מקור"
 
-#: ui/conversation-message-link-popover.ui:54
-#| msgid "but actually goes to"
+#: ui/conversation-message-link-popover.ui:49
 msgid "But actually goes to:"
 msgstr "אך למעשה הולך אל:"
 
-#: ui/conversation-message-link-popover.ui:84
-#| msgid "This link appears to go to"
+#: ui/conversation-message-link-popover.ui:77
 msgid "The link appears to go to:"
 msgstr "הקישור מראה שהוא הולך אל:"
 
-#: ui/conversation-message-link-popover.ui:96
+#: ui/conversation-message-link-popover.ui:88
 msgid "Deceptive link found"
 msgstr "נמצא קישור מטעה"
 
-#: ui/conversation-message-link-popover.ui:111
+#: ui/conversation-message-link-popover.ui:102
 msgid "The email sender may be leading you to the wrong web site."
 msgstr "שולח ההודעה עשוי להוביל אותך לאתר אינטרנט לא נכון."
 
-#: ui/conversation-message-link-popover.ui:124
+#: ui/conversation-message-link-popover.ui:114
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr "אם יש לך ספק, כדאי ליצור קשר עם השולח ולשאול אותו לפני התקדמות."
 
 #: ui/conversation-message-menus.ui:7
-#| msgid "_Open"
 msgid "_Open Link"
 msgstr "_פתיחת קישור"
 
 #: ui/conversation-message-menus.ui:11
-#| msgid "Copy _Email Address"
 msgid "Copy Link _Address"
 msgstr "העתקת כתובת _קישור"
 
 #: ui/conversation-message-menus.ui:17
-#| msgid "Move conversation"
 msgid "_New Conversation…"
 msgstr "_תכתובת חדשה…"
 
 #: ui/conversation-message-menus.ui:21
-#| msgid "Copy _Email Address"
 msgid "Copy Email _Address"
 msgstr "העתקת כתובת _דוא״ל"
 
 #: ui/conversation-message-menus.ui:27
-#| msgid "_Save Image As..."
 msgid "Save _Image As…"
 msgstr "שמירת _תמונה בשם…"
 
 #: ui/conversation-message-menus.ui:33
-#| msgid "Select _All"
 msgid "_Select All"
 msgstr "בחירת ה_כול"
 
-#: ui/conversation-message.ui:63
+#: ui/conversation-message.ui:54
 msgid "From <email>"
 msgstr "מאת <email>"
 
-#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
+#: ui/conversation-message.ui:69 ui/conversation-message.ui:160
 msgid "1/1/1970\t"
 msgstr "1/1/1970\t"
 
-#: ui/conversation-message.ui:102
+#: ui/conversation-message.ui:91
 msgid "Preview body text."
 msgstr "תצוגה מקדימה של גוף הטקסט"
 
-#: ui/conversation-message.ui:202
+#: ui/conversation-message.ui:182
 msgid "Sent by:"
 msgstr "נשלח על ידי:"
 
-#: ui/conversation-message.ui:247
-#| msgid "Reply-To: "
+#: ui/conversation-message.ui:223
 msgid "Reply to:"
 msgstr "להשיב אל:"
 
-#: ui/conversation-message.ui:291
-#| msgid "Subject:"
+#: ui/conversation-message.ui:264
 msgid "Subject"
 msgstr "נושא"
 
-#: ui/conversation-viewer.ui:60
-#| msgid "Mark conversation"
+#: ui/conversation-viewer.ui:53
 msgid "Find in conversation"
 msgstr "חיפוש בתכתובת"
 
-#: ui/conversation-viewer.ui:75
+#: ui/conversation-viewer.ui:67
 msgid "Find the previous occurrence of the search string."
 msgstr "חיפוש המופע הקודם של המילה או הביטוי."
 
-#: ui/conversation-viewer.ui:96
+#: ui/conversation-viewer.ui:86
 msgid "Find the next occurrence of the search string."
 msgstr "חיפוש המופע הבא של המילה או הביטוי."
 
-#: ui/find_bar.glade:66
+#: ui/find_bar.glade:58
 msgid "Find:"
 msgstr "חיפוש:"
 
-#: ui/find_bar.glade:89
+#: ui/find_bar.glade:80
 msgid "_Previous"
 msgstr "ה_קודם"
 
-#: ui/find_bar.glade:107
+#: ui/find_bar.glade:97
 msgid "_Next"
 msgstr "ה_בא"
 
-#: ui/find_bar.glade:125
+#: ui/find_bar.glade:114
 msgid "_Case sensitive"
 msgstr "התאמת _רישיות"
 
-#: ui/find_bar.glade:145
+#: ui/find_bar.glade:132
 msgid "label"
 msgstr "תוויות"
 
-#: ui/gtk/help-overlay.ui:9
-#| msgid "%s - Conversation Inspector"
+#: ui/gtk/help-overlay.ui:8
 msgid "Conversation Shortcuts"
 msgstr "צירופי מקשים לתכתובת"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
-#| msgid "Notifications"
+#: ui/gtk/help-overlay.ui:12 ui/gtk/help-overlay.ui:194
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "פעולות"
 
-#: ui/gtk/help-overlay.ui:17
-#| msgid "Move conversation"
+#: ui/gtk/help-overlay.ui:16
 msgctxt "shortcut window"
 msgid "New conversation"
 msgstr "תכתובת חדשה"
 
-#: ui/gtk/help-overlay.ui:24
-#| msgid "Reply to _All"
+#: ui/gtk/help-overlay.ui:23
 msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "להשיב לשולח"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
-#| msgid "Reply to _All"
+#: ui/gtk/help-overlay.ui:30 ui/gtk/help-overlay.ui:450
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "להשיב לכולם"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
-#| msgid "_Forward"
+#: ui/gtk/help-overlay.ui:37 ui/gtk/help-overlay.ui:457
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "העברה"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
+#: ui/gtk/help-overlay.ui:44 ui/gtk/help-overlay.ui:464
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "סימון/ביטול סימן כנקרא"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
+#: ui/gtk/help-overlay.ui:51 ui/gtk/help-overlay.ui:471
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "סימון/ביטול סימון כמכוכב"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
-#| msgid "Archive conversations (A)"
+#: ui/gtk/help-overlay.ui:58 ui/gtk/help-overlay.ui:478
 msgctxt "shortcut window"
 msgid "Archive conversations"
 msgstr "תיוק שיחות בארכיון"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
-#| msgid "Move conversations"
+#: ui/gtk/help-overlay.ui:65 ui/gtk/help-overlay.ui:495
 msgctxt "shortcut window"
 msgid "Move conversations"
 msgstr "העברת תכתובות"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
-#| msgid "Mark conversations"
+#: ui/gtk/help-overlay.ui:72 ui/gtk/help-overlay.ui:502
 msgctxt "shortcut window"
 msgid "Label conversations"
 msgstr "סימון תכתובות"
 
-#: ui/gtk/help-overlay.ui:80
-#| msgid "Mark conversations"
+#: ui/gtk/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Trash conversations"
 msgstr "העברת תכתובות לאשפה"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
-#| msgid "Mark conversations"
+#: ui/gtk/help-overlay.ui:86 ui/gtk/help-overlay.ui:509
 msgctxt "shortcut window"
 msgid "Junk conversations"
 msgstr "העברת תכתובות לזבל"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
-#| msgid "Delete conversation"
+#: ui/gtk/help-overlay.ui:94 ui/gtk/help-overlay.ui:516
 msgctxt "shortcut window"
 msgid "Delete conversations"
 msgstr "מחיקת תכתובות"
 
-#: ui/gtk/help-overlay.ui:104
-#| msgid "Search"
+#: ui/gtk/help-overlay.ui:103
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "חיפוש"
 
-#: ui/gtk/help-overlay.ui:108
-#| msgid "Mark conversations"
+#: ui/gtk/help-overlay.ui:107
 msgctxt "shortcut window"
 msgid "Search for conversations"
 msgstr "חיפוש תכתובות"
 
-#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
-#| msgid "Add label to conversation"
+#: ui/gtk/help-overlay.ui:114 ui/gtk/help-overlay.ui:523
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "חיפוש בתכתובת הנוכחית"
 
-#: ui/gtk/help-overlay.ui:141
-#| msgid "_Undo"
+#: ui/gtk/help-overlay.ui:140
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "ביטול"
 
-#: ui/gtk/help-overlay.ui:145
+#: ui/gtk/help-overlay.ui:144
 msgctxt "shortcut window"
 msgid "Undo the last action"
 msgstr "ביטול הפעולה האחרונה"
 
-#: ui/gtk/help-overlay.ui:152
+#: ui/gtk/help-overlay.ui:151
 msgctxt "shortcut window"
 msgid "Redo the last action"
 msgstr "ביצוע חוזר של הפעולה האחרונה שבוטלה"
 
-#: ui/gtk/help-overlay.ui:161
+#: ui/gtk/help-overlay.ui:160
 msgctxt "shortcut window"
 msgid "View"
 msgstr "תצוגה"
 
-#: ui/gtk/help-overlay.ui:165
+#: ui/gtk/help-overlay.ui:164
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "התקרבות"
 
-#: ui/gtk/help-overlay.ui:172
+#: ui/gtk/help-overlay.ui:171
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "התרחקות"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:178
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "איפוס התקריב"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:404
-#| msgid "General"
-msgctxt "shortcut window"
-msgid "General"
-msgstr "כללי"
-
-#: ui/gtk/help-overlay.ui:192
-#| msgid "Show Images"
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "הצגת עזרה"
-
-#: ui/gtk/help-overlay.ui:199
-msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "הצגת צירופי מקשים"
-
-#: ui/gtk/help-overlay.ui:206
-#| msgid "Use %s to open a new composer window"
-msgctxt "shortcut window"
-msgid "Open a new window"
-msgstr "פתיחת חלון חדש"
-
-#: ui/gtk/help-overlay.ui:213
-msgctxt "shortcut window"
-msgid "Close the current window"
-msgstr "סגירת החלון הנוכחי"
-
-#: ui/gtk/help-overlay.ui:220
-msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "יציאה מהיישום"
-
-#: ui/gtk/help-overlay.ui:229
-msgctxt "shortcut window"
-msgid "Keyboard navigation"
-msgstr "ניווט באמצעות המקלדת"
-
-#: ui/gtk/help-overlay.ui:233
-msgctxt "shortcut window"
-msgid "Go to next/previous pane"
-msgstr "לעבור ללוח הבא/הקודם"
-
-#: ui/gtk/help-overlay.ui:241
-#| msgid "Delete conversation"
-msgctxt "shortcut window"
-msgid "Select next/previous conversation"
-msgstr "בחירת התכתובת הבאה/הקודמת"
-
-#: ui/gtk/help-overlay.ui:248
-msgctxt "shortcut window"
-msgid "Focus next/previous message"
-msgstr "מיקוד בהודעה הבאה/הקודמת"
-
-#: ui/gtk/help-overlay.ui:260
-msgid "Single-key Shortcuts"
-msgstr "קיצורים באמצעות מקש-יחיד"
-
-#: ui/gtk/help-overlay.ui:265
-msgctxt "shortcut window"
-msgid "Single-key shortcuts (if enabled)"
-msgstr "קיצורים באמצעות מקש יחיד (אם מאופשר)"
-
-#: ui/gtk/help-overlay.ui:274
-#| msgid "Reply to _All"
-msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "להשיב לשולח"
-
-#: ui/gtk/help-overlay.ui:361
-#| msgid "Delete conversation"
-msgctxt "shortcut window"
-msgid "Select next/previous conversations"
-msgstr "בחירת התכתובת הבאה/הקודמת"
-
-#: ui/gtk/help-overlay.ui:373
-#| msgid "Composer"
+#: ui/gtk/help-overlay.ui:190
 msgid "Composer Shortcuts"
 msgstr "קיצורים ליוצר ההודעות"
 
-#: ui/gtk/help-overlay.ui:381
-#| msgid "Send"
+#: ui/gtk/help-overlay.ui:198
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "שליחה"
 
-#: ui/gtk/help-overlay.ui:388
-#| msgctxt "Search operator"
-#| msgid "attachment"
+#: ui/gtk/help-overlay.ui:205
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "צירוף קובץ"
 
-#: ui/gtk/help-overlay.ui:395
+#: ui/gtk/help-overlay.ui:212
 msgctxt "shortcut window"
 msgid "Detach the composer"
 msgstr "ניתוק יוצר ההודעות"
 
-#: ui/gtk/help-overlay.ui:408
-#| msgid "Use %s to open a new composer window"
+#: ui/gtk/help-overlay.ui:221 ui/gtk/help-overlay.ui:350
+msgctxt "shortcut window"
+msgid "General"
+msgstr "כללי"
+
+#: ui/gtk/help-overlay.ui:225
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "סגירת חלון יוצר ההודעות"
 
-#: ui/gtk/help-overlay.ui:415
-#| msgid "Use %s to open a new composer window"
+#: ui/gtk/help-overlay.ui:232
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "ניתוק חלון יוצר ההודעות"
 
-#: ui/gtk/help-overlay.ui:422
-#| msgid "Edit"
+#: ui/gtk/help-overlay.ui:239
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "עריכה"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:244
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "העברת הבחירה ללוח הגזירים"
 
-#: ui/gtk/help-overlay.ui:434
+#: ui/gtk/help-overlay.ui:251
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "העתקת הבחירה ללוח הגזירים"
 
-#: ui/gtk/help-overlay.ui:441
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "הדבקה מלוח הגזירים"
 
-#: ui/gtk/help-overlay.ui:448
-#| msgid "Quote text  (Ctrl+])"
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "ציטוט טקסט"
 
-#: ui/gtk/help-overlay.ui:455
-#| msgid "Unquote text (Ctrl+[)"
+#: ui/gtk/help-overlay.ui:272
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "סוף ציטוט טקסט"
 
-#: ui/gtk/help-overlay.ui:464
+#: ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "עריכת טקסט עשירה"
 
-#: ui/gtk/help-overlay.ui:468
-#| msgctxt "Clipboard paste with rich text"
-#| msgid "Paste _With Formatting"
+#: ui/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "הדבקה ללא עיצוב"
 
-#: ui/gtk/help-overlay.ui:475
+#: ui/gtk/help-overlay.ui:292
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "טקסט מודגש"
 
-#: ui/gtk/help-overlay.ui:482
+#: ui/gtk/help-overlay.ui:299
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "טקסט נטוי"
 
-#: ui/gtk/help-overlay.ui:489
-#| msgid "Underline (Ctrl+U)"
+#: ui/gtk/help-overlay.ui:306
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "טקסט עם קו תחתי"
 
-#: ui/gtk/help-overlay.ui:496
+#: ui/gtk/help-overlay.ui:313
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "טקסט עם קו חוצה"
 
-#: ui/gtk/help-overlay.ui:503
-#| msgid "Remove formatting (Ctrl+Space)"
+#: ui/gtk/help-overlay.ui:320
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "הסרת עיצוב"
 
-#: ui/gtk/help-overlay.ui:510
+#: ui/gtk/help-overlay.ui:327
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "הכנסת תמונה"
 
-#: ui/gtk/help-overlay.ui:517
+#: ui/gtk/help-overlay.ui:334
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "הכנסת קישור"
 
-#: ui/main-toolbar.ui:24
-#| msgid "Compose Message"
-msgctxt "tooltip"
-msgid "Compose Message"
-msgstr "יצירת הודעה"
+#: ui/gtk/help-overlay.ui:346
+#| msgid "Application Menu"
+msgid "Application Shortcuts"
+msgstr "צירופי מקשים ליישום"
 
-#: ui/main-toolbar.ui:62
-msgid "Toggle search bar"
-msgstr "הצגת סרגל החיפוש"
+#: ui/gtk/help-overlay.ui:354
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "הצגת עזרה"
 
-#: ui/main-toolbar.ui:114
-#| msgid "_Reply"
-msgid "Reply"
-msgstr "להשיב"
+#: ui/gtk/help-overlay.ui:361
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr "הצגת צירופי מקשים"
 
-#: ui/main-toolbar.ui:137
-#| msgid "R_eply All"
-msgid "Reply All"
-msgstr "להשיב לכולם"
+#: ui/gtk/help-overlay.ui:368
+msgctxt "shortcut window"
+msgid "Open a new window"
+msgstr "פתיחת חלון חדש"
 
-#: ui/main-toolbar.ui:160
-#| msgid "_Forward"
-msgid "Forward"
-msgstr "העברה"
+#: ui/gtk/help-overlay.ui:375
+msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "סגירת החלון הנוכחי"
 
-#: ui/main-toolbar.ui:265
-#| msgid "Toggle search bar"
-msgid "Toggle find bar"
-msgstr "הצגת סרגל החיפוש"
+#: ui/gtk/help-overlay.ui:382
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr "יציאה מהיישום"
 
-#: ui/main-toolbar.ui:286
-msgid "_Archive"
-msgstr "תיוק ב_ארכיון"
+#: ui/gtk/help-overlay.ui:391
+msgctxt "shortcut window"
+msgid "Keyboard navigation"
+msgstr "ניווט באמצעות המקלדת"
+
+#: ui/gtk/help-overlay.ui:395
+#| msgid "Select Color"
+msgctxt "shortcut window"
+msgid "Select Inbox"
+msgstr "בחירת דואר נכנס"
+
+#: ui/gtk/help-overlay.ui:402
+msgctxt "shortcut window"
+msgid "Go to next/previous pane"
+msgstr "לעבור ללוח הבא/הקודם"
+
+#: ui/gtk/help-overlay.ui:410
+msgctxt "shortcut window"
+msgid "Select next/previous conversation"
+msgstr "בחירת התכתובת הבאה/הקודמת"
+
+#: ui/gtk/help-overlay.ui:417
+msgctxt "shortcut window"
+msgid "Focus next/previous message"
+msgstr "מיקוד בהודעה הבאה/הקודמת"
+
+#: ui/gtk/help-overlay.ui:429
+msgid "Single-key Shortcuts"
+msgstr "קיצורים באמצעות מקש-יחיד"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "קיצורים באמצעות מקש יחיד (אם מאופשר)"
+
+#: ui/gtk/help-overlay.ui:443
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "להשיב לשולח"
+
+#: ui/gtk/help-overlay.ui:530
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "בחירת התכתובת הבאה/הקודמת"
+
+#: ui/main-toolbar.ui:93
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "יצירת הודעה"
+
+#: ui/main-toolbar.ui:109
+msgid "Toggle search bar"
+msgstr "הצגת סרגל החיפוש"
 
 #: ui/main-toolbar-menus.ui:21
 msgid "Toggle as _Junk"
 msgstr "סימון/ביטול סימון כ_זבל"
 
 #: ui/main-toolbar-menus.ui:28
-#| msgid "Accounts"
 msgid "_Accounts"
 msgstr "_חשבונות"
 
@@ -3933,29 +3720,78 @@ msgid "_Keyboard Shortcuts"
 msgstr "_צירופי מקשים"
 
 #: ui/main-toolbar-menus.ui:47
-#| msgid "_About"
 msgid "_About Geary"
 msgstr "על _אודות Geary"
 
-#: ui/password-dialog.glade:74
+#: ui/password-dialog.glade:66
 msgid "SMTP Credentials"
 msgstr "אישורי SMTP"
 
-#: ui/password-dialog.glade:91
+#: ui/password-dialog.glade:82
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ui/password-dialog.glade:152
+#: ui/password-dialog.glade:140
 msgid "_Remember password"
 msgstr "שמירת ה_ססמה"
 
-#: ui/password-dialog.glade:210
+#: ui/password-dialog.glade:195
 msgid "_Authenticate"
 msgstr "אי_מות"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "‏Geary בתהליך שדרוג…"
+#~ msgid "Position of folder list pane"
+#~ msgstr "Position of folder list pane"
+
+#~ msgid "Position of the folder list Paned grabber."
+#~ msgstr "Position of the folder list Paned grabber."
+
+#~ msgid "Position of folder list pane when horizontal"
+#~ msgstr "Position of folder list pane when horizontal"
+
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the horizontal orientation."
+#~ msgstr ""
+#~ "Position of the folder list Paned grabber in the horizontal orientation."
+
+#~ msgid "Position of folder list pane when vertical"
+#~ msgstr "Position of folder list pane when vertical"
+
+#~ msgid ""
+#~ "Position of the folder list Paned grabber in the vertical orientation."
+#~ msgstr ""
+#~ "Position of the folder list Paned grabber in the vertical orientation."
+
+#~ msgid "Orientation of the folder list pane"
+#~ msgstr "Orientation of the folder list pane"
+
+#~ msgid "True if the folder list Paned is in the horizontal orientation."
+#~ msgstr "True if the folder list Paned is in the horizontal orientation."
+
+#~ msgid "Position of message list pane"
+#~ msgstr "Position of message list pane"
+
+#~ msgid "Position of the message list Paned grabber."
+#~ msgstr "Position of the message list Paned grabber."
+
+#~ msgid "Use _three pane view"
+#~ msgstr "שימוש ב_שלוש חלוניות תצוגה"
+
+#~| msgid "%a, %b %-e, %Y at %-l:%M %p"
+#~ msgid "%a, %b %-e, %Y at %l:%M %P"
+#~ msgstr "%a, %b %-e, %Y בשעה %l:%M %p"
+
+#~| msgid "%a, %b %-e, %Y at %-l:%M %p"
+#~ msgid "%a, %b %-e, %Y at %H:%M"
+#~ msgstr "%a, %b %-e, %Y בשעה %H:%M"
+
+#~ msgid "Confirm removing: %s"
+#~ msgstr "אישור הסרה: %s"
+
+#~ msgid "Remove account"
+#~ msgstr "הסרת חשבון"
+
+#~ msgid "_Reply-To"
+#~ msgstr "לה_שיב אל"
 
 #~ msgid "Mail Client"
 #~ msgstr "לקוח דוא״ל"
@@ -4480,9 +4316,6 @@ msgstr "‏Geary בתהליך שדרוג…"
 #~ msgid "_Donate"
 #~ msgstr "_תרומה"
 
-#~ msgid "Application Menu"
-#~ msgstr "תפריט יישום"
-
 #~ msgid "_Delete"
 #~ msgstr "_מחיקה"
 


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