From 151f5ee66ccc79059977ce8afe865f87f28b12ac Mon Sep 17 00:00:00 2001
From: Yosef Or Boczko <yoseforb@gnome.org>
Date: Tue, 29 Sep 2020 14:05:42 +0000
Subject: [PATCH 034/124] Update Hebrew translation

(cherry picked from commit 710dd09e1bfbc8ce3fa7ec848cecc276c7e53dbe)
---
 po/he.po | 5285 ++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 3732 insertions(+), 1553 deletions(-)

diff --git a/po/he.po b/po/he.po
index fd4edac1..831b0707 100644
--- a/po/he.po
+++ b/po/he.po
@@ -10,510 +10,1145 @@
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2012-2013
 # yoseforb <yoseforb@gmail.com>, 2013
 # yoseforb <yoseforb@gmail.com>, 2013
-# Yosef Or Boczko <yoseforb@gnome.org>, 2013, 2014, 2015.
+# Yosef Or Boczko <yoseforb@gmail.com>, 2013-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-09 23:56+0300\n"
-"PO-Revision-Date: 2016-08-10 00:06+0300\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"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
-"Language-Team: עברית <>\n"
+"Language-Team: Hebrew <yoseforb@gmail.com>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "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 2.91.6\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2\n"
+"X-Generator: Gtranslator 3.36.0\n"
 
-#: ../desktop/geary.desktop.in.h:1 ../desktop/geary-autostart.desktop.in.h:1
-msgid "Geary"
-msgstr "Geary"
-
-#: ../desktop/geary.desktop.in.h:2 ../desktop/geary-autostart.desktop.in.h:2
-#: ../src/client/application/geary-application.vala:18
-msgid "Mail Client"
-msgstr "לקוח דוא״ל"
-
-#: ../desktop/geary.desktop.in.h:3 ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "דואר אלקטרוני Geary"
-
-#: ../desktop/geary.desktop.in.h:4 ../desktop/geary-autostart.desktop.in.h:4
-msgid "Send and receive email"
-msgstr "שליחה וקבלה של דוא״ל"
-
-#: ../desktop/geary.desktop.in.h:5 ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "דוא״ל;דואר אלקטרוני;דואר;"
-
-#: ../desktop/geary.desktop.in.h:6
-msgid "Compose Message"
-msgstr "יצירת הודעה"
-
-#: ../desktop/geary-attach.contract.in.h:1
+#: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
 msgstr "שליחה על ידי דוא״ל"
 
-#: ../desktop/geary-attach.contract.in.h:2
+#: desktop/geary-attach.contract.desktop.in:6
 msgid "Send files using Geary"
 msgstr "שליחת קבצים באמצעות Geary"
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-msgid "_Save"
-msgstr "_שמירה"
-
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "_הוספה"
-
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
-#, c-format
-msgid "Additional addresses for %s"
-msgstr "כתובות נוספות עבור %s"
-
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "משתמשים"
-
-#. Copyright 2016 Software Freedom Conservancy Inc.
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "שם פרטי שם משפחה"
-
-#: ../src/client/accounts/add-edit-page.vala:235
-msgid "Welcome to Geary."
-msgstr "ברוך בואך ל־Geary."
-
-#: ../src/client/accounts/add-edit-page.vala:235
-msgid "Enter your account information to get started."
-msgstr "נא להזין את פרטי החשבון שלך כדי להתחיל."
-
-#: ../src/client/accounts/add-edit-page.vala:255
-msgid "2 weeks back"
-msgstr "שבועיים אחורנית"
+#. Translators: The application name
+#: 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
+msgid "Geary"
+msgstr "Geary"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:256
-msgid "1 month back"
-msgstr "חודש אחד אחורנית"
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
+#| msgid "Gmail"
+msgid "Email"
+msgstr "דוא״ל"
+
+#. Translators: The application's summary / tagline
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:15
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:33
+msgid "Send and receive email"
+msgstr "שליחה וקבלה של דוא״ל"
 
-#: ../src/client/accounts/add-edit-page.vala:257
-msgid "3 months back"
-msgstr "שלושה חודשים אחורנית"
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: desktop/geary-autostart.desktop.in.in:7
+msgid "Email;E-mail;Mail;"
+msgstr "דוא״ל;דואר אלקטרוני;דואר;מייל;אימייל;אי מייל;מיילים;הודעות;"
 
-#: ../src/client/accounts/add-edit-page.vala:258
-msgid "6 months back"
-msgstr "שישה חודשים אחורנית"
+#. Translators: The development team's name
+#: desktop/org.gnome.Geary.appdata.xml.in.in:13
+msgid "Geary Development Team"
+msgstr "צוות פיתוח Geary"
 
-#: ../src/client/accounts/add-edit-page.vala:259
-msgid "1 year back"
-msgstr "שנה אחת אחורנית"
+#: desktop/org.gnome.Geary.appdata.xml.in.in:17
+msgid ""
+"Geary is an email application built around conversations, for the GNOME 3 "
+"desktop. It allows you to read, find and send email with a straightforward, "
+"modern interface."
+msgstr ""
+"‏Geary הוא יישם דוא״ל הבנוי סביב תכתובות, עבור שולחן העבודה GNOME 3. הוא "
+"מאפשר לקרוא, למצוא ולשלוח דוא״ל עם ממשק חדיש ופשוט."
 
-#: ../src/client/accounts/add-edit-page.vala:260
-msgid "2 years back"
-msgstr "שנתיים אחורנית"
+#: desktop/org.gnome.Geary.appdata.xml.in.in:22
+msgid ""
+"Conversations allow you to read a complete discussion without having to find "
+"and click from message to message."
+msgstr "תכתובות מאפשר לך לקרוא דיון שלם ללא הצורך למצוא וללחוץ מהודעה להודעה."
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:26
+msgid "Geary’s features include:"
+msgstr "תכונות Geary כוללות:"
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:28
+msgid "Quick email account setup"
+msgstr "הגדרה מהירה של חשבון דוא״ל"
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
+msgid "Shows related messages together in conversations"
+msgstr "הצגת הודעות קשורות יחד בתכתובות"
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
+msgid "Fast, full text and keyword search"
+msgstr "חיפוש מילים מהיר ובכל הטקסט"
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
+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 "הצגת התרעות על קבלת דואר חדש"
+
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
+msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
+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 מציג תכתובת"
+
+#. Translators: A screenshot description.
+#: desktop/org.gnome.Geary.appdata.xml.in.in:58
+msgid "Geary showing the rich text composer"
+msgstr "‏Geary מציג יצירת הודעה בטקסט עשיר"
+
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: desktop/org.gnome.Geary.desktop.in.in:7
+msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
+msgstr ""
+"דואר;דואר אלקטרוני;דוא״ל;דואל;מייל;אימייל;Gmail;GMaillYahoo;Hotmail;Outlook;"
 
-#: ../src/client/accounts/add-edit-page.vala:261
-msgid "4 years back"
-msgstr "ארבע שנים אחורנית"
+#: desktop/org.gnome.Geary.desktop.in.in:22
+msgid "Compose Message"
+msgstr "יצירת הודעה"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:263
-msgid "Everything"
-msgstr "הכל"
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "חלון חדש"
 
-#: ../src/client/accounts/add-edit-page.vala:282
-msgid "Edit"
-msgstr "עריכה"
+#: desktop/org.gnome.Geary.gschema.xml:8
+msgid "Maximize window"
+msgstr "Maximize window"
 
-#: ../src/client/accounts/add-edit-page.vala:284
-msgid "Preview"
-msgstr "תצוגה מקדימה"
+#: desktop/org.gnome.Geary.gschema.xml:9
+msgid "True if the application window is maximized, false otherwise."
+msgstr "True if the application window is maximized, false otherwise."
 
-#: ../src/client/accounts/add-edit-page.vala:738
-msgid "Remem_ber passwords"
-msgstr "זכירת סס_מאות"
+#: desktop/org.gnome.Geary.gschema.xml:14
+msgid "Width of window"
+msgstr "Width of window"
 
-#: ../src/client/accounts/add-edit-page.vala:745 ../ui/login.glade.h:6
-msgid "Remem_ber password"
-msgstr "זכירת _ססמה"
+#: desktop/org.gnome.Geary.gschema.xml:15
+msgid "The last recorded width of the application window."
+msgstr "The last recorded width of the application window."
 
-#: ../src/client/accounts/add-edit-page.vala:779
-msgid "Unable to validate:\n"
-msgstr "לא ניתן לאמת לאמת:\n"
+#: desktop/org.gnome.Geary.gschema.xml:20
+msgid "Height of window"
+msgstr "Height of window"
 
-#: ../src/client/accounts/add-edit-page.vala:781
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; כינוי חשבון לא חוקי.\n"
+#: desktop/org.gnome.Geary.gschema.xml:21
+msgid "The last recorded height of the application window."
+msgstr "The last recorded height of the application window."
 
-#: ../src/client/accounts/add-edit-page.vala:784
-msgid "        &#8226; Email address already added to Geary.\n"
-msgstr "        &#8226; כתובת דוא״ל זה כבר נוסף ל־Geary.\n"
+#: desktop/org.gnome.Geary.gschema.xml:26
+msgid "Position of folder list pane"
+msgstr "Position of folder list pane"
 
-#: ../src/client/accounts/add-edit-page.vala:788
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP בעיית חיבור.\n"
+#: desktop/org.gnome.Geary.gschema.xml:27
+msgid "Position of the folder list Paned grabber."
+msgstr "Position of the folder list Paned grabber."
 
-#: ../src/client/accounts/add-edit-page.vala:791
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "&#8226; שם משתמש או ססמת ה־IMAP שגויים.\n"
+#: desktop/org.gnome.Geary.gschema.xml:32
+msgid "Position of folder list pane when horizontal"
+msgstr "Position of folder list pane when horizontal"
 
-#: ../src/client/accounts/add-edit-page.vala:794
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP בעיית חיבור.\n"
+#: 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."
 
-#: ../src/client/accounts/add-edit-page.vala:797
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; שם משתמש או ססמת SMTP אינם נכונים.\n"
+#: desktop/org.gnome.Geary.gschema.xml:38
+msgid "Position of folder list pane when vertical"
+msgstr "Position of folder list pane when vertical"
 
-#: ../src/client/accounts/add-edit-page.vala:801
-msgid "        &#8226; Connection error.\n"
-msgstr "&#8226; בעיית חיבור.\n"
+#: 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."
 
-#: ../src/client/accounts/add-edit-page.vala:805
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; שם משתמש או ססמה אינם נכונים.\n"
+#: desktop/org.gnome.Geary.gschema.xml:44
+msgid "Orientation of the folder list pane"
+msgstr "Orientation of the folder list pane"
 
-#: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "כל הזכויות שמורות למוסד לחופש התכנה בע״מ. 2016"
+#: 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."
 
-#: ../src/client/application/geary-application.vala:21
-msgid "Visit the Geary web site"
-msgstr "ביקור באתר Geary"
+#: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Show/hide formatting toolbar"
 
-#: ../src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Start Geary with hidden main window"
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr "True if the formatting toolbar in the composer is shown."
 
-#: ../src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "הצגת מידע שיסייע באיתור תקלות"
+#: desktop/org.gnome.Geary.gschema.xml:56
+msgid "Position of message list pane"
+msgstr "Position of message list pane"
 
-#: ../src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "ביצוע רישום של מעקב תכתובות"
+#: desktop/org.gnome.Geary.gschema.xml:57
+msgid "Position of the message list Paned grabber."
+msgstr "Position of the message list Paned grabber."
 
-#: ../src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "ביצוע רישום של network deserialization"
+#: desktop/org.gnome.Geary.gschema.xml:62
+#| msgid "_Automatically select next message"
+msgid "Autoselect next message"
+msgstr "Autoselect next message"
 
-#: ../src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "ביצוע רישום של פעילות הרשת"
+#: desktop/org.gnome.Geary.gschema.xml:63
+msgid "True if we should autoselect the next available conversation."
+msgstr "True if we should autoselect the next available conversation."
 
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:17
-msgid "Log IMAP replay queue"
-msgstr "ביצוע רישום של replay queue ב־IMAP"
+#: desktop/org.gnome.Geary.gschema.xml:68
+#| msgid "_Display conversation preview"
+msgid "Display message previews"
+msgstr "Display message previews"
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "ביצוע רישום של network serialization"
+#: desktop/org.gnome.Geary.gschema.xml:69
+msgid "True if we should display a short preview of each message."
+msgstr "True if we should display a short preview of each message."
 
-#: ../src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "ביצוע רישום של פעילות תקופתית"
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Use single key shortcuts"
 
-#: ../src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "ביצוע רישום שאילתות למסד הנתונים (מייצר כמות רבה של הודעות)"
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
 
-#. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "ביצוע רישום של folder normalization"
+#: desktop/org.gnome.Geary.gschema.xml:82
+msgid "Languages that shall be used in the spell checker"
+msgstr "Languages that shall be used in the spell checker"
 
-#: ../src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "לאפשר בדיקה של WebView"
+#: desktop/org.gnome.Geary.gschema.xml:83
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
+msgstr ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
 
-#: ../src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "לשלול כל אישורי שרת עם אזהרות TLS"
+#: desktop/org.gnome.Geary.gschema.xml:90
+msgid "Languages that are displayed in the spell checker popover"
+msgstr "Languages that are displayed in the spell checker popover"
 
-#: ../src/client/application/geary-args.vala:27
-msgid "Display program version"
-msgstr "הצגת גרסת התכנה"
+#: desktop/org.gnome.Geary.gschema.xml:91
+msgid ""
+"List of languages that are always displayed in the popover of the spell "
+"checker."
+msgstr ""
+"List of languages that are always displayed in the popover of the spell "
+"checker."
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:51
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "יש להשתמש %s לפתיחת חלון יצירת הודעה חדשה חדש"
+#: desktop/org.gnome.Geary.gschema.xml:96
+#| msgid "Notify of new mail at start_up"
+msgid "Notify of new mail at startup"
+msgstr "Notify of new mail at startup"
 
-#: ../src/client/application/geary-args.vala:52
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "נא לשלוח הערות, הצעות ודיווחי תקלות לכתובת:"
+#: desktop/org.gnome.Geary.gschema.xml:97
+#| msgid "Notify of new mail at start_up"
+msgid "True to notify of new mail at startup."
+msgstr "True to notify of new mail at startup."
 
-#. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:59
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "ניתוח הפרמטרים שהועברו בשורת הפקודה נכשל: %s\n"
+#: desktop/org.gnome.Geary.gschema.xml:102
+msgid "Ask when opening an attachment"
+msgstr "Ask when opening an attachment"
 
-#: ../src/client/application/geary-args.vala:70
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "הפרמטרים לשורת הפקודה אינם מוכרים: „%s”\n"
+#: desktop/org.gnome.Geary.gschema.xml:103
+#| msgid "To add them as attachments"
+msgid "True to ask when opening an attachment."
+msgstr "True to ask when opening an attachment."
 
-#: ../src/client/application/geary-controller.vala:60
-msgid "Delete conversation"
-msgstr "מחיקת שיחה"
+#: desktop/org.gnome.Geary.gschema.xml:108
+msgid "Whether to compose emails in HTML"
+msgstr "Whether to compose emails in HTML"
 
-#: ../src/client/application/geary-controller.vala:61
-msgid "Delete conversation (Shift+Delete)"
-msgstr "מחיקת שיחה (Shift+Delete)"
+#: desktop/org.gnome.Geary.gschema.xml:109
+msgid "True to compose emails in HTML; false for plain text."
+msgstr "True to compose emails in HTML; false for plain text."
 
-#: ../src/client/application/geary-controller.vala:62
-msgid "Delete conversations (Shift+Delete)"
-msgstr "מחיקת שיחות (Shift+Delete)"
+#: desktop/org.gnome.Geary.gschema.xml:114
+msgid "Advisory strategy for full-text searching"
+msgstr "Advisory strategy for full-text searching"
 
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:66
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "הזזת שיחה לאשפה (Delete, Backspace)"
+#: desktop/org.gnome.Geary.gschema.xml:115
+msgid ""
+"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
+msgstr ""
+"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 
-#: ../src/client/application/geary-controller.vala:67
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "הזזת שיחות לאשפה (Delete, Backspace)"
+#: desktop/org.gnome.Geary.gschema.xml:120
+#| msgid "No conversations in folder."
+msgid "Zoom of conversation viewer"
+msgstr "Zoom of conversation viewer"
 
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:71
-msgid "_Archive"
-msgstr "תיוק ב_ארכיון"
+#: desktop/org.gnome.Geary.gschema.xml:121
+msgid "The zoom to apply on the conservation view."
+msgstr "The zoom to apply on the conservation view."
 
-#: ../src/client/application/geary-controller.vala:72
-msgid "Archive conversation (A)"
-msgstr "תיוק שיחה בארכיון (ש)"
+#: desktop/org.gnome.Geary.gschema.xml:126
+#| msgid "Use %s to open a new composer window"
+msgid "Size of detached composer window"
+msgstr "Size of detached composer window"
 
-#: ../src/client/application/geary-controller.vala:73
-msgid "Archive conversations (A)"
-msgstr "תיוק שיחות בארכיון (A)"
+#: desktop/org.gnome.Geary.gschema.xml:127
+msgid "The last recorded size of the detached composer window."
+msgstr "The last recorded size of the detached composer window."
 
-#: ../src/client/application/geary-controller.vala:76
-msgid "Mark as S_pam"
-msgstr "סימון כ_דואר זבל"
+#: desktop/org.gnome.Geary.gschema.xml:132
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+msgstr "Undo sending email delay"
 
-#: ../src/client/application/geary-controller.vala:77
-msgid "Mark as not S_pam"
-msgstr "סימון כלא דואר ז_בל"
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
+msgstr ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
 
-#: ../src/client/application/geary-controller.vala:79
-#: ../src/client/application/geary-controller.vala:403
-msgid "Mark conversation"
-msgstr "סימון שיחה"
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Brief notification display time"
 
-#: ../src/client/application/geary-controller.vala:80
-msgid "Mark conversations"
-msgstr "סימון שיחות"
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
 
-#: ../src/client/application/geary-controller.vala:81
-msgid "Add label to conversation"
-msgstr "הוספת תווית לשיחה"
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "List of optional plugins"
 
-#: ../src/client/application/geary-controller.vala:82
-msgid "Add label to conversations"
-msgstr "הוספת תווית לשיחות"
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Plugins listed here will be loaded on startup."
 
-#: ../src/client/application/geary-controller.vala:83
-#: ../src/client/application/geary-controller.vala:442
-msgid "Move conversation"
-msgstr "הזזת שיחה"
+#: desktop/org.gnome.Geary.gschema.xml:152
+msgid "Whether we migrated the old settings"
+msgstr "Whether we migrated the old settings"
 
-#: ../src/client/application/geary-controller.vala:84
-msgid "Move conversations"
-msgstr "הזזת שיחות"
+#: desktop/org.gnome.Geary.gschema.xml:153
+msgid ""
+"False to check for the old “org.yorba.geary”-schema and copy its values."
+msgstr ""
+"False to check for the old “org.yorba.geary”-schema and copy its values."
+
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:210
+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
+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
+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
+msgid "Check your receiving server details"
+msgstr "בדיקת קבלת פרטי השרת שלך"
+
+#. Translators: In-app notification label
+#. There was an SMTP auth error, but IMAP already
+#. 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
+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
+msgid "Check your sending server details"
+msgstr "בדיקת שליחת פרטי השרת שלך"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:261
+msgid "Check your email address and password"
+msgstr "בדיקת כתובת הדוא״ל והססמה שלך"
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:272
+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
+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
+#, 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
+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:"
+msgid "Email address"
+msgstr "כתובת דוא״ל"
+
+#. Translators: Placeholder for the default sender address
+#. when adding an account
+#. 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
+msgid "person@example.com"
+msgstr "person@example.com"
+
+#. Translators: Label for an IMAP/SMTP service login/user name
+#. 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
+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
+msgid "Password"
+msgstr "ססמה"
 
-#: ../src/client/application/geary-controller.vala:383
-#: ../ui/app_menu.interface.h:1
-msgid "A_ccounts"
-msgstr "_חשבונות"
+#. Translators: Label for the IMAP server hostname when
+#. 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"
+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
+msgid "imap.example.com"
+msgstr "imap.example.com"
+
+#. Translators: Label for the SMTP server hostname when
+#. 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"
+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
+msgid "smtp.example.com"
+msgstr "smtp.example.com"
+
+#. 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"
+msgid "Account name"
+msgstr "שם החשבון"
+
+#. Translators: Tooltip used to undo changing
+#. the name of an account. The string
+#. substitution is the old name of the
+#. account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
+#, 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"
+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
+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
+msgid "Sender Name"
+msgstr "שם שולח"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
+#| msgid "_Remove"
+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"
+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
+#, c-format
+msgid "Remove “%s”"
+msgstr "הסרת „%s”"
 
-#: ../src/client/application/geary-controller.vala:388
-#: ../src/client/components/stock.vala:27 ../ui/app_menu.interface.h:2
-msgid "_Preferences"
-msgstr "הע_דפות"
+#. 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
+#, c-format
+msgid "Undo changes to “%s”"
+msgstr "ביטול השינויים עבור „%s”"
 
-#: ../src/client/application/geary-controller.vala:392
-#: ../src/client/components/stock.vala:25 ../ui/app_menu.interface.h:3
-msgid "_Help"
-msgstr "_עזרה"
+#. 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
+#, c-format
+msgid "Add “%s” back"
+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
+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"
+msgid "Download mail"
+msgstr "הורדת דואר"
+
+#. Translators: Tooltip for undoing a change
+#. to the length of time that past email
+#. 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
+#, c-format
+msgid "Change download period back to: %s"
+msgstr "שינוי תקופת הורדה ל: %s"
 
-#: ../src/client/application/geary-controller.vala:396
-#: ../src/client/components/stock.vala:21 ../ui/app_menu.interface.h:4
-msgid "_About"
-msgstr "על _אודות"
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
+msgid "Everything"
+msgstr "מאז ומעולם"
 
-#: ../src/client/application/geary-controller.vala:400
-#: ../src/client/components/stock.vala:29 ../ui/app_menu.interface.h:5
-msgid "_Quit"
-msgstr "י_ציאה"
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
+msgid "2 weeks back"
+msgstr "שבועיים אחורנית"
 
-#: ../src/client/application/geary-controller.vala:405
-msgid "_Mark as..."
-msgstr "_סימון בתור…"
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
+msgid "1 month back"
+msgstr "חודש אחד אחורנית"
 
-#: ../src/client/application/geary-controller.vala:411
-msgid "Mark as _Read"
-msgstr "סימון כ_נקרא"
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
+msgid "3 months back"
+msgstr "שלושה חודשים אחורנית"
 
-#: ../src/client/application/geary-controller.vala:417
-msgid "Mark as _Unread"
-msgstr "סימון כ_לא נקרא"
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
+msgid "6 months back"
+msgstr "שישה חודשים אחורנית"
 
-#: ../src/client/application/geary-controller.vala:423
-msgid "_Star"
-msgstr "הוספת _כוכב"
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
+msgid "1 year back"
+msgstr "שנה אחת אחורנית"
 
-#: ../src/client/application/geary-controller.vala:428
-msgid "U_nstar"
-msgstr "ה_סרת כוכב"
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
+msgid "2 years back"
+msgstr "שנתיים אחורנית"
 
-#: ../src/client/application/geary-controller.vala:438
-msgid "Add label"
-msgstr "הוספת תווית"
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
+msgid "4 years back"
+msgstr "ארבע שנים אחורנית"
 
-#: ../src/client/application/geary-controller.vala:439
-msgid "_Label"
-msgstr "_תווית"
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
+#, 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"
+msgid "Undo"
+msgstr "ביטול"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2044
+#| msgid "_Redo"
+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-row.vala:279
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/application/geary-controller.vala:443
-msgid "_Move"
-msgstr "ה_עברה"
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:458
+#: src/client/accounts/accounts-editor-row.vala:283
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/application/geary-controller.vala:447
-msgid "Compose new message (Ctrl+N, N)"
-msgstr "יצירת הודעה חדשה (Ctrl+מ, מ)"
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:462
+#: 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
+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
+msgid "This account has encountered a problem and is unavailable"
+msgstr "חשבון זה נתקל בבעיה ולכן אינו זימן"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:466
+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
+#, c-format
+msgid "Account “%s” removed"
+msgstr "חשבון „%s” הוסר"
 
-#. Reply to a message.
-#: ../src/client/application/geary-controller.vala:451
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1892
-msgid "_Reply"
-msgstr "לה_שיב"
+#. 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
+#, c-format
+msgid "Account “%s” restored"
+msgstr "חשבון „%s” שוחזר"
+
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:50
+msgid "Drag to move this item"
+msgstr "יש לגרור על מנת להזיז פריט זה"
+
+#. Translators: Label describes the service provider
+#. hosting the email account, e.g. Gmail, Yahoo, or some
+#. other generic IMAP service.
+#: src/client/accounts/accounts-editor-row.vala:299
+msgid "Service provider"
+msgstr "ספק השרת"
+
+#. Translators: This label describes what form of transport
+#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
+#. service.
+#: src/client/accounts/accounts-editor-row.vala:473
+msgid "Connection security"
+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
+msgid "None"
+msgstr "כלום"
 
-#: ../src/client/application/geary-controller.vala:452
-msgid "Reply (Ctrl+R, R)"
-msgstr "להשיב (Ctrl+ר, ר)"
+#: 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"
+
+#. Translators: Label for source of SMTP authentication
+#. credentials (none, use IMAP, custom) when adding a new
+#. account
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:539
+#: src/client/application/application-main-window.vala:554
+msgid "Login"
+msgstr "התחברות"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (none) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:546
+msgid "No login needed"
+msgstr "לא נדרשת התחברות"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (use IMAP) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:554
+msgid "Use same login as receiving"
+msgstr "שימוש בשם ההתחברות שמתקבל"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:562
+msgid "Use a different login"
+msgstr "שימוש בהתחברות שונה"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-servers-pane.vala:382
+#, c-format
+msgid "Account not updated: %s"
+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"
+msgid "Account source"
+msgstr "מקור החשבון"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:557
+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"
+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"
+msgid "Save sent email on server"
+msgstr "שמירת דואר יוצא על השרת"
+
+#. Add a suffix for OAuth2 auth so people know they
+#. shouldn't expect to be prompted for a password
+#. 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
+#, c-format
+msgid "%s using OAuth2"
+msgstr "‏%s משתמש ב־OAuth2"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:971
+msgid "Use receiving server login"
+msgstr "שימוש בשרת ההתחברות המתקבל"
+
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/application-attachment-manager.vala:21
+msgid "Untitled"
+msgstr "ללא כותרת"
+
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+#| msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "כבר קיים קובץ בשם „%s“. האם להחליפו?"
+
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+#| msgid ""
+#| "The file already exists in \"%s\".  Replacing it will overwrite its "
+#| "contents."
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr "הקובץ כבר קיים תחת „%s“. החלפתו תגרום לאיבוד תוכנו."
 
-#: ../src/client/application/geary-controller.vala:456
-msgid "R_eply All"
-msgstr "להשיב ל_כולם"
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "ה_חלפה"
 
-#: ../src/client/application/geary-controller.vala:457
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "להשיב לכולם (Ctrl+Shift+ר, Shift+ר)"
+#: src/client/application/application-client.vala:34
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "כל הזכויות שמורות למוסד לחופש התכנה בע״מ. 2016"
 
-#. Forward a message.
-#: ../src/client/application/geary-controller.vala:462
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1902
-msgid "_Forward"
-msgstr "ה_עברה"
+#: src/client/application/application-client.vala:35
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "כל הזכויות שמורות 2016-2020 צוות פיתוח Geary."
 
-#: ../src/client/application/geary-controller.vala:463
-msgid "Forward (Ctrl+L, F)"
-msgstr "העברה (Ctrl+ך, כ)"
+#: src/client/application/application-client.vala:37
+msgid "Visit the Geary web site"
+msgstr "ביקור באתר Geary"
 
-#: ../src/client/application/geary-controller.vala:502
-msgid "Empty"
-msgstr "ריקון"
+#. / Command line option
+#: src/client/application/application-client.vala:97
+msgid "Print debug logging"
+msgstr "Print debug logging"
 
-#: ../src/client/application/geary-controller.vala:503
-msgid "Empty Spam or Trash folders"
-msgstr "ריקון תיקיית דואר זבל או אשפה"
+#. / Command line option
+#: src/client/application/application-client.vala:100
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
+msgstr "Start with the main window hidden (deprecated)"
 
-#: ../src/client/application/geary-controller.vala:507
-msgid "Empty _Spam…"
-msgstr "ריקון דואר _זבל…"
+#. / Command line option
+#: src/client/application/application-client.vala:103
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr "Enable WebKitGTK Inspector in web views"
 
-#: ../src/client/application/geary-controller.vala:511
-msgid "Empty _Trash…"
-msgstr "ריקון א_שפה…"
+#. / Command line option
+#: src/client/application/application-client.vala:106
+msgid "Log conversation monitoring"
+msgstr "Log conversation monitoring"
 
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:540
-msgid "Toggle search bar"
-msgstr "הצגת סרגל החיפוש"
+#. / Command line option
+#: src/client/application/application-client.vala:109
+#| msgid "Log network deserialization"
+msgid "Log IMAP network deserialization"
+msgstr "Log IMAP network deserialization"
 
-#: ../src/client/application/geary-controller.vala:735
-msgid "Unable to store server trust exception"
-msgstr "לא ניתן לאחסן שרת מהימן חריג"
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:113
+msgid "Log folder normalization"
+msgstr "ביצוע רישום של folder normalization"
 
-#: ../src/client/application/geary-controller.vala:972
-msgid "Your settings are insecure"
-msgstr "ההגדרות שלך אינן בטוחות"
+#. / Command line option
+#: src/client/application/application-client.vala:116
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr "Log IMAP network activity"
 
-#: ../src/client/application/geary-controller.vala:973
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"הגדרות ה־IMAP ו/או הגדרות ה־SMTP אינן מגדירות התחברות דרך פרוטוקול אבטחה SSL "
-"או TLS. משמעות הדבר ששם המשתמש והססמה שלך יכולים להיקרא ע״י תכניות מעקב ברשת "
-"שלך. האם להתחבר לחשבון?"
+#. / 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
+msgid "Log IMAP replay queue"
+msgstr "Log IMAP replay queue"
 
-#: ../src/client/application/geary-controller.vala:974
-msgid "Co_ntinue"
-msgstr "לה_משיך"
+#. / Command line option
+#: src/client/application/application-client.vala:124
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr "Log SMTP network activity"
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1052
-#: ../src/client/components/status-bar.vala:29
-msgid "Error sending email"
-msgstr "שגיאה בשליחת דוא״ל"
+#. / Command line option
+#: src/client/application/application-client.vala:127
+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
+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"
+msgid "Open a new window"
+msgstr "פתיחת חלון חדש"
+
+#. / Command line option
+#: src/client/application/application-client.vala:135
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "Revoke all pinned TLS server certificates"
+
+#. / Command line option
+#: src/client/application/application-client.vala:138
+msgid "Display program version"
+msgstr "Display program version"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:262
+#| msgid "Mark conversation"
+msgid "Geary version"
+msgstr "גרסת Geary"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:264
+msgid "Geary revision"
+msgstr "עדכון Geary"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
+msgid "GTK version"
+msgstr "גרסת GTK"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:273
+msgid "GLib version"
+msgstr "גרסת GLib"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:280
+msgid "WebKitGTK version"
+msgstr "גרסת WebKitGTK"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:287
+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
+msgid "Unknown"
+msgstr "לא ידוע"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:293
+msgid "Distribution name"
+msgstr "שם הפצה"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:298
+msgid "Distribution release"
+msgstr "גרסת הפצה"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:303
+msgid "Installation prefix"
+msgstr "תחילית התקנה"
+
+#: src/client/application/application-client.vala:559
+#, c-format
+msgid "About %s"
+msgstr "על אודות %s"
 
-#: ../src/client/application/geary-controller.vala:1053
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+#. 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
+msgid "translator-credits"
 msgstr ""
-"‏Geary נתקל בשגיאה בשליחת דוא״ל. אם הבעיה נמשכת, יש למחוק ידנית את הדוא״ל "
-"מתיקיית דואר יוצא שלך."
+"דוביקס <dovix2003@gmail.com>\n"
+"ירון שהרבני <sh.yaron@gmail.com>\n"
+"יוסף אור בוצ׳קו <yoseforb@gmail.com>"
 
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1057
-#: ../src/client/components/status-bar.vala:33
-msgid "Error saving sent mail"
-msgstr "שגיאה בשמירת דוא״ל שנשלח"
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:1045
+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."
 
-#: ../src/client/application/geary-controller.vala:1058
-msgid ""
-"Geary encountered an error saving a sent message to Sent Mail.  The message "
-"will stay in your Outbox folder until you delete it."
-msgstr ""
-"‏Geary נתקל בשגיאה בשמירת הודעה שנשלחה לדואר יוצא. ההודעה תישאר בתיקייה "
-"בהמתנה לשליחה עד שתמחק."
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:1078
+#, c-format
+msgid "Unrecognised program argument: “%s”"
+msgstr "Unrecognised program argument: “%s”"
 
-#: ../src/client/application/geary-controller.vala:1127
-msgid "Labels"
-msgstr "תוויות"
+#. / Notification title.
+#: src/client/application/application-controller.vala:479
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "ארעה בעיה בשליחת דואר עבור %s"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:483
+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"
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "תכתובת סומנה"
+msgstr[1] "תכתובות סומנו"
+msgstr[2] "תכתובות סומנו"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:588
+#| msgid "%s - Conversation Inspector"
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "בוטל סימון תכתובת"
+msgstr[1] "בוטלו סימון תכתובות"
+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
+#, c-format
+#| msgid "Log conversation monitoring"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "תכתובת הועברה אל %s"
+msgstr[1] "תכתובות הועברו אל %s"
+msgstr[2] "תכתובות הועברו אל %s"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:622
+#: src/client/application/application-controller.vala:644
+#, c-format
+#| msgid "%s - Conversation Inspector"
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "תכתובת שוחזרה אל %s"
+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"
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "תכתובת אורכבה"
+msgstr[1] "תכתובות אורכבו"
+msgstr[2] "תכתובות אורכבו"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:721
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "הודעה שוחזרה אל %s"
+msgstr[1] "הודעות שוחזרו אל %s"
+msgstr[2] "הודעות שוחזרו אל %s"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:742
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "הודעה אורכבה אל %s"
+msgstr[1] "הודעות אורכבו אל %s"
+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
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "הודעה הועברה אל %s"
+msgstr[1] "הודעות הועברו אל %s"
+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
+#, 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"
+msgstr[1] "תכתובות סומנו בתווית %s"
+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
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "בוטל סימון תכתובת בתווית %s"
+msgstr[1] "בוטל סימון תכתובות בתווית %s"
+msgstr[2] "בוטל סימון תכתובות בתווית %s"
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1139
+#: src/client/application/application-controller.vala:1320
 #, c-format
 msgid "Unable to open the database for %s"
-msgstr "לא ניתן לפתוח מסד הנתונים עבור %s"
+msgstr "לא ניתן לפתוח את מסד הנתונים עבור %s"
 
-#: ../src/client/application/geary-controller.vala:1140
+#: src/client/application/application-controller.vala:1321
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -536,617 +1171,942 @@ msgstr ""
 "יצירה מחדש של מסד הנתונים תמחק את כל הדוא״ל המקומי ואת כל הקבצים המצורפים "
 "שלו. <b> הדואר על השרת שלך לא יושפע.</b>"
 
-#: ../src/client/application/geary-controller.vala:1142
+#: src/client/application/application-controller.vala:1323
 msgid "_Rebuild"
-msgstr "י_צירה מחדש"
+msgstr "_יצירה מחדש"
 
-#: ../src/client/application/geary-controller.vala:1142
+#: src/client/application/application-controller.vala:1323
 msgid "E_xit"
 msgstr "י_ציאה"
 
-#: ../src/client/application/geary-controller.vala:1151
+#: src/client/application/application-controller.vala:1333
 #, c-format
-msgid "Unable to rebuild database for \"%s\""
+#| msgid "Unable to rebuild database for \"%s\""
+msgid "Unable to rebuild database for “%s”"
 msgstr "לא ניתן ליצור מחדש מסד נתונים עבור „%s”"
 
-#: ../src/client/application/geary-controller.vala:1152
+#: src/client/application/application-controller.vala:1334
 #, c-format
 msgid ""
 "Error during rebuild:\n"
 "\n"
 "%s"
 msgstr ""
-"שגיאה במהלך יצירה מחדש:\n"
+"שגיאה בתהליך היצירה מחדש:\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1174
-#: ../src/client/application/geary-controller.vala:1184
-#: ../src/client/application/geary-controller.vala:1195
+#. / 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
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "לא ניתן לפתוח תיבת דואר מקומית עבור %s"
-
-#: ../src/client/application/geary-controller.vala:1175
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
-msgstr ""
-"אירעה שגיאה בפתיחת מסד הנתונים המקומי של הדואר עבור חשבון זה. ככל הנראה עקב "
-"בעיות הרשאות הקובץ.\n"
-"\n"
-"יש לבדוק אם יש לך הרשאות קריאה/כתיבה לכל הקבצים בתיקייה:\n"
-"%s"
-
-#: ../src/client/application/geary-controller.vala:1185
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
-msgstr ""
-"מספר הגרסה של מסד הנתונים המקומי של הדואר מתאים לגרסה חדשה של Geary. למרבה "
-"הצער, לא ניתן לשחזר את מסד הנתונים כדי שיעבוד עם גרסה זו של Geary.\n"
-"\n"
-"יש להתקין שוב את הגרסה  האחרונה של Geary."
-
-#: ../src/client/application/geary-controller.vala:1196
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
-msgstr ""
-"אירעה שגיאה בפתיחת החשבון המקומי. ככל הנראה עקב בעיות חיבור.\n"
-"\n"
-"יש לבדוק את חיבור הרשת שלך ולהפעיל מחדש את Geary."
+msgid "Email sent to %s"
+msgstr "נשלחת הודעה אל %s"
 
-#: ../src/client/application/geary-controller.vala:1708
+#. / 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
 #, c-format
-msgid "About %s"
-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/geary-controller.vala:1711
-msgid "translator-credits"
-msgstr ""
-"דוביקס <dovix2003@gmail.com>\n"
-"ירון שהרבני <sh.yaron@gmail.com>\n"
-"יוסף אור בוצ׳קו <yoseforb@gnome.org>"
-
-#: ../src/client/application/geary-controller.vala:1968
-msgid "Undo move (Ctrl+Z)"
-msgstr "ביטול העברה (Ctrl+ז)"
+msgid "Email to %s queued for delivery"
+msgstr "הודעה אל %s ממתינה בתור לשליחה"
 
-#: ../src/client/application/geary-controller.vala:1978
+#. / 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
 #, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "האם אכן לפתוח את „%s”?"
-
-#: ../src/client/application/geary-controller.vala:1979
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr ""
-"קבצים מצורפים עלולים לגרום נזק למערכת שלך. כדאי לפתוח אך ורק קבצים המגיעים "
-"ממקור אמין."
-
-#: ../src/client/application/geary-controller.vala:1980
-msgid "Don't _ask me again"
-msgstr "_לא לשאול אותי שוב"
-
-#: ../src/client/application/geary-controller.vala:1998
+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."
+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
 #, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "קובץ בשם „%s” כבר קיים. האם להחליף אותו?"
-
-#: ../src/client/application/geary-controller.vala:2000
+msgid "Email to %s discarded"
+msgstr "הודעה אל %s הושלכה"
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:540
+msgid "Working offline"
+msgstr "פועל בצורה לא מקוונת"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:542
+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
+msgid "Login problem"
+msgstr "בעיית התחברות"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:551
+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
+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
+msgid "Security problem"
+msgstr "בעיית אבטחה"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:567
+msgid "An account has reported an untrusted server."
+msgstr "החשבון דיווח על שרת לא אמין."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:570
+msgid "Check"
+msgstr "בדיקה"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:574
+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
 #, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "הקובץ כבר קיים תחת „%s”. החלפתו תגרום לאיבוד התוכן הקיים."
-
-#: ../src/client/application/geary-controller.vala:2003
-msgid "_Replace"
-msgstr "ה_חלפה"
-
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2301
-msgid "Close open draft messages?"
-msgstr "סגירת טיוטות פתוחות?"
+msgid "%s — %s"
+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/folder-list/folder-list-account-branch.vala:43
+msgid "Labels"
+msgstr "תוויות"
 
-#: ../src/client/application/geary-controller.vala:2431
+#: src/client/application/application-main-window.vala:1293
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "ריקון כל הדואר מהתיקייה %s?"
 
-#: ../src/client/application/geary-controller.vala:2432
+#: src/client/application/application-main-window.vala:1294
 msgid "This removes the email from Geary and your email server."
-msgstr "פעולה זו מוחקת את הדואר מ־Geary וכן משרת הדוא״ל שלך."
+msgstr "פעולה זו תמחוק את הדואר מ־Geary וכן משרת הדוא״ל שלך."
 
-#: ../src/client/application/geary-controller.vala:2433
+#: src/client/application/application-main-window.vala:1295
 msgid "This cannot be undone."
-msgstr "פעולה זה לא ניתנת לביטול."
+msgstr "פעולה זאת לא ניתנת לביטול."
 
-#: ../src/client/application/geary-controller.vala:2434
+#: src/client/application/application-main-window.vala:1296
 #, c-format
 msgid "Empty %s"
 msgstr "ריקון %s"
 
-#: ../src/client/application/geary-controller.vala:2451
-#, c-format
-msgid "Error emptying %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?"
+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
+msgid "Delete"
+msgstr "מחיקה"
 
-#: ../src/client/application/geary-controller.vala:2481
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1368
 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/geary-controller.vala:2483
-msgid "Delete"
-msgstr "מחיקה"
-
-#: ../src/client/application/geary-controller.vala:2514
-msgid "Undo archive (Ctrl+Z)"
-msgstr "ביטול ארכוב (Ctrl+ז)"
-
-#: ../src/client/application/geary-controller.vala:2529
-msgid "Undo trash (Ctrl+Z)"
-msgstr "ביטול העברה לאשפה (Ctrl+ז)"
-
-#: ../src/client/application/geary-controller.vala:2582
-msgid "Undo (Ctrl+Z)"
-msgstr "ביטול (Ctrl+ז)"
-
-#: ../src/client/components/conversation-find-bar.vala:214
+#: src/client/application/application-main-window.vala:1691
 #, c-format
-msgid "%i match"
-msgid_plural "%i matches"
-msgstr[0] "התאמה אחת"
-msgstr[1] "%i התאמות"
-msgstr[2] "שתי התאמות"
+msgid "%s (%d)"
+msgstr "%s (%d)"
 
-#: ../src/client/components/conversation-find-bar.vala:216
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1784
 #, c-format
-msgid "%i match (wrapped)"
-msgid_plural "%i matches (wrapped)"
-msgstr[0] "התאמה אחת (גולש)"
-msgstr[1] "%i התאמות (גולש)"
-msgstr[2] "שתי התאמות (גולש)"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../src/client/components/conversation-find-bar.vala:218
-msgid "not found"
-msgstr "לא נמצא"
+#: src/client/components/components-attachment-pane.vala:379
+#| msgid "Are you sure you want to open \"%s\"?"
+msgid "Are you sure you want to open these attachments?"
+msgstr "האם אכן ברצונך לפתוח קובץ מצורף זה?"
 
-#: ../src/client/components/main-window.vala:359
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#: src/client/components/components-attachment-pane.vala:380
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"קבצים מצורפים עלולים לגרום נזק למערכת שלך. כדאי לפתוח אך ורק קבצים המגיעים "
+"ממקור אמין."
 
-#: ../src/client/components/search-bar.vala:8
-#: ../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "חיפוש"
+#: src/client/components/components-attachment-pane.vala:381
+#| msgid "Don't _ask me again"
+msgid "Don’t _ask me again"
+msgstr "לא ל_שאול אותי שוב"
+
+#: src/client/components/components-inspector.vala:78
+#| msgid "_Inspect"
+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
+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
+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/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..."
+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"
+msgid "Cancel"
+msgstr "ביטול"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:124
+msgid "_Automatically select next message"
+msgstr "_בחירת ההודעה הבאה אוטומטית"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:134
+msgid "_Display conversation preview"
+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
+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"
+msgid "_Watch for new mail when closed"
+msgstr "_קבלת הודעות חדשות גם לאחר סגירת החלון"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:171
+msgid "Geary will keep running after all windows are closed"
+msgstr "‏Geary ימשיך לפעול גם לאחר סגירת כל החלונות"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:189
+msgid "Preferences"
+msgstr "העדפות"
 
-#. Search entry.
-#: ../src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "חיפוש בכל חשבונות הדואר עם צירוף מקשים (Ctrl+ד)"
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:250
+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 "בעיות בחשבון"
+
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/components-problem-report-info-bar.vala:40
+#, c-format
+msgid "Geary has encountered a problem with %s."
+msgstr "‏Geary נתקל בבעיה עם %s."
 
-#: ../src/client/components/search-bar.vala:103
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/components-problem-report-info-bar.vala:53
 #, c-format
-msgid "Indexing %s account"
-msgstr "מפתוּח חשבון %s"
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "‏Geary נתקל בבעיה בבדיקת הודעה עבור %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
+msgstr "יש לנסות להתחבר מחדש"
+
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/components-problem-report-info-bar.vala:65
+#, c-format
+msgid "Geary encountered a problem sending email for %s."
+msgstr "‏Geary נתקל בבעיה בשליחת הודעה עבור %s."
+
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
+msgid "Retry sending queued messages"
+msgstr "יש לנסות לשלוח שוב את ההודעות בתור"
+
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/components-problem-report-info-bar.vala:76
+msgid "Geary has encountered a problem"
+msgstr "‏Geary נתקל בבעיה"
+
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/components-problem-report-info-bar.vala:80
+msgid "Please report the details if it persists."
+msgstr "נא לדווח על פרטי הבעיה אם התקלתה נמשכת."
+
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
+msgid "_Details"
+msgstr "_פרטים"
+
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:97
+msgid "View technical details about the error"
+msgstr "הצגת פרטים טכניים על התקלה"
+
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
+msgid "_Retry"
+msgstr "_ניסיון חוזר"
+
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/client/util/util-i18n.vala:298
+msgid "Search"
+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 "חיפוש מילים בכל הדואר שבחשבון"
 
-#: ../src/client/components/search-bar.vala:114
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
 msgid "Search %s account"
 msgstr "חיפוש בחשבון %s"
 
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but one is not provided.
+#: src/client/components/components-validator.vala:394
+msgid "An email address is required"
+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 "כתובת דוא״ל לא תקינה"
+
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:444
+msgid "A server name is required"
+msgstr "דרוש שם שרת"
+
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:449
+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..."
+#: src/client/components/status-bar.vala:26
+#| msgid "Sending..."
+msgid "Sending…"
 msgstr "שולח…"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "שגיאה בשליחת דוא״ל"
+
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "שגיאה בשמירת דוא״ל שנשלח"
+
+#: src/client/components/stock.vala:18
 msgid "_OK"
 msgstr "_אישור"
 
-#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
-#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
+#: 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:23
+#: src/client/components/stock.vala:21
+msgid "_About"
+msgstr "על _אודות"
+
+#: src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_הוספה"
+
+#: src/client/components/stock.vala:23
 msgid "_Close"
 msgstr "_סגירה"
 
-#: ../src/client/components/stock.vala:24
+#: src/client/components/stock.vala:24
 msgid "_Discard"
 msgstr "השל_כה"
 
-#: ../src/client/components/stock.vala:26
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
+msgid "_Help"
+msgstr "_עזרה"
+
+#: src/client/components/stock.vala:26
+#: src/client/plugin/mail-merge/mail-merge.vala:391
+#: ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_פתיחה"
 
-#: ../src/client/components/stock.vala:28
-msgid "_Print..."
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
+msgid "_Preferences"
+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 "ה_דפסה…"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+#: src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr "י_ציאה"
+
+#: src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "_הסרה"
 
-#. Select all.
-#: ../src/client/components/stock.vala:32
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1358
-msgid "Select _All"
-msgstr "בחירת ה_כול"
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
+msgid "_Save"
+msgstr "_שמירה"
 
-#: ../src/client/components/stock.vala:33
+#: src/client/components/stock.vala:32
 msgid "_Keep"
 msgstr "_שמירה"
 
-#: ../src/client/composer/composer-widget.vala:71
+#: src/client/composer/composer-editor.vala:675
+msgid "Select Color"
+msgstr "בחירת צבע"
+
+#: src/client/composer/composer-link-popover.vala:139
+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
+msgid "Invalid link URL"
+msgstr "קישור URL לא תקין"
+
+#: src/client/composer/composer-link-popover.vala:146
+#| msgid "Remove email address"
+msgid "Invalid email address"
+msgstr "כתובת דוא״ל לא תקינה"
+
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:32
+msgid "New Message"
+msgstr "הודעה חדשה"
+
+#: src/client/composer/composer-widget.vala:167
 msgid "Saved"
 msgstr "נשמר"
 
-#: ../src/client/composer/composer-widget.vala:72
+#: src/client/composer/composer-widget.vala:168
 msgid "Saving"
-msgstr "נשמר"
+msgstr "שומר"
 
-#: ../src/client/composer/composer-widget.vala:73
+#: src/client/composer/composer-widget.vala:169
 msgid "Error saving"
 msgstr "שגיאת בשמירה"
 
-#: ../src/client/composer/composer-widget.vala:74
+#: src/client/composer/composer-widget.vala:170
 msgid "Press Backspace to delete quote"
 msgstr "יש להקיש על Backspace למחיקת ציטוט"
 
-#: ../src/client/composer/composer-widget.vala:75
-msgid "New Message"
-msgstr "הודעה חדשה"
-
-#. A list of keywords, separated by pipe ("|") characters, that suggest an attachment; since
-#. this is full-word checking, include all variants of each word.  No spaces are allowed.
-#: ../src/client/composer/composer-widget.vala:136
+#. Translators: This is list of keywords, separated by pipe ("|")
+#. characters, that suggest an attachment; since this is full-word
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:186
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
 msgstr "לצרף|צירוף|מצורף|צרף|קובץ מצורף|צורף|נספח"
 
-#: ../src/client/composer/composer-widget.vala:1108
-#: ../src/client/composer/composer-widget.vala:1112
-msgid "Do you want to discard this message?"
-msgstr "האם למחוק הודעה זו?"
-
-#: ../src/client/composer/composer-widget.vala:1268
+#. 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?"
+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?"
+msgid "Do you want to discard this draft message?"
+msgstr "האם ברצונך למחוק טיוטת הודעה זו?"
+
+#: src/client/composer/composer-widget.vala:1440
 msgid "Send message with an empty subject and body?"
 msgstr "האם לשלוח את ההודעה ללא כותרת ותוכן?"
 
-#: ../src/client/composer/composer-widget.vala:1270
+#: src/client/composer/composer-widget.vala:1442
 msgid "Send message with an empty subject?"
 msgstr "האם לשלוח את ההודעה ללא כותרת?"
 
-#: ../src/client/composer/composer-widget.vala:1272
+#: src/client/composer/composer-widget.vala:1444
 msgid "Send message with an empty body?"
 msgstr "האם לשלוח את ההודעה ללא תוכן?"
 
-#: ../src/client/composer/composer-widget.vala:1274
+#: src/client/composer/composer-widget.vala:1453
 msgid "Send message without an attachment?"
 msgstr "האם לשלוח את ההודעה ללא קובץ מצורף?"
 
-#: ../src/client/composer/composer-widget.vala:1536
-msgid "Cannot add attachment"
-msgstr "לא ניתן לצרף את הקובץ המבוקש"
-
-#: ../src/client/composer/composer-widget.vala:1547
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "‏„%s” לא נמצא."
-
-#: ../src/client/composer/composer-widget.vala:1554
+#: src/client/composer/composer-widget.vala:1772
 #, c-format
-msgid "\"%s\" is a folder."
-msgstr "‏„%s” היא תיקייה."
+#| msgid "\"%s\" already attached for delivery."
+msgid "“%s” already attached for delivery."
+msgstr "‏„%s” כבר מצורף למכתב."
 
-#: ../src/client/composer/composer-widget.vala:1561
+#: src/client/composer/composer-widget.vala:1804
+#: src/client/composer/composer-widget.vala:1854
 #, c-format
-msgid "\"%s\" is an empty file."
+#| msgid "\"%s\" is an empty file."
+msgid "“%s” is an empty file."
 msgstr "‏„%s” הוא קובץ ריק."
 
-#: ../src/client/composer/composer-widget.vala:1575
+#: src/client/composer/composer-widget.vala:1842
 #, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "לא ניתן לפתוח את „%s” לקריאה."
+#| msgid "\"%s\" could not be found."
+msgid "“%s” could not be found."
+msgstr "‏„%s” לא נמצא."
 
-#: ../src/client/composer/composer-widget.vala:1582
+#: src/client/composer/composer-widget.vala:1848
 #, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "‏„%s” כבר מצורף למכתב."
+#| msgid "\"%s\" is a folder."
+msgid "“%s” is a folder."
+msgstr "‏„%s” היא תיקייה."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../src/client/composer/composer-widget.vala:1591
+#: src/client/composer/composer-widget.vala:1867
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../src/client/composer/composer-widget.vala:1652
-msgid "To: "
-msgstr "אל: "
+#| msgid "\"%s\" could not be opened for reading."
+msgid "“%s” could not be opened for reading."
+msgstr "לא ניתן לפתוח את „%s” לקריאה."
 
-#: ../src/client/composer/composer-widget.vala:1655
-msgid "Cc: "
-msgstr "עותק: "
+#: src/client/composer/composer-widget.vala:1875
+msgid "Cannot add attachment"
+msgstr "לא ניתן לצרף את הקובץ המבוקש"
 
-#: ../src/client/composer/composer-widget.vala:1658
-msgid "Bcc: "
-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"
+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
+msgid "To:"
+msgstr "אל:"
 
-#: ../src/client/composer/composer-widget.vala:1661
-msgid "Reply-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
+msgid "Cc:"
+msgstr "עותק:"
 
-#: ../src/client/composer/composer-widget.vala:1894
-msgid "Select Color"
-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
+msgid "Bcc:"
+msgstr "עותק מוסתר:"
 
-#. Displayed in the From dropdown to indicate an "alternate email address"
-#. for an account.  The first printf argument will be the alternate email
-#. address, and the second will be the account's primary email address.
-#: ../src/client/composer/composer-widget.vala:2341
+#. Translators: Human-readable version of the RFC 822 Reply-To header
+#: src/client/composer/composer-widget.vala:2028
+msgid "Reply-To: "
+msgstr "להשיב אל:"
+
+#. Displayed in the From dropdown to indicate an
+#. "alternate email address" for an account.  The first
+#. printf argument will be the alternate email address,
+#. and the second will be the account's primary email
+#. address.
+#: src/client/composer/composer-widget.vala:2146
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s באמצעות %2$s"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: ../src/client/composer/composer-widget.vala:2383
-msgid "_From:"
-msgstr "_מאת:"
+#: src/client/composer/spell-check-popover.vala:125
+msgid "Remove this language from the preferred list"
+msgstr "הסרת שפה זו מרשימת המועדפים"
 
-#: ../src/client/composer/spell-check-popover.vala:210
+#: src/client/composer/spell-check-popover.vala:129
+msgid "Add this language to the preferred list"
+msgstr "הוספת שפה זו לרשימת המועדפים"
+
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "חיפוש שפות נוספות"
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "אני"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:414
-msgid "No conversations selected."
-msgstr "לא נבחרה אף תכתובת."
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:339
+#| msgid "Move conversations"
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "העברת תכתובת ל_אשפה"
+msgstr[1] "העברת תכתובות ל_אשפה"
+msgstr[2] "העברת תכתובות ל_אשפה"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:351
+#| msgid "Delete conversation"
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "_מחיקת תכתובת"
+msgstr[1] "_מחיקת תכתובות"
+msgstr[2] "_מחיקת תכתובות"
+
+#: src/client/conversation-list/conversation-list-view.vala:364
+#: ui/main-toolbar-menus.ui:5
+msgid "Mark as _Read"
+msgstr "סימון כ_נקרא"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:416
-#, c-format
-msgid "%u conversation selected."
-msgid_plural "%u conversations selected."
-msgstr[0] "נבחרה תכתובת אחת."
-msgstr[1] "נבחרו %u תכתובות."
-msgstr[2] "נבחרו שתי תכתובות."
+#: src/client/conversation-list/conversation-list-view.vala:372
+#: ui/main-toolbar-menus.ui:9
+msgid "Mark as _Unread"
+msgstr "סימון כ_לא נקרא"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:446
-msgid "No search results found."
-msgstr "לא מצאו תוצאות בחיפוש."
+#: src/client/conversation-list/conversation-list-view.vala:380
+#: ui/main-toolbar-menus.ui:17
+msgid "U_nstar"
+msgstr "ה_סרת כוכב"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:448
-msgid "No conversations in folder."
-msgstr "אין תכתובות בתיקייה."
+#: src/client/conversation-list/conversation-list-view.vala:387
+#: ui/main-toolbar-menus.ui:13
+msgid "_Star"
+msgstr "סימון ב_כוכב"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:720
-msgid "This message contains remote images."
-msgstr "הודעה זו מכילה תמונות מרוחקות."
+#. Translators: Menu item to reply to a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:396
+#: ui/conversation-email-menus.ui:9
+msgid "_Reply"
+msgstr "לה_שיב"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:720
-msgid "Show Images"
-msgstr "הצגת תמונות"
+#: src/client/conversation-list/conversation-list-view.vala:402
+msgid "R_eply All"
+msgstr "להשיב ל_כולם"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:721
-msgid "Always Show From Sender"
-msgstr "תמיד להציג תמונות משולח זה"
+#. Translators: Menu item to forward a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:408
+#: ui/conversation-email-menus.ui:21
+msgid "_Forward"
+msgstr "ה_עברה"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:745
-msgid "Edit Draft"
-msgstr "עריכת טיוטה"
+#: src/client/conversation-list/formatted-conversation-data.vala:18
+msgid "Me"
+msgstr "אני"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:838
+#. 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
 msgid "From:"
 msgstr "מאת:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:841
-msgid "To:"
-msgstr "אל:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:844
-msgid "Cc:"
-msgstr "עותק:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:847
-msgid "Bcc:"
-msgstr "עותק מוסתר:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:850
-msgid "Subject:"
-msgstr "נושא:"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:853
+#. 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
 msgid "Date:"
 msgstr "תאריך:"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1173
-#, c-format
-msgid "%u read message"
-msgid_plural "%u read messages"
-msgstr[0] "הודעה אחת שנקראה"
-msgstr[1] "%u הודעות שנקראו"
-msgstr[2] "שתי הודעות שנקראו"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
-#, c-format
-msgid "This message was sent successfully, but could not be saved to %s."
-msgstr "ההודעה נשלחה בהצלחה, אך לא ניתן לשמור אותה אל  %s."
-
-#. Add a menu item for copying the current selection.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1331
-#: ../ui/composer.glade.h:4
-msgid "_Copy"
-msgstr "ה_עתקה"
-
-#. Add a menu item for copying the address.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1339
-msgid "Copy _Email Address"
-msgstr "העתקת כתובת _דוא״ל"
-
-#. Add a menu item for copying the link.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1344
-#: ../ui/composer.glade.h:17
-msgid "Copy _Link"
-msgstr "ה_עתקת קישור"
-
-#. Select message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1352
-msgid "Select _Message"
-msgstr "_בחירת הודעה"
-
-#. Inspect.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1364
-msgid "_Inspect"
-msgstr "_בחינה"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1591
-msgid "This link appears to go to"
-msgstr "הקישור מראה לאן ללכת"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1592
-msgid "but actually goes to"
-msgstr "אך למעשה הולך ל־"
-
-#. If href doesn't look like a URL, something is fishy, so warn the user
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1647
-msgid " (Invalid?)"
-msgstr " (לא חוקי?)"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1753
-msgid "_Save Image As..."
-msgstr "שמירת _תמונה בשם…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
-msgid "_Save As..."
-msgstr "_שמירה בשם…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
-msgid "Save All A_ttachments..."
-msgstr "שמירת _כל הקבצים המצורפים…"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1882
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "שמירת ה_קובץ המצורף…"
-msgstr[1] "שמירת הק_בצים המצורפים…"
-msgstr[2] "שמירת הק_בצים המצורפים…"
-
-#. Reply to all on a message.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1897
-msgid "Reply to _All"
-msgstr "להשיב ל_כולם"
-
-#. Mark as read/unread.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1914
-msgid "_Mark as Read"
-msgstr "סימון כ_נקרא"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1918
-msgid "_Mark as Unread"
-msgstr "סימון כ_לא נקרא"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1924
-msgid "Mark Unread From _Here"
-msgstr "סימון כלא נקרא מ_כאן"
-
-#. Separator.
-#. View original message source.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:1939
-msgid "_View Source"
-msgstr "צפייה ב_מקור"
-
-#. Generate the attachment table.
-#. / Placeholder filename for attachments with no filename.
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2264
-#: ../src/engine/rfc822/rfc822-utils.vala:366
-msgid "none"
-msgstr "ללא שם"
-
-#: ../src/client/conversation-viewer/conversation-viewer.vala:2399
-msgid "Failed to open default text editor."
-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
+msgid "Subject:"
+msgstr "נושא:"
 
-#: ../src/client/conversation-viewer/conversation-web-view.vala:319
+#: src/client/conversation-viewer/conversation-message.vala:128
+msgid "This email address may have been forged"
+msgstr "יתכן וכתובת דוא״ל זו זויפה"
+
+#. Translators: Label text displayed when there are too
+#. 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 "להציג פחות"
+
+#. Translators: Label text displayed when there are
+#. too many email addresses to be shown by default in
+#. an email's header. The string substitution is the
+#. number of extra email to be shown.
+#: src/client/conversation-viewer/conversation-message.vala:260
 #, c-format
-msgid "%s - Conversation Inspector"
-msgstr "‏%s - מפקח תכתובת"
+msgid "%d more…"
+msgstr "עוד %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
+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
+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"
+msgid "Image"
+msgstr "תמונה"
+
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1305
+msgid "Remote images not shown"
+msgstr "תמונות מרוחקות לא מוצגות"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1307
+msgid "Only show remote images from senders you trust."
+msgstr "הצגת תמונות מרוחקות רק משולחים אמינים לך."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1311
+msgid "Show"
+msgstr "הצגה"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1315
+#| msgid "Always Show From Sender"
+msgid "Always show from sender"
+msgstr "תמיד להציג תמונות משולח זה"
 
-#: ../src/client/dialogs/attachment-dialog.vala:18
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:83
+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
+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"
+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
+msgid "Choosing an action will apply to all selected conversations"
+msgstr "כל פעולה שתיבחר תוחל על כלל התכתובות הנבחרות"
+
+#. Translators: Title label for placeholder when no
+#. 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."
+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
+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
+msgid "Your search returned no results, try refining your search terms"
+msgstr "החיפוש שלך לא הניב תוצאות, יש לנסות לשנות את מילות החיפוש"
+
+#: src/client/dialogs/attachment-dialog.vala:25
 msgid "Choose a file"
 msgstr "בחירת קובץ"
 
-#: ../src/client/dialogs/attachment-dialog.vala:23
+#: src/client/dialogs/attachment-dialog.vala:25
 msgid "_Attach"
 msgstr "_צירוף"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#: src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
 msgid "Untrusted Connection: %s"
 msgstr "התחברות לא מהימנה: %s"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#: src/client/dialogs/certificate-warning-dialog.vala:38
 #, c-format
 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:44
+#: 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."
+"Selecting “Trust This Server” or “Always Trust This Server” may cause your "
+"username and password to be transmitted insecurely."
 msgstr ""
 "בחירת „לבטוח בשרת זה” או „תמיד לבטוח בשרת זה” תגרום לשם המשתמש ולססמה שלך "
 "לעבור באופן לא בטוח."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: 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 "
+"Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
-msgstr "בחירת „לא לבטוח בשרת זה” תגרום ל־Geart לא לגשת לשרת זה."
+msgstr "בחירת „לא לבטוח בשרת זה” תגרום ל־Geary לא לגשת לשרת זה."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+#: src/client/dialogs/certificate-warning-dialog.vala:58
 msgid "Geary will not add or update this email account."
 msgstr "‏Geary לא יוסיף או יעדכן חשבון דוא״ל זה."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+#: 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."
-msgstr "בחירת „לא לבטוח בשרת זה” יגרום ל־Geart להפסיק לגשת לחשבון זה."
+"Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
+"account."
+msgstr "בחירת „לא לבטוח בשרת זה” תגרום ל־Geary להפסיק לגשת לחשבון זה."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "‏Geary יצא אם אין לך עוד חשבונות דוא״ל פתוחים."
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+#: src/client/dialogs/certificate-warning-dialog.vala:69
 msgid ""
 "Contact your system administrator or email service provider if you have any "
 "question about these issues."
@@ -1154,43 +2114,61 @@ msgstr ""
 "יש ליצור קשר עם מנהל המערכת או עם ספק שירות הדוא״ל שלך אם ברצונך לשאול על "
 "נושאים אלה."
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
-msgid "The server's certificate is not signed by a known authority"
+#: 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:76
-msgid "The server's identity does not match the identity in the certificate"
+#: 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:79
-msgid "The server's certificate has expired"
+#: 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:82
-msgid "The server's certificate has not been activated"
+#: 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:85
-msgid "The server's certificate has been revoked and is now invalid"
+#: 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:88
-msgid "The server's certificate is considered insecure"
+#: 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:91
-msgid "An error has occurred processing the server's certificate"
+#: 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"
+msgid "Details"
+msgstr "פרטים"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
-#: ../src/client/dialogs/password-dialog.vala:16
+#: src/client/dialogs/password-dialog.vala:16
 msgid "Geary requires your email password to continue"
 msgstr "‏Geary דורש את ססמת הדוא״ל שלך כדי להמשיך"
 
-#. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+#. Translators: Label displaying total number of email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:42
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1198,8 +2176,10 @@ msgstr[0] "הודעה אחת"
 msgstr[1] "%d הודעות"
 msgstr[2] "שתי הודעות"
 
-#. / Label displaying number of unread email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+#. Translators: Label displaying number of unread email
+#. messages in a folder. String substitution is the actual
+#. number.
+#: src/client/folder-list/folder-list-folder-entry.vala:52
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1207,19 +2187,21 @@ msgstr[0] "אחת לא נקראה"
 msgstr[1] "%d לא נקראו"
 msgstr[2] "%d לא נקראו"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../src/client/folder-list/folder-list-folder-entry.vala:45
+#. Translators: This string represents the divider between two
+#. messages: "n messages" and "n unread", shown in the folder
+#. list as a tooltip.  Please use your languages conventions
+#. for combining the two, i.e. a comma (",") for English; "6
+#. messages, 3 unread"
+#: src/client/folder-list/folder-list-folder-entry.vala:60
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+#: src/client/folder-list/folder-list-inboxes-branch.vala:14
 msgid "Inboxes"
 msgstr "תיבות דואר נכנס"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
@@ -1227,12 +2209,40 @@ msgstr[0] "%d תוצאות"
 msgstr[1] "%d תוצאות"
 msgstr[2] "%d תוצאות"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
+#. / Notification body when a message as been received
+#. / and other unread messages have not been
+#. / seen. First string substitution is the message
+#. / subject and the second is the number of unseen
+#. / messages
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:138
 #, c-format
-msgid "%s - New Messages"
-msgstr "‏%s - הודעות חדשות"
+#| 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)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] ""
+"%s\n"
+"(%d הודעה חדשה אחת)"
+msgstr[1] ""
+"%s\n"
+"(%d הודעות חדשות)"
+msgstr[2] ""
+"%s\n"
+"(שתי הודעות חדשות)"
 
-#: ../src/client/notification/libnotify.vala:74
+#. / Notification body when multiple messages have been
+#. / received at the same time and other unseen messages
+#. / exist. String substitution is the number of new
+#. / messages that have arrived.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:157
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1240,7 +2250,13 @@ msgstr[0] "הודעה חדשה אחת"
 msgstr[1] "%d הודעות חדשות"
 msgstr[2] "שתי הודעות חדשות"
 
-#: ../src/client/notification/libnotify.vala:77
+#. / Notification body when multiple messages have been
+#. / received at the same time and some unseen messages
+#. / already exist. String substitution is the message
+#. / above with the number of new messages that have
+#. / arrived, number substitution is the total number
+#. / of unseen messages.
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:167
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
@@ -1248,84 +2264,236 @@ msgstr[0] "%s, %d הודעה חדשה סך הכל"
 msgstr[1] "%s, %d הודעות חדשות סך הכל"
 msgstr[2] "%s, %d הודעות חדשות סך הכל"
 
-#: ../src/client/notification/libnotify.vala:109
+#. / 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] "הודעה חדשה"
+msgstr[1] "הודעות חדשות"
+msgstr[2] "שתי הודעות חדשות"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:4
+#| msgid "Email address:"
+msgid "Email Templates"
+msgstr "תבנית הודעה"
+
+#: src/client/plugin/email-templates/email-templates.plugin.desktop.in:5
+msgid "Create reusable templates for sending email"
+msgstr "יצירת תבנית לשימוש חוזר עבור הודעות יוצאות"
+
+#. Translators: Templates folder name alternatives. 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/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 ""
+"תבניות | תבנית דוא״ל | תבנית דואר | תבנית דואל | תבנית אימייל | תבנית מייל"
+
+#. Translators: The name of the folder used to
+#. store email templates
+#: src/client/plugin/email-templates/email-templates.vala:201
+msgid "Templates"
+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 "חדש"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:293
+msgid "Message template"
+msgstr "תבנית הודעה"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:297
+msgid "Send"
+msgstr "שליחה"
+
+#. Translators: Info bar button label for editing an
+#. existing email template
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/email-templates/email-templates.vala:305
+#: src/client/plugin/mail-merge/mail-merge.vala:336
+#: src/client/plugin/special-folders/special-folders.vala:187
+msgid "Edit"
+msgstr "עריכה"
+
+#. / Translators: Menu item label for invoking mail
+#. / merge in composer
+#. / Translators: File chooser title after invoking mail
+#. / merge in composer
+#. Translators: The name of the folder used to
+#. display merged email
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:5
+#: src/client/plugin/mail-merge/mail-merge.vala:288
+#: src/client/plugin/mail-merge/mail-merge.vala:389
+#: src/client/plugin/mail-merge/mail-merge.vala:488
+msgid "Mail Merge"
+msgstr "מיזוג הודעה"
+
+#: src/client/plugin/mail-merge/mail-merge.plugin.desktop.in:6
+msgid "Fill in and send email templates using a spreadsheet"
+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 "התחלה"
+
+#. Translators: Info bar label for pausing sending a mail
+#. merge
+#: src/client/plugin/mail-merge/mail-merge.vala:130
+msgid "Pause"
+msgstr "השהיה"
+
+#. Translators: Info bar description for the mail merge
+#. folder. The first string substitution the number of email
+#. already sent, the second is the total number to send.
+#: src/client/plugin/mail-merge/mail-merge.vala:240
 #, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
-"%s\n"
-"(%d הודעה חדשה אחת עבור %s)"
-msgstr[1] ""
-"%s\n"
-"(%d הודעות חדשות עבור %s)"
-msgstr[2] ""
-"%s\n"
-"(%d הודעות חדשות עבור %s)"
+msgid "Sent %u of %u"
+msgid_plural "Sent %u of %u"
+msgstr[0] "נשלח %u מתוך %u"
+msgstr[1] "נשלחו %u מתוך %u"
+msgstr[2] "נשלחו %u מתוך %u"
+
+#. Translators: Infobar status label for an email mail merge
+#. template
+#: src/client/plugin/mail-merge/mail-merge.vala:324
+msgid "Mail merge template"
+msgstr "תבנית מיזוג הודעות"
+
+#. Translators: Info bar button label for performing a
+#. mail-merge on an email template
+#: src/client/plugin/mail-merge/mail-merge.vala:328
+msgid "Merge"
+msgstr "מיזוג"
+
+#. / Translators: Action bar menu button label for
+#. / mail-merge plugin
+#: src/client/plugin/mail-merge/mail-merge.vala:377
+msgid "Insert field"
+msgstr "הכנסת שדה"
+
+#. / Translators: File chooser filer label
+#: src/client/plugin/mail-merge/mail-merge.vala:396
+msgid "Comma separated values (CSV)"
+msgstr "תוכן מופרד בפסיק (CSV)"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+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 "הצגת התרעות על _קבלת דואר חדש"
+
+#: 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 "צליל שליחה"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr "הפעלת צליל בשולחן העבודה ברגע שליחת דוא״ל"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:167
+msgid "Empty"
+msgstr "ריקון"
 
-#: ../src/client/notification/libnotify.vala:165
-msgid "Open"
-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 "הודעה זו טרם נשלחה."
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:198
+msgid "Message not saved"
+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 "הודעה זו נשלחה, אך טרם נשמרה בחשבון שלך."
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:69
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
-msgstr "ה־%-e ב%b"
-
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
+msgstr "%-e ב%b"
 
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
-msgstr "ה־%-e ב%B, %Y %-l:%M %P"
+msgstr "%-e ב%B, %Y %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
-msgstr "ה־%-e ב%B, %Y %-H:%M"
+msgstr "%-e ב%B, %Y %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%-e ב-%B, %Y %-H:%M"
 
-#: ../src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "עכשיו"
 
-#: ../src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
@@ -1333,7 +2501,7 @@ msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 msgstr[2] "לפני שתי דקות"
 
-#: ../src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
@@ -1341,114 +2509,160 @@ msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 msgstr[2] "לפני שעתיים"
 
-#: ../src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "אתמול"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "‏%A"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:832
-msgid "(no subject)"
+#. / 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)"
+msgid "(No subject)"
 msgstr "(ללא נושא)"
 
-#: ../src/client/util/util-files.vala:16
+#. / 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"
+msgid "(No recipients)"
+msgstr "(אין נמענים)"
+
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / 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
+#, c-format
+msgid "%s and %d other"
+msgid_plural "%s and %d others"
+msgstr[0] "‏%s ועוד אחד"
+msgstr[1] "‏%s ועוד %d"
+msgstr[2] "‏%s ועוד שניים"
+
+#. / 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
+#, 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
+#, 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
+#, c-format
+msgid "On %s:"
+msgstr "בתאריך %s:"
+
+#: src/client/util/util-email.vala:235
+msgid "---------- Forwarded message ----------"
+msgstr "---------- הודעה שהועברה ----------"
+
+#: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "בתים"
 
-#: ../src/client/util/util-files.vala:19
+#: src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
 msgid "TB"
 msgstr "ט״ב"
 
-#: ../src/client/util/util-files.vala:22
+#: src/client/util/util-files.vala:22
 msgctxt "Abbreviation for gigabyte"
 msgid "GB"
 msgstr "ג״ב"
 
-#: ../src/client/util/util-files.vala:25
+#: src/client/util/util-files.vala:25
 msgctxt "Abbreviation for megabyte"
 msgid "MB"
 msgstr "מ״ב"
 
-#: ../src/client/util/util-files.vala:28
+#: src/client/util/util-files.vala:28
 msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "ק״ב"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "דוא״ל Yahoo"
-
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
-
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "אחר"
-
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
-
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
-
-#: ../src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "דואר נכנס"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "טיוטות"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
+#: src/client/util/util-i18n.vala:277
+#| msgid "Sent Mail"
+msgid "Sent"
 msgstr "דואר יוצא"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "מסומן בכוכב"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "חשוב"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "כל ההודעות"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "דואר זבל"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr "זבל"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "אשפה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "בהמתנה לשליחה"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "ארכיון"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:26
-msgid "None"
-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
@@ -1462,7 +2676,7 @@ msgstr "כלום"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:99
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "מצורף"
@@ -1475,7 +2689,7 @@ msgstr "מצורף"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:108
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "מוסתר"
@@ -1487,7 +2701,7 @@ msgstr "מוסתר"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:116
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "גוף"
@@ -1500,7 +2714,7 @@ msgstr "גוף"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:125
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "עותק"
@@ -1513,7 +2727,7 @@ msgstr "עותק"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "מאת"
@@ -1525,7 +2739,7 @@ msgstr "מאת"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:142
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "זה"
@@ -1537,7 +2751,7 @@ msgstr "זה"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:150
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "נושא"
@@ -1550,729 +2764,1715 @@ msgstr "נושא"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:159
+#: 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-account.vala:180
-msgctxt "Search operator value - mail addressed to the user"
-msgid "me"
-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
+#. 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
+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
+msgctxt "Outlook localised name"
+msgid "Sent Items"
+msgstr "דואר יוצא"
+
+#. List of general possible folder names to match for the
+#. 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
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+"דואר זבל | ספאם | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk "
+"Mail | Bulk Email | Bulk E-Mail"
+
+#. List of general possible folder names to match for the
+#. 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
+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
+msgctxt "Outlook localised name"
+msgid "Deleted Items"
+msgstr "אשפה"
+
+#. List of general possible folder names to match for the
+#. 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
+msgid "Archive | Archives"
+msgstr "ארכיון | ארכיב | ארכיונים | ארכיבים | Archive | Archives"
+
+#: src/engine/rfc822/rfc822-message.vala:528
+#, c-format
+msgid "Could not determine mime type for “%s”."
+msgstr "לא ניתן לקבוע את סוג הקובץ עבור „%s”"
+
+#: src/engine/rfc822/rfc822-message.vala:539
+#, c-format
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr "לא ניתן לקבוע את סוג תוכן סוג הקובץ „%s” ב־„%s”."
+
+#: src/engine/rfc822/rfc822-message.vala:1013
+msgid "(no subject)"
+msgstr "(ללא נושא)"
+
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+#| msgid "Add account"
+msgid "Add an account"
+msgstr "הוספת חשבון"
+
+#: ui/accounts_editor_add_pane.ui:53
+msgid "_Create"
+msgstr "_יצירה"
+
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+msgid "Receiving"
+msgstr "קבלה"
+
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
+#| msgid "Sending..."
+msgid "Sending"
+msgstr "שליחה"
+
+#: ui/accounts_editor_edit_pane.ui:8
+#| msgid "Edit account"
+msgid "Edit Account"
+msgstr "עריכת חשבון"
+
+#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+#| msgid "Accounts"
+msgid "Account Name"
+msgstr "שם חשבון"
+
+#: ui/accounts_editor_edit_pane.ui:124
+#| msgid "Email address:"
+msgid "Email addresses"
+msgstr "כתובת דוא״ל"
+
+#: ui/accounts_editor_edit_pane.ui:164
+msgid "Signature"
+msgstr "חתימה"
+
+#: ui/accounts_editor_edit_pane.ui:201
+#| msgid "SMTP settings"
+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"
+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"
+msgid "Remove this account from Geary"
+msgstr "הסרת חשבון זה מ־Geary"
+
+#: ui/accounts_editor_list_pane.ui:8
+msgid "Accounts"
+msgstr "משתמשים"
+
+#: ui/accounts_editor_list_pane.ui:62
+msgid "To get started, select an email provider below."
+msgstr "על מנת להתחיל, יש לבחור ספק דוא״ל להלן."
+
+#: ui/accounts_editor_list_pane.ui:75
+#| msgid "Welcome to Geary."
+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
+msgid "Apply"
+msgstr "החלה"
+
+#: ui/certificate_warning_dialog.glade:7
+msgid "Untrusted Connection"
+msgstr "חיבור לא מהימן"
+
+#: ui/certificate_warning_dialog.glade:29
+msgid "_Always Trust This Server"
+msgstr "_תמיד לבטוח בשרת זה"
+
+#: ui/certificate_warning_dialog.glade:43
+msgid "_Trust This Server"
+msgstr "_לבטוח בשרת זה"
+
+#: ui/certificate_warning_dialog.glade:57
+#| msgid "_Don't Trust This Server"
+msgid "_Don’t Trust This Server"
+msgstr "ל_א לבטוח בשרת זה"
+
+#: ui/composer-editor.ui:100
+msgid "Bold text"
+msgstr "טקסט מודגש"
+
+#: ui/composer-editor.ui:124
+#| msgid "Italic (Ctrl+I)"
+msgid "Italic text"
+msgstr "טקסט נטוי"
+
+#: ui/composer-editor.ui:148
+#| msgid "Underline (Ctrl+U)"
+msgid "Underline text"
+msgstr "טקסט עם קו תחתי"
+
+#: ui/composer-editor.ui:172
+#| msgid "Strikethrough (Ctrl+K)"
+msgid "Strikethrough text"
+msgstr "טקסט עם קו חוצה"
+
+#: ui/composer-editor.ui:205
+msgid "Insert bulleted list"
+msgstr "הכנסת רשימת תבליטים"
+
+#: ui/composer-editor.ui:229
+msgid "Insert numbered list"
+msgstr "הכנסת רשימה ממסופרת"
+
+#: ui/composer-editor.ui:262
+msgid "Indent or quote text"
+msgstr "הזחה או ציטוט טקסט"
+
+#: ui/composer-editor.ui:286
+msgid "Un-indent or unquote text"
+msgstr "ביטול הזחה או ביטול ציטוט טקסט"
+
+#: ui/composer-editor.ui:315
+#| msgid "Remove formatting (Ctrl+Space)"
+msgid "Remove text formatting"
+msgstr "הסרת טקסט מעוצב"
+
+#: ui/composer-editor.ui:334
+msgid "Change font type"
+msgstr "שינוי סוג גופן"
+
+#: ui/composer-editor.ui:349
+msgid "Sans Serif"
+msgstr "גופן חסר עיטור"
+
+#: ui/composer-editor.ui:360
+msgid "Serif"
+msgstr "גופן מעוטר"
+
+#: ui/composer-editor.ui:371
+msgid "Fixed Width"
+msgstr "רוחב קבוע"
+
+#: ui/composer-editor.ui:397
+msgid "Change font color"
+msgstr "שינוי צבע גופן"
+
+#: ui/composer-editor.ui:412
+msgid "Change font size"
+msgstr "שינוי גודל גופן"
+
+#: ui/composer-editor.ui:447
+msgid "Insert or update text link"
+msgstr "הכנסה או עדכון קישור לטקסט"
+
+#: ui/composer-editor.ui:471
+msgid "Insert an image"
+msgstr "הכנסת תמונה"
+
+#: ui/composer-editor.ui:513
+msgid "Undo last edit"
+msgstr "ביטול העריכה האחרונה"
+
+#: ui/composer-editor.ui:537
+msgid "Redo last edit"
+msgstr "ביצוע חוזר של העריכה האחרונה"
+
+#: ui/composer-editor.ui:566 ui/composer-editor.ui:591
+#| msgid "Attach File"
+msgid "Attach a file"
+msgstr "צירוף קובץ"
+
+#: ui/composer-editor.ui:615
+#| msgid "Include Original Attachments"
+msgid "Add original attachments"
+msgstr "הוספת הקבצים המצורפים המקוריים"
+
+#: ui/composer-editor.ui:660
+msgid "More options"
+msgstr "אפשרויות נוספות"
+
+#: ui/composer-editor.ui:680
+#| msgid "Remove formatting (Ctrl+Space)"
+msgid "Show formatting toolbar"
+msgstr "הצגת סרגל עיצוב"
+
+#: ui/composer-editor.ui:698
+#| msgid "Select spell checking language"
+msgid "Select spell checking languages"
+msgstr "בחירת שפות לבדיקת איות"
+
+#: ui/composer-editor.ui:723
+msgid "S_ans Serif"
+msgstr "_בלתי מעוטר"
+
+#: ui/composer-editor.ui:728
+msgid "S_erif"
+msgstr "_מעוטר"
+
+#: ui/composer-editor.ui:733
+msgid "_Fixed Width"
+msgstr "_רוחב קבוע"
+
+#: ui/composer-editor.ui:743
+msgid "_Small"
+msgstr "_קטן"
+
+#: ui/composer-editor.ui:748
+msgid "_Medium"
+msgstr "_בינוני"
+
+#: ui/composer-editor.ui:753
+msgid "Lar_ge"
+msgstr "_גדול"
+
+#: ui/composer-editor.ui:763
+msgid "_Rich Text"
+msgstr "טקסט _עשיר"
+
+#: ui/composer-editor.ui:768
+#| msgid "_Rich Text"
+msgid "_Plain Text"
+msgstr "טקסט _פשוט"
+
+#: ui/composer-editor-menus.ui:8
+msgid "_Undo"
+msgstr "_ביטול"
+
+#: ui/composer-editor-menus.ui:12
+msgid "_Redo"
+msgstr "ביצוע _שוב"
+
+#: ui/composer-editor-menus.ui:18 ui/composer-editor-menus.ui:36
+msgid "Cu_t"
+msgstr "_גזירה"
+
+#: ui/composer-editor-menus.ui:22 ui/composer-editor-menus.ui:40
+#: ui/conversation-message-menus.ui:37
+msgid "_Copy"
+msgstr "ה_עתקה"
+
+#: ui/composer-editor-menus.ui:26 ui/composer-editor-menus.ui:44
+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 "הדבקה _ללא עיצוב"
+
+#: ui/composer-editor-menus.ui:50
+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
+msgid "Detach the composer from the window"
+msgstr "ניתוק יוצר ההודעות מהחלון"
+
+#: ui/composer-headerbar.ui:135
+msgid "_Send"
+msgstr "_שליחה"
+
+#: ui/composer-headerbar.ui:162
+msgid "Discard and Close"
+msgstr "השלכה וסגירה"
+
+#: ui/composer-headerbar.ui:186
+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
+msgid "Insert the new link with this URL"
+msgstr "הכנסת הקישור החדש עם כתובת זו"
+
+#: ui/composer-link-popover.ui:43
+#| msgid "_Add"
+msgid "Add"
+msgstr "הוספה"
+
+#: ui/composer-link-popover.ui:47
+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
+msgid "Update this link’s URL"
+msgstr "עדכון כתובת קישור זה"
+
+#: ui/composer-link-popover.ui:62
+#| msgid "_Update"
+msgid "Update"
+msgstr "עדכון"
+
+#: ui/composer-link-popover.ui:75
+#| msgctxt "Outlook localised name"
+#| msgid "Deleted Items"
+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
+msgid "Drop files here"
+msgstr "יש לגרור קבצים לכאן"
+
+#: ui/composer-widget.ui:462
+msgid "To add them as attachments"
+msgstr "כדי להוסיף אותם כקבצים מצורפים"
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+#| msgid "Save All A_ttachments..."
+msgid "Select all attachments"
+msgstr "בחירת הקבצים הנבחרים"
+
+#: ui/components-attachment-pane.ui:66
+#| msgid "Save All A_ttachments..."
+msgid "Save selected attachments"
+msgstr "שמירת הקבצים הנבחרים"
+
+#: ui/components-attachment-pane.ui:85
+#| msgid "Cannot add attachment"
+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
+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 "
+"channels</a> or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/"
+"ReportingABug\">new bug report</a>."
+msgstr ""
+"אם הבעיה קריטית או מתמשכת, נא לשמור ולשלוח את הפרטים באחד מ<a href=\"https://"
+"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"
+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"
+msgid "Search for matching log entries"
+msgstr "חיפוש עבור התאמות ברשומות היומן"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:35
+msgid "Toggle appending new log entries"
+msgstr ""
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:55
+msgid "Add a marker entry to the log"
+msgstr ""
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:81 ui/problem-details-dialog.ui:51
+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
+msgid "Copy to clipboard"
+msgstr "העתקה ללוח הגזירים"
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:121
+msgid "Clears all log entries"
+msgstr "ניקוי כל רשומות היומן"
+
+#: ui/conversation-contact-popover.ui:146
+#| msgid "Move conversation"
+msgid "New Conversation…"
+msgstr "תכתובת חדשה…"
+
+#: ui/conversation-contact-popover.ui:159
+#| msgid "Copy _Email Address"
+msgid "Copy Email Address"
+msgstr "העתקת כתובת דוא״ל"
+
+#: ui/conversation-contact-popover.ui:182
+msgid "Save in Contacts…"
+msgstr "שמירה באנשי הקשר…"
+
+#: ui/conversation-contact-popover.ui:195
+#| msgid "Move conversations"
+msgid "Show Conversations"
+msgstr "הצגת תכתובות"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr "פתיחה באנשי קשר"
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr "תמיד לטעון תמונות מרוחקות"
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+#| msgid "Remove email address"
+msgid "Deceptive email address"
+msgstr "כתובת דוא״ל מטעה"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+#| msgid "Email address:"
+msgid "This email address is:"
+msgstr "כתובת דוא״ל זו היא:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr "אבל הוצגה כ:"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr "השולח עשוי להיות לא אמין"
+
+#: ui/conversation-email.ui:27
+#| msgid "Save All A_ttachments..."
+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
+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
+msgid "Mark this message as not starred"
+msgstr "לבטל סימון הודעה זו בכוכב"
+
+#. Translators: Menu item to reply to a specific message.
+#: ui/conversation-email-menus.ui:15
+msgid "Reply to _All"
+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 "סימון כ_לא נקרא"
+
+#. Translators: Menu item to mark all messages in a
+#. conversation from this one as unread.
+#: ui/conversation-email-menus.ui:42
+msgid "Mark Unread From _Here"
+msgstr "סימון כלא נקרא מ_כאן"
+
+#. Translators: Menu item to move a single, specific message
+#. to the trash folder
+#: ui/conversation-email-menus.ui:50
+msgid "Move message to _Trash"
+msgstr "העברת הודעה ל_אשפה"
+
+#. Translators: Menu item to delete a single, specific message
+#: ui/conversation-email-menus.ui:57
+#| msgid "Select _Message"
+msgid "_Delete message…"
+msgstr "_מחיקת הודעה…"
+
+#. Translators: Menu item to view the source for a message
+#: ui/conversation-email-menus.ui:69
+msgid "_View Source"
+msgstr "צפייה ב_מקור"
+
+#: ui/conversation-message-link-popover.ui:54
+#| msgid "but actually goes to"
+msgid "But actually goes to:"
+msgstr "אך למעשה הולך אל:"
+
+#: ui/conversation-message-link-popover.ui:84
+#| msgid "This link appears to go to"
+msgid "The link appears to go to:"
+msgstr "הקישור מראה שהוא הולך אל:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "נמצא קישור מטעה"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "שולח ההודעה עשוי להוביל אותך לאתר אינטרנט לא נכון."
+
+#: ui/conversation-message-link-popover.ui:124
+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
+msgid "From <email>"
+msgstr "מאת <email>"
+
+#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
+msgid "1/1/1970\t"
+msgstr "1/1/1970\t"
+
+#: ui/conversation-message.ui:102
+msgid "Preview body text."
+msgstr "תצוגה מקדימה של גוף הטקסט"
+
+#: ui/conversation-message.ui:202
+msgid "Sent by:"
+msgstr "נשלח על ידי:"
+
+#: ui/conversation-message.ui:247
+#| msgid "Reply-To: "
+msgid "Reply to:"
+msgstr "להשיב אל:"
+
+#: ui/conversation-message.ui:291
+#| msgid "Subject:"
+msgid "Subject"
+msgstr "נושא"
+
+#: ui/conversation-viewer.ui:60
+#| msgid "Mark conversation"
+msgid "Find in conversation"
+msgstr "חיפוש בתכתובת"
+
+#: ui/conversation-viewer.ui:75
+msgid "Find the previous occurrence of the search string."
+msgstr "חיפוש המופע הקודם של המילה או הביטוי."
+
+#: ui/conversation-viewer.ui:96
+msgid "Find the next occurrence of the search string."
+msgstr "חיפוש המופע הבא של המילה או הביטוי."
+
+#: ui/find_bar.glade:66
+msgid "Find:"
+msgstr "חיפוש:"
+
+#: ui/find_bar.glade:89
+msgid "_Previous"
+msgstr "ה_קודם"
+
+#: ui/find_bar.glade:107
+msgid "_Next"
+msgstr "ה_בא"
+
+#: ui/find_bar.glade:125
+msgid "_Case sensitive"
+msgstr "התאמת _רישיות"
+
+#: ui/find_bar.glade:145
+msgid "label"
+msgstr "תוויות"
+
+#: ui/gtk/help-overlay.ui:9
+#| msgid "%s - Conversation Inspector"
+msgid "Conversation Shortcuts"
+msgstr "צירופי מקשים לתכתובת"
+
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
+#| msgid "Notifications"
+msgctxt "shortcut window"
+msgid "Actions"
+msgstr "פעולות"
+
+#: ui/gtk/help-overlay.ui:17
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "New conversation"
+msgstr "תכתובת חדשה"
+
+#: ui/gtk/help-overlay.ui:24
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "להשיב לשולח"
+
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to all"
+msgstr "להשיב לכולם"
+
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
+#| msgid "_Forward"
+msgctxt "shortcut window"
+msgid "Forward"
+msgstr "העברה"
+
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
+msgctxt "shortcut window"
+msgid "Un-mark/mark read"
+msgstr "סימון/ביטול סימן כנקרא"
+
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
+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)"
+msgctxt "shortcut window"
+msgid "Archive conversations"
+msgstr "תיוק שיחות בארכיון"
+
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:326
+#| msgid "Move conversations"
+msgctxt "shortcut window"
+msgid "Move conversations"
+msgstr "העברת תכתובות"
+
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:333
+#| msgid "Mark conversations"
+msgctxt "shortcut window"
+msgid "Label conversations"
+msgstr "סימון תכתובות"
+
+#: ui/gtk/help-overlay.ui:80
+#| msgid "Mark conversations"
+msgctxt "shortcut window"
+msgid "Trash conversations"
+msgstr "העברת תכתובות לאשפה"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:340
+#| msgid "Mark conversations"
+msgctxt "shortcut window"
+msgid "Junk conversations"
+msgstr "העברת תכתובות לזבל"
+
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:347
+#| msgid "Delete conversation"
+msgctxt "shortcut window"
+msgid "Delete conversations"
+msgstr "מחיקת תכתובות"
+
+#: ui/gtk/help-overlay.ui:104
+#| msgid "Search"
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "חיפוש"
+
+#: ui/gtk/help-overlay.ui:108
+#| msgid "Mark conversations"
+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"
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "חיפוש בתכתובת הנוכחית"
+
+#: ui/gtk/help-overlay.ui:141
+#| msgid "_Undo"
+msgctxt "shortcut window"
+msgid "Undo"
+msgstr "ביטול"
+
+#: ui/gtk/help-overlay.ui:145
+msgctxt "shortcut window"
+msgid "Undo the last action"
+msgstr "ביטול הפעולה האחרונה"
+
+#: ui/gtk/help-overlay.ui:152
+msgctxt "shortcut window"
+msgid "Redo the last action"
+msgstr "ביצוע חוזר של הפעולה האחרונה שבוטלה"
+
+#: ui/gtk/help-overlay.ui:161
+msgctxt "shortcut window"
+msgid "View"
+msgstr "תצוגה"
+
+#: ui/gtk/help-overlay.ui:165
+msgctxt "shortcut window"
+msgid "Zoom in"
+msgstr "התקרבות"
+
+#: ui/gtk/help-overlay.ui:172
+msgctxt "shortcut window"
+msgid "Zoom out"
+msgstr "התרחקות"
+
+#: ui/gtk/help-overlay.ui:179
+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"
+msgid "Composer Shortcuts"
+msgstr "קיצורים ליוצר ההודעות"
+
+#: ui/gtk/help-overlay.ui:381
+#| msgid "Send"
+msgctxt "shortcut window"
+msgid "Send"
+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-account.vala:192
-msgctxt "Search operator value - mail sent by the user"
-msgid "me"
-msgstr "אני"
+#: ui/gtk/help-overlay.ui:388
+#| msgctxt "Search operator"
+#| msgid "attachment"
+msgctxt "shortcut window"
+msgid "Add attachment"
+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-account.vala:204
-msgctxt "'is:' search operator value"
-msgid "read"
-msgstr "נקרא"
+#: ui/gtk/help-overlay.ui:395
+msgctxt "shortcut window"
+msgid "Detach the composer"
+msgstr "ניתוק יוצר ההודעות"
+
+#: ui/gtk/help-overlay.ui:408
+#| msgid "Use %s to open a new composer window"
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "סגירת חלון יוצר ההודעות"
+
+#: ui/gtk/help-overlay.ui:415
+#| msgid "Use %s to open a new composer window"
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "ניתוק חלון יוצר ההודעות"
+
+#: ui/gtk/help-overlay.ui:422
+#| msgid "Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+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-account.vala:215
-msgctxt "'is:' search operator value"
-msgid "starred"
-msgstr "מסומן בכוכב"
+#: ui/gtk/help-overlay.ui:427
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "העברת הבחירה ללוח הגזירים"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "העתקת הבחירה ללוח הגזירים"
+
+#: ui/gtk/help-overlay.ui:441
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "הדבקה מלוח הגזירים"
+
+#: ui/gtk/help-overlay.ui:448
+#| msgid "Quote text  (Ctrl+])"
+msgctxt "shortcut window"
+msgid "Quote text"
+msgstr "ציטוט טקסט"
+
+#: ui/gtk/help-overlay.ui:455
+#| msgid "Unquote text (Ctrl+[)"
+msgctxt "shortcut window"
+msgid "Unquote text"
+msgstr "סוף ציטוט טקסט"
+
+#: ui/gtk/help-overlay.ui:464
+msgctxt "shortcut window"
+msgid "Rich text editing"
+msgstr "עריכת טקסט עשירה"
+
+#: ui/gtk/help-overlay.ui:468
+#| msgctxt "Clipboard paste with rich text"
+#| msgid "Paste _With Formatting"
+msgctxt "shortcut window"
+msgid "Paste without formatting"
+msgstr "הדבקה ללא עיצוב"
+
+#: ui/gtk/help-overlay.ui:475
+msgctxt "shortcut window"
+msgid "Bold text"
+msgstr "טקסט מודגש"
+
+#: ui/gtk/help-overlay.ui:482
+msgctxt "shortcut window"
+msgid "Italicize text"
+msgstr "טקסט נטוי"
+
+#: ui/gtk/help-overlay.ui:489
+#| msgid "Underline (Ctrl+U)"
+msgctxt "shortcut window"
+msgid "Underline text"
+msgstr "טקסט עם קו תחתי"
+
+#: ui/gtk/help-overlay.ui:496
+msgctxt "shortcut window"
+msgid "Strike text"
+msgstr "טקסט עם קו חוצה"
+
+#: ui/gtk/help-overlay.ui:503
+#| msgid "Remove formatting (Ctrl+Space)"
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "הסרת עיצוב"
+
+#: ui/gtk/help-overlay.ui:510
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "הכנסת תמונה"
+
+#: ui/gtk/help-overlay.ui:517
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "הכנסת קישור"
+
+#: ui/main-toolbar.ui:24
+#| msgid "Compose Message"
+msgctxt "tooltip"
+msgid "Compose Message"
+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-account.vala:225
-msgctxt "'is:' search operator value"
-msgid "unread"
-msgstr "לא נקרא"
+#: ui/main-toolbar.ui:62
+msgid "Toggle search bar"
+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:626
-msgid "Drafts | Draft"
-msgstr "טיוטות | טיוטה | Drafts | Draft"
+#: ui/main-toolbar.ui:114
+#| msgid "_Reply"
+msgid "Reply"
+msgstr "להשיב"
 
-#. 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:635
-msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
-msgstr "דואר יוצא | דואר נשלח | Sent | Sent Mail | Sent Email | Sent E-Mail"
+#: ui/main-toolbar.ui:137
+#| msgid "R_eply All"
+msgid "Reply All"
+msgstr "להשיב לכולם"
 
-#. The localised name(s) of the Sent folder name as used
-#. by MS Outlook/Exchange.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:640
-msgctxt "Outlook localised name"
-msgid "Sent Items"
-msgstr "דואר יוצא"
+#: ui/main-toolbar.ui:160
+#| msgid "_Forward"
+msgid "Forward"
+msgstr "העברה"
 
-#. List of general possible folder names to match for the
-#. 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:650
-msgid ""
-"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
-"| Bulk E-Mail"
-msgstr ""
-"דואר זבל | ספאם | Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk "
-"Mail | Bulk Email | Bulk E-Mail"
+#: ui/main-toolbar.ui:265
+#| msgid "Toggle search bar"
+msgid "Toggle find bar"
+msgstr "הצגת סרגל החיפוש"
 
-#. List of general possible folder names to match for the
-#. 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:660
-msgid "Trash | Rubbish | Rubbish Bin"
-msgstr "אשפה | זבל | Trash | Rubbish | Rubbish Bin"
+#: ui/main-toolbar.ui:286
+msgid "_Archive"
+msgstr "תיוק ב_ארכיון"
 
-#. The localised name(s) of the Trash folder name as used
-#. by MS Outlook/Exchange.
-#: ../src/engine/imap-engine/imap-engine-generic-account.vala:665
-msgctxt "Outlook localised name"
-msgid "Deleted Items"
-msgstr "אשפה"
+#: ui/main-toolbar-menus.ui:21
+msgid "Toggle as _Junk"
+msgstr "סימון/ביטול סימון כ_זבל"
 
-#. List of general possible folder names to match for the
-#. 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:675
-msgid "Archive | Archives"
-msgstr "ארכיון | ארכיב | ארכיונים | ארכיבים | Archive | Archives"
+#: ui/main-toolbar-menus.ui:28
+#| msgid "Accounts"
+msgid "_Accounts"
+msgstr "_חשבונות"
 
-#. / 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/engine/rfc822/rfc822-utils.vala:215
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y בשעה %-l:%M %p"
+#: ui/main-toolbar-menus.ui:36
+msgid "_Keyboard Shortcuts"
+msgstr "_צירופי מקשים"
 
-#. / 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/engine/rfc822/rfc822-utils.vala:221
-#, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "בתאריך %1$s, %2$s כתב:"
+#: ui/main-toolbar-menus.ui:47
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "על _אודות Geary"
 
-#. / 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/engine/rfc822/rfc822-utils.vala:228
-#, c-format
-msgid "%s wrote:"
-msgstr "נכתב על ידי %s:"
+#: ui/password-dialog.glade:74
+msgid "SMTP Credentials"
+msgstr "אישורי SMTP"
 
-#. / 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/engine/rfc822/rfc822-utils.vala:234
-#, c-format
-msgid "On %s:"
-msgstr "בתאריך %s:"
+#: ui/password-dialog.glade:91
+msgid "Username"
+msgstr "שם משתמש"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:263
-msgid "---------- Forwarded message ----------"
-msgstr "---------- הודעה שהועברה ----------"
+#: ui/password-dialog.glade:152
+msgid "_Remember password"
+msgstr "שמירת ה_ססמה"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:267
-#, c-format
-msgid "From: %s\n"
-msgstr "מאת: %s\n"
+#: ui/password-dialog.glade:210
+msgid "_Authenticate"
+msgstr "אי_מות"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:268
-#, c-format
-msgid "Subject: %s\n"
-msgstr "נושא: %s\n"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "‏Geary בתהליך שדרוג…"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:269
-#, c-format
-msgid "Date: %s\n"
-msgstr "תאריך: %s\n"
+#~ msgid "Mail Client"
+#~ msgstr "לקוח דוא״ל"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:272
-#, c-format
-msgid "To: %s\n"
-msgstr "אל: %s\n"
+#~ msgid "Geary Mail"
+#~ msgstr "דואר אלקטרוני Geary"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:275
-#, c-format
-msgid "Cc: %s\n"
-msgstr "עותק: %s\n"
+#~ msgid "Additional addresses for %s"
+#~ msgstr "כתובות נוספות עבור %s"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr "<span weight=\"bold\" size=\"larger\">לא ניתן למחוק משתמש</span>"
+#~ msgid "First Last"
+#~ msgstr "שם פרטי שם משפחה"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr "חלון כתיבה הקשור במשתמש זה פתוח כרגע. שלח או מחק את ההודעה ונסה שוב."
+#~ msgid "Enter your account information to get started."
+#~ msgstr "נא להזין את פרטי החשבון שלך כדי להתחיל."
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "הוספת חשבון"
+#~ msgid "Preview"
+#~ msgstr "תצוגה מקדימה"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
-msgstr "עריכת חשבון"
+#~ msgid "Remem_ber passwords"
+#~ msgstr "זכירת סס_מאות"
 
-#: ../ui/account_list.glade.h:3
-msgid "Remove account"
-msgstr "הסרת חשבון"
+#~ msgid "Remem_ber password"
+#~ msgstr "זכירת _ססמה"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "יש להמתין כאשר Geary מאמת את החשבון שלך."
+#~ msgid "Unable to validate:\n"
+#~ msgstr "לא ניתן לאמת לאמת:\n"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
-msgid "Untrusted Connection"
-msgstr "חיבור לא מהימן"
+#~ msgid "        &#8226; Invalid account nickname.\n"
+#~ msgstr "        &#8226; כינוי חשבון לא חוקי.\n"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
-msgid "_Always Trust This Server"
-msgstr "_תמיד לבטוח בשרת זה"
+#~ msgid "        &#8226; Email address already added to Geary.\n"
+#~ msgstr "        &#8226; כתובת דוא״ל זה כבר נוסף ל־Geary.\n"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
-msgid "_Trust This Server"
-msgstr "_לבטוח בשרת זה"
+#~ msgid "        &#8226; IMAP connection error.\n"
+#~ msgstr "        &#8226; IMAP בעיית חיבור.\n"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
-msgid "_Don't Trust This Server"
-msgstr "ל_א לבטוח בשרת זה"
+#~ msgid "        &#8226; IMAP username or password incorrect.\n"
+#~ msgstr "&#8226; שם משתמש או ססמת ה־IMAP שגויים.\n"
 
-#: ../ui/composer.glade.h:1
-msgid "_Undo"
-msgstr "_ביטול"
+#~ msgid "        &#8226; SMTP connection error.\n"
+#~ msgstr "        &#8226; SMTP בעיית חיבור.\n"
 
-#: ../ui/composer.glade.h:2
-msgid "_Redo"
-msgstr "ביצוע _שוב"
+#~ msgid "        &#8226; SMTP username or password incorrect.\n"
+#~ msgstr "        &#8226; שם משתמש או ססמת SMTP אינם נכונים.\n"
 
-#: ../ui/composer.glade.h:3
-msgid "Cu_t"
-msgstr "_גזירה"
+#~ msgid "        &#8226; Connection error.\n"
+#~ msgstr "&#8226; בעיית חיבור.\n"
 
-#: ../ui/composer.glade.h:5
-msgid "_Paste"
-msgstr "הד_בקה"
+#~ msgid "        &#8226; Username or password incorrect.\n"
+#~ msgstr "        &#8226; שם משתמש או ססמה אינם נכונים.\n"
 
-#: ../ui/composer.glade.h:6
-msgid "_Left"
-msgstr "_שמאל"
+#~ msgid "Output debugging information"
+#~ msgstr "הצגת מידע שיסייע באיתור תקלות"
 
-#: ../ui/composer.glade.h:7
-msgid "_Right"
-msgstr "_ימין"
+#~ msgid "Log network serialization"
+#~ msgstr "ביצוע רישום של network serialization"
 
-#: ../ui/composer.glade.h:8
-msgid "_Center"
-msgstr "_מרכז"
+#~ msgid "Log periodic activity"
+#~ msgstr "ביצוע רישום של פעילות תקופתית"
 
-#: ../ui/composer.glade.h:9
-msgid "_Justify"
-msgstr "יישו_ר"
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "לאפשר בדיקה של WebView"
 
-#: ../ui/composer.glade.h:10
-msgid "Link (Ctrl+L)"
-msgstr "קישור (Ctrl+ך)"
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "נא לשלוח הערות, הצעות ודיווחי תקלות לכתובת:"
 
-#: ../ui/composer.glade.h:11
-msgid "C_olor"
-msgstr "_צבע"
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "ניתוח הפרמטרים שהועברו בשורת הפקודה נכשל: %s\n"
 
-#: ../ui/composer.glade.h:12
-msgid "More options"
-msgstr "אפשרויות נוספות"
+#~ msgid "Unrecognized command line option \"%s\"\n"
+#~ msgstr "הפרמטרים לשורת הפקודה אינם מוכרים: „%s”\n"
 
-#: ../ui/composer.glade.h:13
-msgid "Quote text  (Ctrl+])"
-msgstr "ציטוט טקסט (Ctrl+])"
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgstr "מחיקת שיחה (Shift+Delete)"
 
-#: ../ui/composer.glade.h:14
-msgid "Unquote text (Ctrl+[)"
-msgstr "סוף ציטוט טקסט (Ctrl+[)"
+#~ msgid "Delete conversations (Shift+Delete)"
+#~ msgstr "מחיקת שיחות (Shift+Delete)"
 
-#: ../ui/composer.glade.h:15
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "הסרת עיצוב (Ctrl+רווח)"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgstr "הזזת שיחה לאשפה (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:16
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
-msgstr "הדבקה עם עי_צוב"
+#~ msgid "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr "הזזת שיחות לאשפה (Delete, Backspace)"
 
-#: ../ui/composer.glade.h:18
-msgid "Bold (Ctrl+B)"
-msgstr "מודגש (Ctrl+נ)"
+#~ msgid "Mark as S_pam"
+#~ msgstr "סימון כ_דואר זבל"
 
-#: ../ui/composer.glade.h:19
-msgid "Italic (Ctrl+I)"
-msgstr "נטוי (Ctrl+ן)"
+#~ msgid "Mark as not S_pam"
+#~ msgstr "סימון כלא דואר ז_בל"
 
-#: ../ui/composer.glade.h:20
-msgid "Underline (Ctrl+U)"
-msgstr "קו תחתי (Ctrl+ו)"
+#~ msgid "Add label to conversations"
+#~ msgstr "הוספת תווית לשיחות"
 
-#: ../ui/composer.glade.h:21
-msgid "Strikethrough (Ctrl+K)"
-msgstr "קו חוצה (Ctrl+ל)"
+#~ msgid "A_ccounts"
+#~ msgstr "_חשבונות"
 
-#: ../ui/composer.glade.h:22
-msgid "_Rich Text"
-msgstr "טקסט _עשיר"
+#~ msgid "_Mark as..."
+#~ msgstr "_סימון בתור…"
 
-#: ../ui/composer.glade.h:23
-msgid "Show Extended Fields"
-msgstr "הצגת שדות מורחבים"
-
-#: ../ui/composer.glade.h:24
-msgctxt "Label"
-msgid "Close and Save"
-msgstr "סגירה ושמירה"
-
-#: ../ui/composer.glade.h:25
-msgctxt "Short Label"
-msgid "Close and Save"
-msgstr "סגירה ושמירה"
-
-#: ../ui/composer.glade.h:26
-msgctxt "Tooltip"
-msgid "Close and Save"
-msgstr "סגירה ושמירה"
-
-#: ../ui/composer.glade.h:27
-msgctxt "Label"
-msgid "Close and Discard"
-msgstr "סגירה והשלכה"
-
-#: ../ui/composer.glade.h:28
-msgctxt "Short Label"
-msgid "Close and Discard"
-msgstr "סגירה והשלכה"
-
-#: ../ui/composer.glade.h:29
-msgctxt "Tooltip"
-msgid "Close and Discard"
-msgstr "סגירה והשלכה"
-
-#: ../ui/composer.glade.h:30
-msgid "Lar_ge"
-msgstr "_גדול"
+#~ msgid "Add label"
+#~ msgstr "הוספת תווית"
 
-#: ../ui/composer.glade.h:31
-msgid "Large"
-msgstr "גדול"
+#~ msgid "_Label"
+#~ msgstr "_תווית"
 
-#: ../ui/composer.glade.h:32
-msgid "_Medium"
-msgstr "_בינוני"
+#~ msgid "_Move"
+#~ msgstr "ה_עברה"
 
-#: ../ui/composer.glade.h:33
-msgid "Medium"
-msgstr "בינוני"
+#~ msgid "Compose new message (Ctrl+N, N)"
+#~ msgstr "יצירת הודעה חדשה (Ctrl+מ, מ)"
 
-#: ../ui/composer.glade.h:34
-msgid "_Small"
-msgstr "_קטן"
+#~ msgid "Reply (Ctrl+R, R)"
+#~ msgstr "להשיב (Ctrl+ר, ר)"
 
-#: ../ui/composer.glade.h:35
-msgid "Small"
-msgstr "קטן"
+#~ msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#~ msgstr "להשיב לכולם (Ctrl+Shift+ר, Shift+ר)"
 
-#: ../ui/composer.glade.h:36
-msgid "S_ans Serif"
-msgstr "_בלתי מעוטר"
+#~ msgid "Forward (Ctrl+L, F)"
+#~ msgstr "העברה (Ctrl+ך, כ)"
 
-#: ../ui/composer.glade.h:37
-msgid "Sans Serif"
-msgstr "בלתי מעוטר"
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "ריקון תיקיית דואר זבל או אשפה"
 
-#: ../ui/composer.glade.h:38
-msgid "S_erif"
-msgstr "_מעוטר"
+#~ msgid "Empty _Spam…"
+#~ msgstr "ריקון דואר _זבל…"
 
-#: ../ui/composer.glade.h:39
-msgid "Serif"
-msgstr "מעוטר"
+#~ msgid "Empty _Trash…"
+#~ msgstr "ריקון א_שפה…"
 
-#: ../ui/composer.glade.h:40
-msgid "_Fixed Width"
-msgstr "_רוחב קבוע"
+#~ msgid "Unable to store server trust exception"
+#~ msgstr "לא ניתן לאחסן שרת מהימן חריג"
 
-#: ../ui/composer.glade.h:41
-msgid "Fixed Width"
-msgstr "רוחב קבוע"
+#~ msgid "Your settings are insecure"
+#~ msgstr "ההגדרות שלך אינן בטוחות"
 
-#: ../ui/composer.glade.h:42
-msgid "Detach"
-msgstr "ניתוק"
+#~ msgid ""
+#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
+#~ "your username and password could be read by another person on the "
+#~ "network.  Are you sure you want to do this?"
+#~ msgstr ""
+#~ "הגדרות ה־IMAP ו/או הגדרות ה־SMTP אינן מגדירות התחברות דרך פרוטוקול אבטחה "
+#~ "SSL או TLS. משמעות הדבר ששם המשתמש והססמה שלך יכולים להיקרא ע״י תכניות "
+#~ "מעקב ברשת שלך. האם להתחבר לחשבון?"
 
-#: ../ui/composer.glade.h:43
-msgid "Detach (Ctrl+D)"
-msgstr "ניתוק (Ctrl+ג)"
+#~ msgid "Co_ntinue"
+#~ msgstr "לה_משיך"
 
-#: ../ui/composer.glade.h:44
-msgid "_Send"
-msgstr "_שליחה"
+#~ msgid ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
+#~ msgstr ""
+#~ "‏Geary נתקל בשגיאה בשליחת דוא״ל. אם הבעיה נמשכת, יש למחוק ידנית את הדוא״ל "
+#~ "מתיקיית דואר יוצא שלך."
 
-#: ../ui/composer.glade.h:45
-msgid "Send"
-msgstr "שליחה"
+#~ msgid ""
+#~ "Geary encountered an error saving a sent message to Sent Mail.  The "
+#~ "message will stay in your Outbox folder until you delete it."
+#~ msgstr ""
+#~ "‏Geary נתקל בשגיאה בשמירת הודעה שנשלחה לדואר יוצא. ההודעה תישאר בתיקייה "
+#~ "בהמתנה לשליחה עד שתמחק."
+
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "לא ניתן לפתוח תיבת דואר מקומית עבור %s"
+
+#~ msgid ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "אירעה שגיאה בפתיחת מסד הנתונים המקומי של הדואר עבור חשבון זה. ככל הנראה "
+#~ "עקב בעיות הרשאות הקובץ.\n"
+#~ "\n"
+#~ "יש לבדוק אם יש לך הרשאות קריאה/כתיבה לכל הקבצים בתיקייה:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be \"rolled back\" "
+#~ "to work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
+#~ msgstr ""
+#~ "מספר הגרסה של מסד הנתונים המקומי של הדואר מתאים לגרסה חדשה של Geary. "
+#~ "למרבה הצער, לא ניתן לשחזר את מסד הנתונים כדי שיעבוד עם גרסה זו של Geary.\n"
+#~ "\n"
+#~ "יש להתקין שוב את הגרסה  האחרונה של Geary."
+
+#~ msgid ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
+#~ msgstr ""
+#~ "אירעה שגיאה בפתיחת החשבון המקומי. ככל הנראה עקב בעיות חיבור.\n"
+#~ "\n"
+#~ "יש לבדוק את חיבור הרשת שלך ולהפעיל מחדש את Geary."
+
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "ביטול העברה (Ctrl+ז)"
+
+#~ msgid "Close open draft messages?"
+#~ msgstr "סגירת טיוטות פתוחות?"
+
+#~ msgid "Error emptying %s"
+#~ msgstr "שגיאה בריקון %s"
+
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "ביטול ארכוב (Ctrl+ז)"
+
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "ביטול העברה לאשפה (Ctrl+ז)"
+
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "ביטול (Ctrl+ז)"
+
+#~ msgid "%i match"
+#~ msgid_plural "%i matches"
+#~ msgstr[0] "התאמה אחת"
+#~ msgstr[1] "%i התאמות"
+#~ msgstr[2] "שתי התאמות"
+
+#~ msgid "%i match (wrapped)"
+#~ msgid_plural "%i matches (wrapped)"
+#~ msgstr[0] "התאמה אחת (גולש)"
+#~ msgstr[1] "%i התאמות (גולש)"
+#~ msgstr[2] "שתי התאמות (גולש)"
+
+#~ msgid "Indexing %s account"
+#~ msgstr "מפתוּח חשבון %s"
+
+#~ msgid "To: "
+#~ msgstr "אל: "
+
+#~ msgid "Cc: "
+#~ msgstr "עותק: "
+
+#~ msgid "Bcc: "
+#~ msgstr "עותק מוסתר: "
+
+#~ msgid "No conversations selected."
+#~ msgstr "לא נבחרה אף תכתובת."
+
+#~ msgid "%u conversation selected."
+#~ msgid_plural "%u conversations selected."
+#~ msgstr[0] "נבחרה תכתובת אחת."
+#~ msgstr[1] "נבחרו %u תכתובות."
+#~ msgstr[2] "נבחרו שתי תכתובות."
 
-#: ../ui/composer.glade.h:46
-msgid "Send (Ctrl+Enter)"
-msgstr "שליחה (Ctrl+Enter)"
+#~ msgid "No search results found."
+#~ msgstr "לא מצאו תוצאות בחיפוש."
 
-#: ../ui/composer.glade.h:47
-msgid "_Attach File"
-msgstr "_צירוף קובץ"
+#~ msgid "Edit Draft"
+#~ msgstr "עריכת טיוטה"
 
-#: ../ui/composer.glade.h:48
-msgid "Attach File"
-msgstr "צירוף קובץ"
+#~ msgid "Copy _Link"
+#~ msgstr "ה_עתקת קישור"
 
-#: ../ui/composer.glade.h:49
-msgid "Attach File (Ctrl+T)"
-msgstr "צירוף קובץ ‏(Ctrl+א)"
+#~ msgid " (Invalid?)"
+#~ msgstr " (לא חוקי?)"
 
-#: ../ui/composer.glade.h:50
-msgid "_Include Original Attachments"
-msgstr "_לכלול את הקבצים המצורפים המקוריים"
+#~ msgid "Save A_ttachment..."
+#~ msgid_plural "Save All A_ttachments..."
+#~ msgstr[0] "שמירת ה_קובץ המצורף…"
+#~ msgstr[1] "שמירת הק_בצים המצורפים…"
+#~ msgstr[2] "שמירת הק_בצים המצורפים…"
 
-#: ../ui/composer.glade.h:51
-msgid "Include Original Attachments"
-msgstr "לכלול את הקבצים המצורפים המקוריים"
+#~ msgid "none"
+#~ msgstr "ללא שם"
 
-#: ../ui/composer.glade.h:52
-msgid "Select spell checking language"
-msgstr "בחירת שפה לבדיקת איות"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "פתיחת עורך הטקסט נכשלה."
 
-#: ../ui/composer.glade.h:53
-msgid "Spelling language"
-msgstr "שפה לבדיקת איות"
+#~ msgid "Geary will exit if you have no other open email accounts."
+#~ msgstr "‏Geary יצא אם אין לך עוד חשבונות דוא״ל פתוחים."
 
-#. Address(es) e-mail is to be sent to
-#: ../ui/composer.glade.h:55
-msgid "_To"
-msgstr "_אל"
+#~ msgid "Open"
+#~ msgstr "פתיחה"
 
-#: ../ui/composer.glade.h:56
-msgid "_Cc"
-msgstr "_עותק"
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%l:%M %P"
 
-#: ../ui/composer.glade.h:57
-msgid "_Subject"
-msgstr "_נושא"
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: ../ui/composer.glade.h:58
-msgid "_Bcc"
-msgstr "עותק _מוסתר"
+#~ msgid "Other"
+#~ msgstr "אחר"
 
-#: ../ui/composer.glade.h:59
-msgid "_Reply-To"
-msgstr "לה_שיב אל"
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
 
-#. Geary account mail will be sent from
-#: ../ui/composer.glade.h:61
-msgid "From"
-msgstr "מאת"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: ../ui/composer.glade.h:62
-msgid "Drop files here"
-msgstr "יש לגרור קבצים לכאן"
+#~ msgid "Spam"
+#~ msgstr "דואר זבל"
 
-#: ../ui/composer.glade.h:63
-msgid "To add them as attachments"
-msgstr "כדי להוסיף אותם כקבצים מצורפים"
+#~ msgid "From: %s\n"
+#~ msgstr "מאת: %s\n"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "מחיקת כתובת דוא״ל"
+#~ msgid "Subject: %s\n"
+#~ msgstr "נושא: %s\n"
 
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"כמה שרתי דואר דורשים כתובות נוספות להגדרה על השרת. יש ליצור קשר עם\n"
-"ספק הדוא״ל שלך למיד נוסף."
+#~ msgid "Date: %s\n"
+#~ msgstr "תאריך: %s\n"
 
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "_עדכון"
+#~ msgid "To: %s\n"
+#~ msgstr "אל: %s\n"
 
-#: ../ui/find_bar.glade.h:1
-msgid "Find:"
-msgstr "חיפוש:"
+#~ msgid "Cc: %s\n"
+#~ msgstr "עותק: %s\n"
 
-#: ../ui/find_bar.glade.h:2
-msgid "_Previous"
-msgstr "ה_קודם"
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr "<span weight=\"bold\" size=\"larger\">לא ניתן למחוק משתמש</span>"
 
-#: ../ui/find_bar.glade.h:3
-msgid "_Next"
-msgstr "ה_בא"
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "חלון כתיבה הקשור במשתמש זה פתוח כרגע. שלח או מחק את ההודעה ונסה שוב."
 
-#: ../ui/find_bar.glade.h:4
-msgid "_Case sensitive"
-msgstr "התאמת _רישיות"
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "יש להמתין כאשר Geary מאמת את החשבון שלך."
 
-#: ../ui/find_bar.glade.h:5
-msgid "label"
-msgstr "תוויות"
+#~ msgid "_Left"
+#~ msgstr "_שמאל"
 
-#: ../ui/login.glade.h:1 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "ססמה"
+#~ msgid "_Right"
+#~ msgstr "_ימין"
 
-#: ../ui/login.glade.h:2
-msgid "E_mail address"
-msgstr "כתובת _דוא״ל"
+#~ msgid "_Center"
+#~ msgstr "_מרכז"
 
-#: ../ui/login.glade.h:3
-msgid "_Password"
-msgstr "_ססמה"
+#~ msgid "_Justify"
+#~ msgstr "יישו_ר"
 
-#: ../ui/login.glade.h:4
-msgid "S_ervice"
-msgstr "ש_רות"
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "קישור (Ctrl+ך)"
 
-#: ../ui/login.glade.h:5
-msgid "N_ame"
-msgstr "_שם"
+#~ msgid "C_olor"
+#~ msgstr "_צבע"
 
-#: ../ui/login.glade.h:7
-msgid "N_ickname"
-msgstr "_כינוי"
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "מודגש (Ctrl+נ)"
 
-#: ../ui/login.glade.h:8
-msgid "Work, Home, etc."
-msgstr "עבודה, בית וכו׳"
+#~ msgid "Show Extended Fields"
+#~ msgstr "הצגת שדות מורחבים"
 
-#: ../ui/login.glade.h:9
-msgid "_Save sent mail"
-msgstr "_שמירת דואר יוצא"
+#~ msgctxt "Label"
+#~ msgid "Close and Save"
+#~ msgstr "סגירה ושמירה"
 
-#: ../ui/login.glade.h:10
-msgid "Addi_tional email addresses…"
-msgstr "כתובות דוא״ל _נוספות…"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Save"
+#~ msgstr "סגירה ושמירה"
 
-#: ../ui/login.glade.h:11
-msgid "IMAP settings"
-msgstr "הגדרות IMAP"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Save"
+#~ msgstr "סגירה ושמירה"
 
-#: ../ui/login.glade.h:12
-msgid "Se_rver"
-msgstr "_שרת"
+#~ msgctxt "Label"
+#~ msgid "Close and Discard"
+#~ msgstr "סגירה והשלכה"
 
-#: ../ui/login.glade.h:13
-msgid "P_ort"
-msgstr "_פתחה"
+#~ msgctxt "Short Label"
+#~ msgid "Close and Discard"
+#~ msgstr "סגירה והשלכה"
 
-#: ../ui/login.glade.h:14
-msgid "Ser_ver"
-msgstr "ש_רת"
+#~ msgctxt "Tooltip"
+#~ msgid "Close and Discard"
+#~ msgstr "סגירה והשלכה"
 
-#: ../ui/login.glade.h:15
-msgid "Por_t"
-msgstr "_פתחה"
+#~ msgid "Large"
+#~ msgstr "גדול"
 
-#: ../ui/login.glade.h:16
-msgid "SMTP settings"
-msgstr "הגדרות SMTP"
+#~ msgid "Medium"
+#~ msgstr "בינוני"
 
-#: ../ui/login.glade.h:17
-msgid "User_name"
-msgstr "שם מ_שתמש"
+#~ msgid "Small"
+#~ msgstr "קטן"
 
-#: ../ui/login.glade.h:18
-msgid "Pass_word"
-msgstr "_ססמה"
+#~ msgid "Detach"
+#~ msgstr "ניתוק"
 
-#: ../ui/login.glade.h:19
-msgid "SMTP username"
-msgstr "שם משתמש SMTP"
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "ניתוק (Ctrl+ג)"
 
-#: ../ui/login.glade.h:20
-msgid "SMTP password"
-msgstr "ססמת SMTP"
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "שליחה (Ctrl+Enter)"
 
-#: ../ui/login.glade.h:21
-msgid "_Username"
-msgstr "שם _משתמש"
+#~ msgid "_Attach File"
+#~ msgstr "_צירוף קובץ"
 
-#: ../ui/login.glade.h:22
-msgid "IMAP username"
-msgstr "שם משתמש IMAP"
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "צירוף קובץ ‏(Ctrl+א)"
 
-#: ../ui/login.glade.h:23
-msgid "IMAP password"
-msgstr "ססמת IMAP"
+#~ msgid "_Include Original Attachments"
+#~ msgstr "_לכלול את הקבצים המצורפים המקוריים"
 
-#: ../ui/login.glade.h:24
-msgid "Encr_yption"
-msgstr "ה_צפנה"
+#~ msgid "Spelling language"
+#~ msgstr "שפה לבדיקת איות"
 
-#: ../ui/login.glade.h:25
-msgid "Encrypt_ion"
-msgstr "ה_צפנה"
+#~ msgid "From"
+#~ msgstr "מאת"
 
-#: ../ui/login.glade.h:27
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "כמה שרתי דואר דורשים כתובות נוספות להגדרה על השרת. יש ליצור קשר עם\n"
+#~ "ספק הדוא״ל שלך למיד נוסף."
 
-#: ../ui/login.glade.h:28
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "E_mail address"
+#~ msgstr "כתובת _דוא״ל"
 
-#: ../ui/login.glade.h:29
-msgid "No authentication re_quired"
-msgstr "לא נדרש אי_מות"
+#~ msgid "_Password"
+#~ msgstr "_ססמה"
 
-#: ../ui/login.glade.h:30
-msgid "Use IMAP cre_dentials"
-msgstr "שימוש ב_אישורי IMAP"
+#~ msgid "S_ervice"
+#~ msgstr "ש_רות"
 
-#: ../ui/login.glade.h:31 ../ui/preferences.glade.h:5
-msgid "Composer"
-msgstr "חיבור הודעות"
+#~ msgid "N_ame"
+#~ msgstr "_שם"
 
-#: ../ui/login.glade.h:32
-msgid "Save dra_fts on server"
-msgstr "שמירת _טיוטה על השרת"
+#~ msgid "N_ickname"
+#~ msgstr "_כינוי"
 
-#: ../ui/login.glade.h:33
-msgid "Si_gn emails (HTML allowed):"
-msgstr "_חתימת הודעות (HTML מאופשר):"
+#~ msgid "Work, Home, etc."
+#~ msgstr "עבודה, בית וכו׳"
 
-#: ../ui/login.glade.h:34
-msgid "Storage"
-msgstr "אחסון"
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "כתובות דוא״ל _נוספות…"
 
-#: ../ui/login.glade.h:35
-msgid "_Download mail"
-msgstr "הורדת _דוא״ל"
+#~ msgid "IMAP settings"
+#~ msgstr "הגדרות IMAP"
 
-#: ../ui/password-dialog.glade.h:1
-msgid "SMTP Credentials"
-msgstr "אישורי SMTP"
+#~ msgid "Se_rver"
+#~ msgstr "_שרת"
 
-#: ../ui/password-dialog.glade.h:2
-msgid "Username"
-msgstr "שם משתמש"
+#~ msgid "P_ort"
+#~ msgstr "_פתחה"
 
-#: ../ui/password-dialog.glade.h:4
-msgid "_Remember password"
-msgstr "שמירת ה_ססמה"
+#~ msgid "Ser_ver"
+#~ msgstr "ש_רת"
 
-#: ../ui/password-dialog.glade.h:6
-msgid "_Authenticate"
-msgstr "אי_מות"
+#~ msgid "Por_t"
+#~ msgstr "_פתחה"
 
-#: ../ui/preferences.glade.h:1
-msgid "Reading"
-msgstr "קריאה"
+#~ msgid "User_name"
+#~ msgstr "שם מ_שתמש"
 
-#: ../ui/preferences.glade.h:2
-msgid "_Automatically select next message"
-msgstr "_בחירת ההודעה הבאה אוטומטית"
+#~ msgid "Pass_word"
+#~ msgstr "_ססמה"
 
-#: ../ui/preferences.glade.h:3
-msgid "_Display conversation preview"
-msgstr "הצגת תצוגה מ_קדימה של שיחה"
+#~ msgid "SMTP password"
+#~ msgstr "ססמת SMTP"
 
-#: ../ui/preferences.glade.h:4
-msgid "Use _three pane view"
-msgstr "שימוש ב_שלוש חלוניות תצוגה"
+#~ msgid "_Username"
+#~ msgstr "שם _משתמש"
 
-#: ../ui/preferences.glade.h:6
-msgid "Enable _spell checking"
-msgstr "הפעלת בדיקת _איות"
+#~ msgid "IMAP password"
+#~ msgstr "ססמת IMAP"
 
-#: ../ui/preferences.glade.h:7
-msgid "Notifications"
-msgstr "התרעות"
+#~ msgid "Encr_yption"
+#~ msgstr "ה_צפנה"
 
-#: ../ui/preferences.glade.h:8
-msgid "_Play notification sounds"
-msgstr "ה_שמעת צלילי התרעה"
+#~ msgid "Encrypt_ion"
+#~ msgstr "ה_צפנה"
 
-#: ../ui/preferences.glade.h:9
-msgid "Show _notifications for new mail"
-msgstr "הצגת התרעות על _קבלת דואר חדש"
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
 
-#: ../ui/preferences.glade.h:10
-msgid "Always _watch for new mail"
-msgstr "תמיד ל_צפות עבור הודעות חדשות"
+#~ msgid "No authentication re_quired"
+#~ msgstr "לא נדרש אי_מות"
 
-#: ../ui/preferences.glade.h:11
-msgid "Geary will run in the background and notify of new mail"
-msgstr "‏Geary ירוץ ברקע ויודיע על הודעות חדשות"
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "שימוש ב_אישורי IMAP"
 
-#: ../ui/preferences.glade.h:12
-msgid "Preferences"
-msgstr "העדפות"
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "_חתימת הודעות (HTML מאופשר):"
 
-#: ../ui/remove_confirm.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">האם אכן ברצונך למחוק משתמש זה?</span>"
+#~ msgid "Storage"
+#~ msgstr "אחסון"
 
-#: ../ui/remove_confirm.glade.h:2
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"כל ההודעות הקשורות במשתמש זה יוסרו מהמחשב שלך. התהליך לא ישפיע על ההודעות "
-"שבשרת."
+#~ msgid "Reading"
+#~ msgstr "קריאה"
 
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "כינוי:"
+#~ msgid "Enable _spell checking"
+#~ msgstr "הפעלת בדיקת _איות"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "כתובת דוא״ל:"
+#~ msgid "_Play notification sounds"
+#~ msgstr "ה_שמעת צלילי התרעה"
 
-#: ../ui/upgrade_dialog.glade.h:1
-msgid "Geary update in progress…"
-msgstr "‏Geary בתהליך שדרוג…"
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "‏Geary ירוץ ברקע ויודיע על הודעות חדשות"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">האם אכן ברצונך למחוק משתמש זה?</"
+#~ "span>"
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
+#~ msgstr ""
+#~ "כל ההודעות הקשורות במשתמש זה יוסרו מהמחשב שלך. התהליך לא ישפיע על ההודעות "
+#~ "שבשרת."
+
+#~ msgid "Nickname:"
+#~ msgstr "כינוי:"
 
 #~ msgid "Copyright 2011-2015 Yorba Foundation"
 #~ msgstr "כל הזכויות שמורות 2011–2015 Yorba Foundation"
@@ -2283,18 +4483,6 @@ msgstr "‏Geary בתהליך שדרוג…"
 #~ msgid "Application Menu"
 #~ msgstr "תפריט יישום"
 
-#~ msgid "No conversations selected"
-#~ msgstr "לא נבחרה אף תכתובת"
-
-#~ msgid "%u conversation selected"
-#~ msgid_plural "%u conversations selected"
-#~ msgstr[0] "נבחרה תכתובת אחת."
-#~ msgstr[1] "נבחרו %u תכתובות."
-#~ msgstr[2] "נבחרו שתי תכתובות."
-
-#~ msgid "Notify of new mail at start_up"
-#~ msgstr "התרעה על קבלת דואר חדש בעת ה_פעלה"
-
 #~ msgid "_Delete"
 #~ msgstr "_מחיקה"
 
@@ -2316,9 +4504,6 @@ msgstr "‏Geary בתהליך שדרוג…"
 #~ msgid "Password:"
 #~ msgstr "ססמה:"
 
-#~ msgid "Edit recipients"
-#~ msgstr "עריכת נמענים"
-
 #~ msgid "C_lose"
 #~ msgstr "_סגירה"
 
@@ -2334,9 +4519,6 @@ msgstr "‏Geary בתהליך שדרוג…"
 #~ msgid "Real name:"
 #~ msgstr "שם אמתי:"
 
-#~ msgid "General"
-#~ msgstr "כללי"
-
 #~ msgid "Server:"
 #~ msgstr "שרת:"
 
@@ -2346,8 +4528,5 @@ msgstr "‏Geary בתהליך שדרוג…"
 #~ msgid "SSL/TLS encryption:"
 #~ msgstr "הצפנת SSL/TLS :"
 
-#~ msgid "_Details"
-#~ msgstr "_פרטים"
-
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "תיוק שיחה בארכיון (Delete, Backspace, ש)"
-- 
2.29.2

