[geary] Update Kazakh translation



commit 65adddc0e7ef6050133c0a02618d241676d246c4
Author: Baurzhan Muftakhidinov <baurthefirst gmail com>
Date:   Fri Jun 26 12:46:23 2020 +0000

    Update Kazakh translation

 po/kk.po | 4301 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 2727 insertions(+), 1574 deletions(-)
---
diff --git a/po/kk.po b/po/kk.po
index e40c35a2b..ff773f403 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -1,14 +1,14 @@
 # Kazakh translation for geary.
 # Copyright (C) 2014 geary's COPYRIGHT HOLDER
 # This file is distributed under the same license as the geary package.
-# Baurzhan Muftakhidinov <baurthefirst gmail com>, 2014-2017.
+# Baurzhan Muftakhidinov <baurthefirst gmail com>, 2014-2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: geary master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2018-08-23 12:11+0000\n"
-"PO-Revision-Date: 2018-08-26 08:32+0500\n"
+"POT-Creation-Date: 2020-05-26 18:52+0000\n"
+"PO-Revision-Date: 2020-06-26 17:45+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst gmail com>\n"
 "Language-Team: Kazakh <kk_KZ googlegroups com>\n"
 "Language: kk\n"
@@ -16,52 +16,49 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.1.1\n"
+"X-Generator: Poedit 2.3.1\n"
 
 #: desktop/geary-attach.contract.desktop.in:3
 msgid "Send by email"
 msgstr "Эл. поштамен жіберу"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-attach.contract.desktop.in:5
-msgid "mail-send"
-msgstr "mail-send"
+#: desktop/geary-attach.contract.desktop.in:6
+msgid "Send files using Geary"
+msgstr "Файлдарды Geary көмегімен жіберу"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
+#: src/client/accounts/accounts-editor-servers-pane.vala:555
+#: src/client/application/application-main-window.vala:590
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "Эл. пошта"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:21
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/application-client.vala:32
 msgid "Send and receive email"
 msgstr "Эл. поштаны жіберу және қабылдау"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;Эл. пошта;электрондық пошта;е-пошта;"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-autostart.desktop.in:9 desktop/org.gnome.Geary.desktop.in:9
-msgid "org.gnome.Geary"
-msgstr "org.gnome.Geary"
-
 #. Translators: The development team's name
-#: desktop/org.gnome.Geary.appdata.xml.in:13
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Geary әзірлеушілер тобы"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -71,7 +68,7 @@ msgstr ""
 "жұмыс үстелі үшін арналған. Оның көмегімен тура, замануи интерфейсін "
 "қолданып, эл. поштаны оқу, табу және жіберуге болады."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -79,547 +76,1029 @@ msgstr ""
 "Сөйлесулер көмегімен сіз талқылауды толығымен оқи аласыз, бір хаттан екінші "
 "хатқа іздеп, шертуді орындамай-ақ."
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Geary мүмкіндіктерінің ішінде:"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "Эл. пошта тіркелгісін жылдам баптау"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Shows related messages together in conversations"
 msgstr "Өзара байланысқан хабарламаларды сөйлесуде бірге көрсетеді"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "Жылдам, толық мәтіндік және кілт сөздерін іздеу"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "Кең мүмкіндікті HTML және ашық мәтін хаттарын құрастыру түзеткіші"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "Жаңа хаттар үшін жұмыс үстел хабарламаларын көрсету"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
 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:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "Geary сөйлесуді көрсетуде"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:52
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 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:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;Пошта;Эл.пошта;"
 
-#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "Хатты жазу"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Жаңа терезе"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
-msgid "Default attachments directory"
-msgstr "Салынымдардың негізгі бумасы"
+msgid "Maximize window"
+msgstr "Терезені жазық қылу"
 
 #: desktop/org.gnome.Geary.gschema.xml:9
-msgid "Location used when opening and saving attachments."
-msgstr "Салынымдарды ашу және сақтаудың орны."
+msgid "True if the application window is maximized, false otherwise."
+msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:14
-msgid "Default print output directory"
-msgstr ""
+msgid "Width of window"
+msgstr "Терезе ені"
 
 #: desktop/org.gnome.Geary.gschema.xml:15
-msgid "Location used when printing to a file."
+msgid "The last recorded width of the application window."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:20
-msgid "Maximize window"
-msgstr "Терезені жазық қылу"
+msgid "Height of window"
+msgstr "Терезе биіктігі"
 
 #: desktop/org.gnome.Geary.gschema.xml:21
-msgid "True if the application window is maximized, false otherwise."
+msgid "The last recorded height of the application window."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:26
-msgid "Width of window"
-msgstr "Терезе ені"
+msgid "Position of folder list pane"
+msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:27
-msgid "The last recorded width of the application window."
+msgid "Position of the folder list Paned grabber."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:32
-msgid "Height of window"
-msgstr "Терезе биіктігі"
+msgid "Position of folder list pane when horizontal"
+msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:33
-msgid "The last recorded height of the application window."
+msgid ""
+"Position of the folder list Paned grabber in the horizontal orientation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:38
-msgid "Position of folder list pane"
+msgid "Position of folder list pane when vertical"
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:39
-msgid "Position of the folder list Paned grabber."
+msgid "Position of the folder list Paned grabber in the vertical orientation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:44
-msgid "Position of folder list pane when horizontal"
+msgid "Orientation of the folder list pane"
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:45
-msgid ""
-"Position of the folder list Paned grabber in the horizontal orientation."
+msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:50
-msgid "Position of folder list pane when vertical"
+msgid "Show/hide formatting toolbar"
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:51
-msgid "Position of the folder list Paned grabber in the vertical orientation."
+msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:56
-msgid "Orientation of the folder list pane"
+msgid "Position of message list pane"
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:57
-msgid "True if the folder list Paned is in the horizontal orientation."
+msgid "Position of the message list Paned grabber."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:62
-msgid "Position of message list pane"
-msgstr ""
+msgid "Autoselect next message"
+msgstr "Келесі хатты автотаңдау"
 
 #: desktop/org.gnome.Geary.gschema.xml:63
-msgid "Position of the message list Paned grabber."
+msgid "True if we should autoselect the next available conversation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:68
-msgid "Autoselect next message"
-msgstr "Келесі хатты автотаңдау"
+msgid "Display message previews"
+msgstr "Хабарламаның алдын-ала көрінісін көрсету"
 
 #: desktop/org.gnome.Geary.gschema.xml:69
-msgid "True if we should autoselect the next available conversation."
+msgid "True if we should display a short preview of each message."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:74
-msgid "Display message previews"
-msgstr "Хабарламаның алдын-ала көрінісін көрсету"
+msgid "Use single key shortcuts"
+msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:75
-msgid "True if we should display a short preview of each message."
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:80
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:81
-msgid "List of the languages to use in the spell checker."
+#: 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 ""
 
-#: desktop/org.gnome.Geary.gschema.xml:86
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:87
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:92
-msgid "Enable notification sounds"
-msgstr "Хабарлау дыбыстарын ойнату"
-
-#: desktop/org.gnome.Geary.gschema.xml:93
-msgid "True to play sounds for notifications and sending."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:98
-msgid "Show notifications for new mail"
-msgstr "Жаңа хаттар үшін ескертуді көрсету"
-
-#: desktop/org.gnome.Geary.gschema.xml:99
-msgid "True to show notification bubbles."
-msgstr ""
-
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Іске қосылғанда жаңа хаттар туралы хабарлау"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr "Іске қосылғанда жаңа хаттар туралы хабарлау үшін True."
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "Салынымдарды ашу кезінде сұрау үшін True."
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:128
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Сөйлесулер аймағының масштабы"
 
-#: desktop/org.gnome.Geary.gschema.xml:129
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:134
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Бөлінген жаңа хатты жазу терезесінің өлшемі"
 
-#: desktop/org.gnome.Geary.gschema.xml:135
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr ""
 
+#: desktop/org.gnome.Geary.gschema.xml:132
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+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 ""
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr ""
+
 #: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:141
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
 
-#: src/client/accounts/account-dialog-add-edit-pane.vala:54
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
-msgid "_Save"
-msgstr "_Сақтау"
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:210
+msgid "Failed to store certificate"
+msgstr ""
 
-#: src/client/accounts/account-dialog-add-edit-pane.vala:54
-#: src/client/components/stock.vala:22
-msgid "_Add"
-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:316
+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:329
+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:350
+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:363
+msgid "Check your sending server details"
+msgstr ""
 
-#. reset/clear widgets
-#: src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
+#. 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 "Additional addresses for %s"
-msgstr "%s үшін қосымша адрестер"
+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"
+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 "email example com"
+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:884
+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:1006
+#: ui/password-dialog.glade:108
+msgid "Password"
+msgstr "Пароль"
 
-#. Sets min size.
-#: src/client/accounts/account-dialog.vala:28
-msgid "Accounts"
-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:728
+#| 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"
 
-#. 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 "Аты Фамилиясы"
+#. 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:734
+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 ""
+
+#. 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 "Message not saved"
+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"
+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” өшіру"
+
+#. 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 "Unrecognized command line option “%s”\n"
+msgid "Undo changes to “%s”"
+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 ""
+
+#. 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 ""
 
-#: src/client/accounts/add-edit-page.vala:240
-msgid "Welcome to Geary."
-msgstr "Geary қолданбасына қош келдіңіз."
+#. 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 ""
 
-#: src/client/accounts/add-edit-page.vala:240
-msgid "Enter your account information to get started."
-msgstr "Бастау үшін тіркелгі ақпаратыңызды енгізіңіз."
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
+msgid "Everything"
+msgstr "Барлығы"
 
-#: src/client/accounts/add-edit-page.vala:260
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2 апта бұрын"
 
-#. IDs are # of days
-#: src/client/accounts/add-edit-page.vala:261
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "1 ай бұрын"
 
-#: src/client/accounts/add-edit-page.vala:262
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3 ай бұрын"
 
-#: src/client/accounts/add-edit-page.vala:263
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6 ай бұрын"
 
-#: src/client/accounts/add-edit-page.vala:264
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "1 жыл бұрын"
 
-#: src/client/accounts/add-edit-page.vala:265
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2 жыл бұрын"
 
-#: src/client/accounts/add-edit-page.vala:266
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4 жыл бұрын"
 
-#. Separator
-#: src/client/accounts/add-edit-page.vala:268
-msgid "Everything"
-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] "%d күн бұрын"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2027
+msgid "Undo"
+msgstr "Болдырмау"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2010
+msgid "Redo"
+msgstr "Қайталау"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
+#: src/client/accounts/accounts-editor-row.vala:279
+msgid "Gmail"
+msgstr "Gmail"
 
-#: src/client/accounts/add-edit-page.vala:288
-msgid "Edit"
-msgstr "Түзету"
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
+#: src/client/accounts/accounts-editor-row.vala:283
+msgid "Outlook.com"
+msgstr "Outlook.com"
+
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
+#: src/client/accounts/accounts-editor-row.vala:287
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. Translators: Tooltip for accounts that have been
+#. loaded but disabled by the user.
+#: src/client/accounts/accounts-editor-list-pane.vala:384
+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:393
+#| msgid "Geary has encountered a problem"
+msgid "This account has encountered a problem and is unavailable"
+msgstr "Бұл тіркелгі мәселеге тап болды және қол жетімсіз"
+
+#. Translators: Label for adding a generic email account
+#: src/client/accounts/accounts-editor-list-pane.vala:443
+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:560
+#, c-format
+msgid "Account “%s” removed"
+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:567
+#, c-format
+msgid "Account “%s” restored"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:290
-msgid "Preview"
-msgstr "Алдын-ала қарау"
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:50
+msgid "Drag to move this item"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:778
-msgid "Remem_ber passwords"
-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:295
+msgid "Service provider"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:785 ui/login.glade:233
-msgid "Remem_ber password"
-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:469
+msgid "Connection security"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:819
-msgid "Unable to validate:\n"
-msgstr "Тексеру сәтсіз аяқталды:\n"
+#. Translators: Label used when no auth scheme is used
+#. by an account's IMAP or SMTP service.
+#: src/client/accounts/accounts-editor-row.vala:480
+#: src/client/accounts/accounts-editor-servers-pane.vala:755
+#: src/client/accounts/accounts-editor-servers-pane.vala:970
+msgid "None"
+msgstr "Ешнәрсе"
+
+#: src/client/accounts/accounts-editor-row.vala:487
+#| msgctxt "shortcut window"
+#| msgid "Star"
+msgid "StartTLS"
+msgstr "StartTLS"
+
+#: src/client/accounts/accounts-editor-row.vala:494
+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:535
+#: src/client/application/application-main-window.vala:544
+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:542
+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:550
+msgid "Use same login as receiving"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:821
-msgid "        • Invalid account nickname.\n"
-msgstr "        • Тіркелгінің ник аты қате.\n"
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:558
+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:377
+#, 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:540
+#| msgid "Accounts"
+msgid "Account source"
+msgstr "Тіркелгі көзі"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:552
+msgid "GNOME Online Accounts"
+msgstr "Gnome желілік тіркелгілері"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:611
+#| msgid "Save dra_fts on server"
+msgid "Save draft email on server"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:824
-msgid "        • Email address already added to Geary.\n"
-msgstr "        • Эл. пошта адресі Geary-ге бұрын қосылған.\n"
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:666
+#| msgid "_Save sent mail"
+msgid "Save sent email on server"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:828
-msgid "        • IMAP connection error.\n"
-msgstr "        • IMAP байланысу қатесі.\n"
+#. 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:956
+#, c-format
+msgid "%s using OAuth2"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:831
-msgid "        • IMAP username or password incorrect.\n"
-msgstr "        • IMAP пайдаланушы аты не паролі қате.\n"
+#: src/client/accounts/accounts-editor-servers-pane.vala:966
+msgid "Use receiving server login"
+msgstr ""
 
-#: src/client/accounts/add-edit-page.vala:834
-msgid "        • SMTP connection error.\n"
-msgstr "        • SMTP байланысу қатесі.\n"
+#. 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 "Атаусыз"
 
-#: src/client/accounts/add-edit-page.vala:837
-msgid "        • SMTP username or password incorrect.\n"
-msgstr "        • SMTP пайдаланушы аты не паролі қате.\n"
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "\"%s\" деп аталатын файл бар болып тұр. Оны алмастыруды қалайсыз ба?"
 
-#: src/client/accounts/add-edit-page.vala:841
-msgid "        • Connection error.\n"
-msgstr "        • Байланыс қатесі.\n"
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr ""
+"Файл \"%s\" ішінде бар болып тұр.  Оны ауыстырсаңыз, құрамы үстінен жазылады."
 
-#: src/client/accounts/add-edit-page.vala:845
-msgid "        • Username or password incorrect.\n"
-msgstr "        • Пайдаланушы аты не паролі қате.\n"
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "А_лмастыру"
 
-#: src/client/application/geary-application.vala:22
+#: src/client/application/application-client.vala:33
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: src/client/application/geary-application.vala:23
-#| msgid "Geary Development Team"
-msgid "Copyright 2016-2017 Geary Development Team."
-msgstr "Copyright 2016-2017 Geary әзірлеушілер тобы."
+#: src/client/application/application-client.vala:34
+#| msgid "Copyright 2016-2017 Geary Development Team."
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Copyright 2016-2020 Geary Development Team."
 
-#: src/client/application/geary-application.vala:25
+#: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Geary веб сайтын шолу"
 
-#: src/client/application/geary-application.vala:416
-#, 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-application.vala:420
-msgid "translator-credits"
-msgstr "Baurzhan Muftakhidinov <baurthefirst gmail com>"
+#. / Command line option
+#: src/client/application/application-client.vala:96
+msgid "Print debug logging"
+msgstr ""
 
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "Geary қолданбасын жасырылған басты тереземен іске қосу"
+#. / Command line option
+#: src/client/application/application-client.vala:99
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
+msgstr ""
 
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "Жөндеу ақпаратын көрсету"
+#. / Command line option
+#: src/client/application/application-client.vala:102
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr ""
 
-#: src/client/application/geary-args.vala:12
+#. / Command line option
+#: src/client/application/application-client.vala:105
 msgid "Log conversation monitoring"
 msgstr "Сөйлесулерді бақылауды журналдау"
 
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "Желілік десериализациясын журналдау"
+#. / Command line option
+#: src/client/application/application-client.vala:108
+#| msgid "Log network deserialization"
+msgid "Log IMAP network deserialization"
+msgstr ""
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:112
+msgid "Log folder normalization"
+msgstr "Бумалар синхронизациясын журналдау"
 
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "Желілік белсенділікті журналдау"
+#. / Command line option
+#: src/client/application/application-client.vala:115
+#| msgid "Log network activity"
+msgid "Log IMAP network activity"
+msgstr ""
 
-#. / 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
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/application-client.vala:120
 msgid "Log IMAP replay queue"
 msgstr "IMAP қайта ойнату тізбегін журналдау"
 
-#. / 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 "Желілік сериализациясын журналдау"
-
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "Мезгіл-мезгіл белсенділікті журналдау"
+#. / Command line option
+#: src/client/application/application-client.vala:123
+#| msgid "Log network activity"
+msgid "Log SMTP network activity"
+msgstr ""
 
-#: src/client/application/geary-args.vala:22
+#. / Command line option
+#: src/client/application/application-client.vala:126
 msgid "Log database queries (generates lots of messages)"
 msgstr "Дерекқор сұранымдарын журналдау (көптеген хабарламаларды туғызады)"
 
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "Бумалар синхронизациясын журналдау"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "WebView бақылауды рұқсат ету"
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "TLS ескертулері бар барлық сервер сертификаттарын қайта шақыру"
-
-#: src/client/application/geary-args.vala:27
+#. / Command line option
+#: src/client/application/application-client.vala:129
 msgid "Perform a graceful quit"
 msgstr "Қалыпты шығуды орындау"
 
-#: src/client/application/geary-args.vala:28
+#: src/client/application/application-client.vala:131
+msgid "Open a new window"
+msgstr "Жаңа терезені ашу"
+
+#. / Command line option
+#: src/client/application/application-client.vala:134
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr ""
+
+#. / Command line option
+#: src/client/application/application-client.vala:137
 msgid "Display program version"
 msgstr "Бағдарлама нұсқасын көрсету"
 
-#. This gives a command-line hint on how to open new composer windows with mailto:
-#: src/client/application/geary-args.vala:53
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "Жаңа хатты жазу терезесін ашу үшін %s қолданыңыз"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:261
+#| msgid "Mark conversation"
+msgid "Geary version"
+msgstr "Geary нұсқасы"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:263
+msgid "Geary revision"
+msgstr "Geary ревизиясы"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:265
+msgid "GTK version"
+msgstr "GTK нұсқасы"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:272
+msgid "GLib version"
+msgstr "GLib нұсқасы"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:279
+msgid "WebKitGTK version"
+msgstr "WebKitGTK нұсқасы"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:286
+msgid "Desktop environment"
+msgstr ""
 
-#: src/client/application/geary-args.vala:56
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "Пікірлер, ұсыныстар және ақаулықтарды хабарлау жері:"
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:288
+#: src/client/components/components-attachment-pane.vala:91
+msgid "Unknown"
+msgstr "Белгісіз"
 
-#. i18n: Command line arguments are invalid
-#: src/client/application/geary-args.vala:63
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "Командалық жол опцияларын талдау сәтсіз аяқталды: %s\n"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:318
+msgid "Distribution name"
+msgstr ""
 
-#: src/client/application/geary-args.vala:74
-#, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "Белгісіз командалық жол опциясы \"%s\"\n"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:323
+msgid "Distribution release"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:719
-msgid "Unable to store server trust exception"
-msgstr "Серверге сену ережесін сақтау қатесі"
+#. / Application runtime information label
+#: src/client/application/application-client.vala:331
+msgid "Installation prefix"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:970
-msgid "Your settings are insecure"
-msgstr "Сіздің баптауларыңыз қауіпсіз емес"
+#: src/client/application/application-client.vala:584
+#, c-format
+msgid "About %s"
+msgstr "%s туралы"
 
-#: src/client/application/geary-controller.vala:971
-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?"
+#. Translators: add your name and email address to receive
+#. credit in the About dialog For example: Yamada Taro
+#. <yamada taro example com>
+#: src/client/application/application-client.vala:588
+msgid "translator-credits"
+msgstr "Baurzhan Muftakhidinov <baurthefirst gmail com>"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:1049
+msgid "The `--hidden` option is deprecated and will be removed in the future."
 msgstr ""
-"Сіздің IMAP және/немесе SMTP баптаулары SSL не TLS қолдануды көрсетпейді. "
-"Бұл дегеніміз, сіздің пайдаланушы аты мен пароліңіз желідегі басқа адам біле "
-"алады. Осыны жасауды шынымен қалайсыз ба?"
 
-#: src/client/application/geary-controller.vala:972
-msgid "Co_ntinue"
-msgstr "Жалғ_астыру"
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:1082
+#, c-format
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Unrecognised program argument: “%s”"
+msgstr ""
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: src/client/application/geary-controller.vala:1076
-#: src/client/components/status-bar.vala:29
-msgid "Error sending email"
-msgstr "Хатты жіберу сәтсіз"
+#. / Notification title.
+#: src/client/application/application-controller.vala:485
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:1077
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+#. / Notification body
+#: src/client/application/application-controller.vala:489
+msgid "Email will not be sent until re-connected"
 msgstr ""
-"Geary хатты жібергенде қате орын алды. Егер мәселе қайталана берсе, хатты "
-"қолмен Шығыс бумасынан өшіріңіз."
 
-#. 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:1081
-#: src/client/components/status-bar.vala:33
-msgid "Error saving sent mail"
-msgstr "Жіберліген хаттын сақтау сәтсіз"
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:588
+#| msgid "Conversation Shortcuts"
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Сөйлесу(лер) белгіленген"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:594
+#| msgid "No conversations found"
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Сөйлесу(лер) белгіленуі алып тасталды"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:620
+#: src/client/application/application-controller.vala:704
+#, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] ""
 
-#: src/client/application/geary-controller.vala:1082
-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 жіберілген хатты Жіберілген хаттар бумасына сақтау кезінде қате орын "
-"алды. Бұл хат сіз оны қолмен өшірілгенге дейін Шығыс бумасында қала береді."
+#. / 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:628
+#: src/client/application/application-controller.vala:650
+#, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] ""
 
-#: src/client/application/geary-controller.vala:1149
-msgid "Labels"
-msgstr "Белгілер"
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:671
+#| msgid "Conversation Shortcuts"
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] ""
 
-#. 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:1161
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:727
 #, c-format
-msgid "Unable to open the database for %s"
-msgstr "%s үшін дерекқорды ашу мүмкін емес"
+#| msgid "Message not saved"
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] ""
 
-#: src/client/application/geary-controller.vala:1162
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:748
+#| msgid "Message not saved"
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] ""
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:783
 #, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
+#| msgid "Message not saved"
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] ""
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:811
+#, c-format
+#| msgid "No conversations selected"
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] ""
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:819
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] ""
+
+#: src/client/application/application-controller.vala:1305
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "%s үшін дерекқорды ашу мүмкін емес"
+
+#: src/client/application/application-controller.vala:1306
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
 "Geary can rebuild the database and re-synchronize with the server or exit.\n"
 "\n"
 "Rebuilding the database will destroy all local email and its attachments. "
@@ -636,20 +1115,20 @@ msgstr ""
 "Дерекқорды қайта құрастыру барлық жергілікті пошта хаттар және салынымдарын "
 "жояды. <b>Сервердегі поштаға әсері болмайды.</b>"
 
-#: src/client/application/geary-controller.vala:1164
+#: src/client/application/application-controller.vala:1308
 msgid "_Rebuild"
 msgstr "Қа_йта құрастыру"
 
-#: src/client/application/geary-controller.vala:1164
+#: src/client/application/application-controller.vala:1308
 msgid "E_xit"
 msgstr "_Шығу"
 
-#: src/client/application/geary-controller.vala:1173
+#: src/client/application/application-controller.vala:1318
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "\"%s\" үшін дерекқорды қайта құрастыру мүмкін емес"
 
-#: src/client/application/geary-controller.vala:1174
+#: src/client/application/application-controller.vala:1319
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -660,448 +1139,460 @@ msgstr ""
 "\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:1196
-#: src/client/application/geary-controller.vala:1206
-#: src/client/application/geary-controller.vala:1217
+#. / 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:1449
 #, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "%s үшін жергілікті эл. пошта жәшігін ашу мүмкін емес"
+msgid "Email sent to %s"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:1197
+#. / 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:2448
 #, 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"
+msgid "Email to %s queued for delivery"
 msgstr ""
-"Бұл тіркелгі үшін жергілікті пошта дерекқорын ашқанда қате орын алды. Бұл "
-"файлға қатынау рұқсаттары мәселесінен болуы мүмкін.\n"
-"\n"
-"Келесі бумадағы барлық файлдарға сізде оқу/жазу рұқсаттардың барлығы бар "
-"екенін тексеріңіз:\n"
-"\n"
-"%s"
 
-#: src/client/application/geary-controller.vala:1207
-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."
+#. / 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:2512
+#, c-format
+msgid "Email to %s saved"
 msgstr ""
-"Жергілікті пошта дерекқоры нұсқасының нөмірі оның Geary қолданбасының "
-"жаңалау нұсқасы үшін пішімделгенін көрсетеді. Өкінішке орай, дерекқорды "
-"Geary-дың бұл нұсқасымен жұмыс істейтіндей етіп нұсқасын \"кері айналдыру\" "
-"мүмкін емес.\n"
-"\n"
-"Geary қолданбасының соңғы нұсқасын орнатып, қайталап көріңіз."
 
-#: src/client/application/geary-controller.vala:1218
-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."
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2527
+#: src/client/application/application-controller.vala:2585
+msgid "Composer could not be restored"
 msgstr ""
-"Жергілікті тіркелгіні ашу кезінде қате орын алды. Бұл байланысу мәселелері "
-"салдарынан болуы мүмкін.\n"
-"\n"
-"Желілік байланысыңызды тексеріп, Geary қолданбасын қайта іске қосыңыз."
 
-#: src/client/application/geary-controller.vala:2038
-msgid "Undo move (Ctrl+Z)"
-msgstr "Жылжытуды болдырмау (Ctrl+Z)"
+#. / 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:2570
+#, c-format
+msgid "Email to %s discarded"
+msgstr ""
 
-#: src/client/application/geary-controller.vala:2048
-msgid "Are you sure you want to open these attachments?"
-msgstr "Бұл салынымдарды ашуды шынымен қалайсыз ба?"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:530
+msgid "Working offline"
+msgstr "Желіден тыс жұмыс істеу"
 
-#: src/client/application/geary-controller.vala:2049
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:532
+msgid "You will not be able to send or receive email until re-connected."
 msgstr ""
-"Салынымдар ашылса, жүйеңіздге зақым келтіруі мүмкін. Тек сенімді "
-"жіберушілерден салынымдарды ашыңыз."
 
-#: src/client/application/geary-controller.vala:2050
-msgid "Don’t _ask me again"
-msgstr "М_ені қайта сұрамау"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:539
+msgid "Login problem"
+msgstr "Кіру мәселесі"
 
-#: src/client/application/geary-controller.vala:2146
-#, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "\"%s\" деп аталатын файл бар болып тұр. Оны алмастыруды қалайсыз ба?"
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:541
+msgid "An account has reported an incorrect login or password."
+msgstr ""
 
-#: src/client/application/geary-controller.vala:2148
-#, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:547
+msgid "Retry login, you will be prompted for your password"
 msgstr ""
-"Файл \"%s\" ішінде бар болып тұр.  Оны ауыстырсаңыз, құрамы үстінен жазылады."
 
-#: src/client/application/geary-controller.vala:2151
-msgid "_Replace"
-msgstr "А_лмастыру"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:554
+msgid "Security problem"
+msgstr "Қауіпсіздік мәселесі"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:556
+msgid "An account has reported an untrusted server.."
+msgstr ""
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:559
+msgid "Check"
+msgstr "Тексеру"
 
-#: src/client/application/geary-controller.vala:2391
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "Ашық шимай хаттарды жабу керек пе?"
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:562
+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:595
+#, c-format
+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:972
+#: src/client/folder-list/folder-list-account-branch.vala:43
+msgid "Labels"
+msgstr "Белгілер"
 
-#: src/client/application/geary-controller.vala:2517
+#: src/client/application/application-main-window.vala:1261
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "Барлық хаттарды сіздің %s бумаңыздан босату керек пе?"
 
-#: src/client/application/geary-controller.vala:2518
+#: src/client/application/application-main-window.vala:1262
 msgid "This removes the email from Geary and your email server."
 msgstr ""
 "Бұл әрекет бұл эл. пошта хатын Geary ішінен және эл. пошта серверінен де "
 "өшіреді."
 
-#: src/client/application/geary-controller.vala:2519
+#: src/client/application/application-main-window.vala:1263
 msgid "This cannot be undone."
 msgstr "Бұны болдырмау мүмкін емес болады."
 
-#: src/client/application/geary-controller.vala:2520
+#: src/client/application/application-main-window.vala:1264
 #, c-format
 msgid "Empty %s"
 msgstr "%s босату"
 
-#: src/client/application/geary-controller.vala:2537
-#, c-format
-msgid "Error emptying %s"
-msgstr "%s босату сәтсіз аяқталды"
-
-#: src/client/application/geary-controller.vala:2569
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Бұл хат(тар)ды толығымен өшіруді қалайсыз ба?"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1321
+#| 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] ""
 
-#: src/client/application/geary-controller.vala:2571
+#: src/client/application/application-main-window.vala:1326
+#: src/client/application/application-main-window.vala:1341
 msgid "Delete"
 msgstr "Өшіру"
 
-#: src/client/application/geary-controller.vala:2585
-msgid "Undo trash (Ctrl+Z)"
-msgstr "Қоқыс шелегіне тастауды болдырмау (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2635
-msgid "Undo archive (Ctrl+Z)"
-msgstr "Архивтеуді болдырмау (Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2680
-msgid "Undo (Ctrl+Z)"
-msgstr "Болдырмау (Ctrl+Z)"
-
-#. Translators: The label for an in-app notification. The
-#. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2757
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr ""
-
-#: src/client/application/geary-controller.vala:2838
-msgid "Failed to open default text editor."
-msgstr "Үнсіз келісім бойынша мәтіндік түзеткішін ашу сәтсіз аяқталды."
-
-#. Tooltips
-#: src/client/components/main-toolbar.vala:69
-msgid "Delete conversation (Shift+Delete)"
-msgstr "Сөйлесуді өшіру (Shift+Delete)"
-
-#: src/client/components/main-toolbar.vala:70
-msgid "Delete conversations (Shift+Delete)"
-msgstr "Сөйлесулерді өшіру (Shift+Delete)"
-
-#: src/client/components/main-toolbar.vala:71
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "Сөйлесуді қоқыс шелегіне тастау (Delete, Backspace)"
-
-#: src/client/components/main-toolbar.vala:72
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "Сөйлесудерді қоқыс шелегіне тастау (Delete, Backspace)"
-
-#: src/client/components/main-toolbar.vala:73
-msgid "Archive conversation (A)"
-msgstr "Сөйлесуді архивтеу (A)"
-
-#: src/client/components/main-toolbar.vala:74
-msgid "Archive conversations (A)"
-msgstr "Сөйлесулерді архивтеу (A)"
-
-#: src/client/components/main-toolbar.vala:75
-msgid "Mark conversation"
-msgstr "Сөйлесуді белгілеу"
-
-#: src/client/components/main-toolbar.vala:76
-msgid "Mark conversations"
-msgstr "Сөйлесулерді белгілеу"
-
-#: src/client/components/main-toolbar.vala:77
-msgid "Add label to conversation"
-msgstr "Сөйлесуге белгіні қосу"
-
-#: src/client/components/main-toolbar.vala:78
-msgid "Add label to conversations"
-msgstr "Сөйлесулерге белгіні қосу"
-
-#: src/client/components/main-toolbar.vala:79
-msgid "Move conversation"
-msgstr "Сөйлесуді жылжыту"
-
-#: src/client/components/main-toolbar.vala:80
-msgid "Move conversations"
-msgstr "Сөйлесулерді жылжыту"
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1336
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Бұл хат(тар)ды толығымен өшіруді қалайсыз ба?"
 
-#: src/client/components/main-window.vala:437
+#: src/client/application/application-main-window.vala:1659
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:54
-#, c-format
-msgid "Problem connecting to incoming server for %s"
-msgstr "%s үшін кіріс серверіне байланысу қатесі"
-
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:56
-#: src/client/components/main-window-info-bar.vala:64
-#, c-format
-msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:57
-#: src/client/components/main-window-info-bar.vala:66
-msgid "Retry connecting now"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:62
+#. 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:1920
 #, c-format
-msgid "Problem connecting to outgoing server for %s"
-msgstr "%s үшін шығыс серверіне байланысу қатесі"
-
-#: src/client/components/main-window-info-bar.vala:65
-msgid "Try reconnecting now"
-msgstr ""
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:71
-#, c-format
-msgid "Problem with connection to incoming server for %s"
-msgstr ""
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Бұл салынымдарды ашуды шынымен қалайсыз ба?"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:73
-#: src/client/components/main-window-info-bar.vala:81
-#, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
+#: 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/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:82
-#: src/client/components/main-window-info-bar.vala:90
-#: src/client/components/main-window-info-bar.vala:98
-#: src/client/components/main-window-info-bar.vala:119
-msgid "Try reconnecting"
-msgstr ""
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "М_ені қайта сұрамау"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:79
-#, c-format
-msgid "Problem with connection to outgoing server for %s"
-msgstr "%s үшін шығыс серверіне байланысу қатесі"
+#: 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:102
+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:105
+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:221
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
+#: ui/problem-details-dialog.ui:42
+msgid "Save As"
+msgstr "Қалайша сақтау"
+
+#: src/client/components/components-inspector.vala:230
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "Бас тарту"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:52
+msgid "_Automatically select next message"
+msgstr "Келесі хатты _автотаңдау"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:87
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr ""
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:62
+msgid "_Display conversation preview"
+msgstr "Сөйлесудің алдын-ала көрінісін көр_сету"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:89
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr ""
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:72
+msgid "Use _three pane view"
+msgstr "_Ағаш тектес панель көрінісін қолдану"
 
-#: src/client/components/main-window-info-bar.vala:94
-msgid "Problem communicating with outgoing mail server"
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:82
+msgid "Use _single key email shortcuts"
 msgstr ""
 
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:97
-#, c-format
+#: src/client/components/components-preferences-window.vala:84
 msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
 msgstr ""
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:103
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr ""
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:95
+msgid "_Watch for new mail when closed"
+msgstr "Жабылған кезінде жаңа хаттар келгенін _бақылау"
 
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Messages cannot be received without the correct password."
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:99
+msgid "Geary will keep running after all windows are closed"
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:105
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr ""
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:117
+msgid "Preferences"
+msgstr "Баптаулар"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:110
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:180
+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 "Outgoing mail server password required for %s"
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:111
-msgid "Messages cannot be sent without the correct password."
+#| msgid "Geary has encountered a problem"
+msgid "Geary has encountered a problem with %s."
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
+#. 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 "A problem occurred checking mail for %s"
+#| msgid "Geary has encountered a problem"
+msgid "Geary encountered a problem checking mail for %s."
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:118
-#: src/client/components/main-window-info-bar.vala:125
-msgid "Something went wrong, please file a bug report if the problem persists"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:57
+msgid "Try reconnecting"
 msgstr ""
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:124
+#. 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 "A problem occurred sending mail for %s"
+#| msgid "Geary has encountered a problem"
+msgid "Geary encountered a problem sending email for %s."
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:126
+#. Translators: Tooltip label for Retry button
+#: src/client/components/components-problem-report-info-bar.vala:69
 msgid "Retry sending queued messages"
 msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:137
-msgid "A database problem has occurred"
-msgstr ""
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:139
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr ""
-
-#: src/client/components/main-window-info-bar.vala:152
+#. 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 мәселеге тап болды"
 
-#: src/client/components/main-window-info-bar.vala:153
-msgid ""
-"Please check the technical details and report the problem if it persists."
+#. 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 ""
 
-#: src/client/components/main-window-info-bar.vala:161
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/components-problem-report-info-bar.vala:94
 msgid "_Details"
 msgstr "_Ақпараты"
 
-#: src/client/components/main-window-info-bar.vala:162
+#. 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 "Қате туралы техникалық ақпаратты қарау"
 
-#: src/client/components/main-window-info-bar.vala:166
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/components-problem-report-info-bar.vala:103
 msgid "_Retry"
 msgstr "Қа_йталау"
 
-#: src/client/components/main-window-info-bar.vala:253
-msgid "Details"
-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 "Іздеу"
 
-#: src/client/components/main-window-info-bar.vala:266
-#: src/client/components/stock.vala:23
-msgid "_Close"
-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/main-window-info-bar.vala:270
-msgid "Copy to Clipboard"
-msgstr "Алмасу буферіне көшіріп алу"
+#. / 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 тіркелгісінен іздеу"
 
-#: src/client/components/main-window-info-bar.vala:273
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but one is not provided.
+#: src/client/components/components-validator.vala:390
+#| msgid "Invalid email address"
+msgid "An email address is required"
 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 "Іздеу"
+#. Translators: Tooltip used when an entry requires a valid
+#. email address to be entered, but the address is invalid.
+#: src/client/components/components-validator.vala:394
+#| msgid "Invalid email address"
+msgid "Not a valid email address"
+msgstr ""
 
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Тіркелгінің барлық хаттарынан кілтсөзді іздеу (Ctrl+S)"
+#. Translators: Tooltip used when an entry requires a valid,
+#. resolvable server name to be entered, but one is not
+#. provided.
+#: src/client/components/components-validator.vala:440
+msgid "A server name is required"
+msgstr ""
 
-#: src/client/components/search-bar.vala:100
-#, c-format
-msgid "Indexing %s account"
-msgstr "%s тіркелгісін индекстеу"
+#. Translators: Tooltip used when an entry requires a valid
+#. server name to be entered, but it was unable to be
+#. looked-up in the DNS.
+#: src/client/components/components-validator.vala:445
+msgid "Could not look up server name"
+msgstr ""
 
-#: src/client/components/search-bar.vala:111
-#: src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "%s тіркелгісінен іздеу"
+#: src/client/components/main-toolbar.vala:116
+#| msgid "Mark conversation"
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] ""
+
+#: 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] ""
+
+#: src/client/components/main-toolbar.vala:126
+#| msgid "Move conversation"
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] ""
+
+#: src/client/components/main-toolbar.vala:131
+#| msgid "Archive conversation (A)"
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] ""
+
+#: src/client/components/main-toolbar.vala:142
+#| msgid "Move conversations"
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] ""
+
+#: src/client/components/main-toolbar.vala:152
+#| msgid "Delete conversation"
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] ""
 
 #. / 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…"
 msgstr "Жіберуде…"
 
-#: src/client/components/stock.vala:18 ui/account_cannot_remove.glade:74
+#. / 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:160
-#: ui/password-dialog.glade:196 ui/remove_confirm.glade:155
+#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: src/client/components/stock.vala:21 ui/gtk/menus.ui:34
+#: 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
 msgid "_Discard"
 msgstr "_Елемеу"
 
-#: src/client/components/stock.vala:25 ui/gtk/menus.ui:29
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "_Көмек"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "_Ашу"
 
-#: src/client/components/stock.vala:27 ui/gtk/menus.ui:17
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "Ба_птаулар"
 
@@ -1110,51 +1601,62 @@ msgstr "Ба_птаулар"
 msgid "_Print…"
 msgstr "Бас_паға шығару…"
 
-#: src/client/components/stock.vala:29 ui/gtk/menus.ui:38
+#: src/client/components/stock.vala:29
 msgid "_Quit"
 msgstr "_Шығу"
 
-#: src/client/components/stock.vala:30 ui/remove_confirm.glade:170
+#: src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "Ө_шіру"
 
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
+msgid "_Save"
+msgstr "_Сақтау"
+
 #: src/client/components/stock.vala:32
 msgid "_Keep"
 msgstr "Ұс_тау"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: 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:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Бұл сілтеменің URL-ы қате"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Эл. пошта адресі қате"
 
-#: src/client/composer/composer-widget.vala:158
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:31
+msgid "New Message"
+msgstr "Жаңа хат"
+
+#: src/client/composer/composer-widget.vala:235
 msgid "Saved"
 msgstr "Сақталды"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:236
 msgid "Saving"
 msgstr "Сақталуда"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:237
 msgid "Error saving"
 msgstr "Сақтау қатесі"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:238
 msgid "Press Backspace to delete quote"
 msgstr "Дәйексөзді өшіру үшін Backspace басыңыз"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:170
+#. 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:254
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1166,229 +1668,298 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1102
+#: src/client/composer/composer-widget.vala:903
 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:1130
+#: src/client/composer/composer-widget.vala:929
 msgid "Do you want to discard this draft message?"
 msgstr "Бұл шимай хатты елемеуді қалайсыз ба?"
 
-#: src/client/composer/composer-widget.vala:1247
+#: src/client/composer/composer-widget.vala:1575
 msgid "Send message with an empty subject and body?"
 msgstr "Хатты бос тақырыппен және бос денесімен жіберу керек пе?"
 
-#: src/client/composer/composer-widget.vala:1249
+#: src/client/composer/composer-widget.vala:1577
 msgid "Send message with an empty subject?"
 msgstr "Хатты бос тақырыппен жіберу керек пе?"
 
-#: src/client/composer/composer-widget.vala:1251
+#: src/client/composer/composer-widget.vala:1579
 msgid "Send message with an empty body?"
 msgstr "Хатты бос денесімен жіберу керек пе?"
 
-#: src/client/composer/composer-widget.vala:1255
+#: src/client/composer/composer-widget.vala:1588
 msgid "Send message without an attachment?"
 msgstr "Хатты салынымсыз жіберу керек пе?"
 
-#: src/client/composer/composer-widget.vala:1560
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "\"%s\" салыным ретінде белгіленіп тұр."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1568
-#: src/client/conversation-viewer/conversation-email.vala:136
+#: src/client/composer/composer-widget.vala:1942
+#: src/client/composer/composer-widget.vala:1992
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "\"%s\" бос файл болып тұр."
 
-#: src/client/composer/composer-widget.vala:1605
+#: src/client/composer/composer-widget.vala:1980
 #, c-format
 msgid "“%s” could not be found."
 msgstr "\"%s\" табу мүмкін емес."
 
-#: src/client/composer/composer-widget.vala:1611
+#: src/client/composer/composer-widget.vala:1986
 #, c-format
 msgid "“%s” is a folder."
 msgstr "\"%s\" бума болып тұр."
 
-#: src/client/composer/composer-widget.vala:1617
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "\"%s\" бос файл болып тұр."
-
-#: src/client/composer/composer-widget.vala:1630
+#: src/client/composer/composer-widget.vala:2005
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "\"%s\" оқу үшін ашу мүмкін емес."
 
-#: src/client/composer/composer-widget.vala:1638
+#: src/client/composer/composer-widget.vala:2013
 msgid "Cannot add attachment"
 msgstr "Салынымды қосу мүмкін емес"
 
-#: src/client/composer/composer-widget.vala:1687
-msgid "To: "
-msgstr "Кімге: "
+#. Translators: Human-readable version of the RFC 822 To header
+#: src/client/composer/composer-widget.vala:2073
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:236 ui/conversation-message.ui:312
+msgid "To:"
+msgstr "Кімге:"
 
-#: src/client/composer/composer-widget.vala:1690
-msgid "Cc: "
-msgstr "Көшірмесі: "
+#. Translators: Human-readable version of the RFC 822 CC header
+#: src/client/composer/composer-widget.vala:2079
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:241 ui/conversation-message.ui:357
+msgid "Cc:"
+msgstr "Көшірмесі:"
 
-#: src/client/composer/composer-widget.vala:1693
-msgid "Bcc: "
-msgstr "Жасырын көшірме: "
+#. Translators: Human-readable version of the RFC 822 BCC header
+#: src/client/composer/composer-widget.vala:2085
+#: src/client/conversation-viewer/conversation-email.vala:552
+#: ui/conversation-message.ui:402
+msgid "Bcc:"
+msgstr "Жасырын көшірме:"
 
-#: src/client/composer/composer-widget.vala:1696
+#. Translators: Human-readable version of the RFC 822 Reply-To header
+#: src/client/composer/composer-widget.vala:2091
 msgid "Reply-To: "
 msgstr "Жауап беру: "
 
-#: src/client/composer/composer-widget.vala:1834
+#: src/client/composer/composer-widget.vala:2343
 msgid "Select Color"
 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:2024
+#. 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:2532
 #, 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:2082
-msgid "_From:"
-msgstr "_Кімнен:"
-
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2307
+#: src/client/composer/composer-widget.vala:2889
 msgid "Images"
 msgstr "Суреттер"
 
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Жаңа хат"
-
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Бұл тілді таңдамалы тілдер тізімінен өшіру"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Бұл тілді таңдамалы тілдер тізіміне қосу"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Көбірек тілдерді іздеу"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "Сөйлесуді өшіру"
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:335
+#| msgid "Move conversations"
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] ""
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:347
+#| msgid "Delete conversation"
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] ""
 
-#: src/client/conversation-list/conversation-list-view.vala:286
-#: ui/main-toolbar-menus.ui:16
+#: src/client/conversation-list/conversation-list-view.vala:360
+#: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Оқ_ылған етіп белгілеу"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
-#: ui/main-toolbar-menus.ui:20
+#: src/client/conversation-list/conversation-list-view.vala:368
+#: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Оқыл_маған етіп белгілеу"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
-#: ui/main-toolbar-menus.ui:28
+#: src/client/conversation-list/conversation-list-view.vala:376
+#: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "Жұлдызшаны алы_п тастау"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
-#: ui/main-toolbar-menus.ui:24
+#: src/client/conversation-list/conversation-list-view.vala:383
+#: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Жұлдызшаны орнату"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:392
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "Жауап бе_ру"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:398
 msgid "R_eply All"
 msgstr "Барлығына жауап б_еру"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:404
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "Қа_йта бағдарлау"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "Мен"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:122
-msgid "Unknown"
-msgstr "Белгісіз"
-
-#: src/client/conversation-viewer/conversation-message.vala:60
+#. Translators: Human-readable version of the RFC 822 From header
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:227
+msgid "From:"
+msgstr "Кімнен:"
+
+#. Translators: Human-readable version of the RFC 822 Date header
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:232
+msgid "Date:"
+msgstr "Күні:"
+
+#. Translators: Human-readable version of the RFC 822 Subject header
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:230
+msgid "Subject:"
+msgstr "Тақырыбы:"
+
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr ""
 
-#. Preview headers
+#. 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 "%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:330
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Жіберуші жоқ"
 
 #. Translators: This separates multiple 'from'
-#. addresses in the header preview for a message.
-#: src/client/conversation-viewer/conversation-message.vala:589
+#. 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:691
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Сурет"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:74
+#. 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 ""
+
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Бірде-бір сөйлесу таңдалмады"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:76
+#. 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 "Тізімнен сөйлесуді таңдау оны осында көрсетеді"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#. Translators: Title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Бірнеше сөйлесу таңдалды"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:83
+#. 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 "Әрекетті таңдау барлық таңдалған сөйлесулерге іске асырылады"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:88
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#. 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 found"
 msgstr "Сөйлесулер табылмады"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:90
+#. 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 "Бумада бірде-бір сөйлесу жоқ"
 
-#: src/client/conversation-viewer/conversation-viewer.vala:97
+#. 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 "Сіздің іздеуіңіз бірде-бір нәтиже қайтармады, іздеу шарттарын баптаңыз"
 
@@ -1400,7 +1971,7 @@ msgstr "Файлды таңдау"
 msgid "_Attach"
 msgstr "Салынымды қ_осып жіберу"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:35
+#: src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
 msgid "Untrusted Connection: %s"
 msgstr "Сенімсіз байланыс: %s"
@@ -1437,12 +2008,7 @@ msgstr ""
 "\"Бұл серверге сенбеу\" таңдасаңыз, Geary бұл тіркелгіге енді байланыспайтын "
 "болады."
 
-#: src/client/dialogs/certificate-warning-dialog.vala:65
-msgid "Geary will exit if you have no other open email accounts."
-msgstr ""
-"Сізде басқа ашық эл. пошта тіркелгілері жоқ болса, Geary өз жұмысын аяқтайды."
-
-#: src/client/dialogs/certificate-warning-dialog.vala:70
+#: 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."
@@ -1450,34 +2016,42 @@ msgstr ""
 "Бұл мәселелер жөнінде сұрақтарыңыз бар болса, жүйелік әкімші немесе эл. "
 "поштаны ұсынушыға хабарласыңыз."
 
-#: src/client/dialogs/certificate-warning-dialog.vala:77
+#: src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "Сервер сертикатына қолтаңбаны қойған сертификаттау орталығы белгісіз"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:80
+#: src/client/dialogs/certificate-warning-dialog.vala:79
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "Сертификат өзі алынған сайттың күтілген анықтағышына сәйкес келмейді"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:83
+#: src/client/dialogs/certificate-warning-dialog.vala:82
 msgid "The server’s certificate has expired"
 msgstr "Сервекр сертификаттың мерзімі аяқталған"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:86
+#: src/client/dialogs/certificate-warning-dialog.vala:85
 msgid "The server’s certificate has not been activated"
 msgstr "Сервер сертификаты белсендірілмеген"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:89
+#: src/client/dialogs/certificate-warning-dialog.vala:88
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "Сервер сертификаты қайта шақырылған және қазір жарамсыз болып тұр"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:92
+#: src/client/dialogs/certificate-warning-dialog.vala:91
 msgid "The server’s certificate is considered insecure"
 msgstr "Сертификат алгоритмі қауіпсіз емес ретінде саналады"
 
-#: src/client/dialogs/certificate-warning-dialog.vala:95
+#: src/client/dialogs/certificate-warning-dialog.vala:94
 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:100
+#: ui/problem-details-dialog.ui:12
+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
@@ -1485,24 +2059,30 @@ msgstr "Сервер сертификатын өңдеу кезінде қате
 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"
 msgstr[0] "%d хабарлама"
 
-#. / 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"
 msgstr[0] "%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"
@@ -1511,145 +2091,332 @@ msgstr "%s, %s"
 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"
 msgstr[0] "%d нәтиже"
 
-#: src/client/notification/libmessagingmenu.vala:75
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
+#| msgid "Notifications"
+msgid "Desktop Notifications"
+msgstr ""
+
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
+#| msgid "Desktop notification of new mail"
+msgid "Displays desktop notifications when new email is delivered"
+msgstr ""
+
+#. / 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] ""
 
-#: src/client/notification/libnotify.vala:70
+#. / 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"
 msgstr[0] "%d жаңа хат"
 
-#: src/client/notification/libnotify.vala:73
+#. / 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"
 msgstr[0] "%s, %d жалпы жаңа хат"
 
-#: src/client/notification/libnotify.vala:105
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:282
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Жаңа хабар"
+
+#: 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
+#| 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:195
+msgid "Templates"
+msgstr "Үлгілер"
+
+#. Translators: Info bar button label for creating a
+#. new email template
+#: src/client/plugin/email-templates/email-templates.vala:276
+msgid "New"
+msgstr "Жаңа"
+
+#. Translators: Infobar status label for an email template
+#: src/client/plugin/email-templates/email-templates.vala:287
+#| msgid "Message not saved"
+msgid "Message template"
+msgstr "Хат үлгісі"
+
+#. Translators: Info bar button label for sending an
+#. email template
+#: src/client/plugin/email-templates/email-templates.vala:291
+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:299
+#: src/client/plugin/special-folders/special-folders.vala:180
+msgid "Edit"
+msgstr "Түзету"
+
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
+msgid "Folder Highlight"
+msgstr ""
+
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
+msgid "Highlights folders that have newly delivered mail"
+msgstr ""
+
+#: 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
+#| msgid "Show notifications for new mail"
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr ""
+
+#: src/client/plugin/messaging-menu/messaging-menu.vala:75
 #, 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 үшін)"
+msgid "%s — New Messages"
+msgstr "%s — жаңа хаттар"
+
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
+#| msgid "Notifications"
+msgid "Notification Badge"
+msgstr ""
+
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
+msgid "Displays a dock badge showing the number of new messages"
+msgstr ""
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+#| msgid "not found"
+msgid "Sent Sound"
+msgstr ""
 
-#: src/client/notification/libnotify.vala:161
-msgid "Open"
-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 ""
+
+#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
+msgid "Special Folders"
+msgstr "Арнайы бумалар"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:160
+msgid "Empty"
+msgstr "Босату"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:172
+msgid "Draft message"
+msgstr "Шимай қағаз хабарламасы"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:175
+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:191
+msgid "Message not saved"
+msgstr "Хат сақталмады"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:194
+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 "%H:%M"
 
 #. / 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 "%H:%M"
-
 #. / 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 "%b %-e"
 
-#. / 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"
-
 #. / 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 "%B %-e, %Y %H:%M"
 
 #. / 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 "%B %-e, %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 "%B %-e, %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"
 msgstr[0] "%dмин бұрын"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%dсағ бұрын"
 
-#: 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:846
-msgid "(no subject)"
-msgstr "(тақырыпсыз)"
+#. / 12 hours format for datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:216
+#| 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:220
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %H:%M"
+msgstr "%a, %b %-e, %Y, уақыты %H:%M"
 
-#. 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:49
+#. / 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 %X"
+msgstr "%a, %b %-e, %Y, уақыты %X"
+
+#: src/client/util/util-email.vala:38
+#| msgid "(no subject)"
+msgid "(No subject)"
+msgstr "(Тақырыбы жоқ)"
+
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:135
 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:63
+#. / 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:147
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] ""
 
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: src/client/util/util-email.vala:180
+#, 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:187
+#, 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:193
+#, c-format
+msgid "On %s:"
+msgstr "%s:"
+
+#: src/client/util/util-email.vala:222
+msgid "---------- Forwarded message ----------"
+msgstr "---------- Қайта бағдарланған хат ----------"
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "байт"
@@ -1674,75 +2441,46 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "КБ"
 
-#: src/engine/api/geary-service-information.vala:26
-msgid "IMAP"
-msgstr "IMAP"
-
-#: src/engine/api/geary-service-information.vala:29
-msgid "SMTP"
-msgstr "SMTP"
-
-#: 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! Mail"
-
-#: 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-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"
-msgstr "Жіберілген хаттар"
+#: src/client/util/util-i18n.vala:277
+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"
+#: 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:732
-#: ui/login.glade:750
-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
@@ -1756,7 +2494,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:114
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "салыным"
@@ -1769,7 +2507,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:123
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "жасырын_көшірме"
@@ -1781,7 +2519,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:131
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "денесі"
@@ -1794,7 +2532,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:140
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "көшірме"
@@ -1807,7 +2545,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:149
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "кімнен"
@@ -1819,10 +2557,10 @@ 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:157
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
-msgstr "ол:"
+msgstr "ол"
 
 #. Can be typed in the search box like "subject:word" to find
 #. "word" only if it occurs in the subject of a message.
@@ -1831,7 +2569,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:165
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "тақырып"
@@ -1844,7 +2582,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:174
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "кімге"
@@ -1857,7 +2595,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:195
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "мен"
@@ -1869,7 +2607,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:207
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "мен"
@@ -1881,7 +2619,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:219
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "оқылған"
@@ -1894,7 +2632,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:230
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "жұлдызшалы"
@@ -1906,7 +2644,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:240
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "оқылмаған"
@@ -1915,7 +2653,7 @@ msgstr "оқылмаған"
 #. 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:870
+#: src/engine/imap-engine/imap-engine-generic-account.vala:892
 msgid "Drafts | Draft"
 msgstr "Шимай | Шимайлар | Черновики | Черновик | Drafts | Draft"
 
@@ -1923,23 +2661,23 @@ msgstr "Шимай | Шимайлар | Черновики | Черновик |
 #. 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:879
+#: src/engine/imap-engine/imap-engine-generic-account.vala:901
 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:884
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 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:894
+#. 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:916
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1951,13 +2689,13 @@ msgstr ""
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:904
+#: src/engine/imap-engine/imap-engine-generic-account.vala:926
 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:909
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Өшірілген нәрселер"
@@ -1966,95 +2704,108 @@ msgstr "Өшірілген нәрселер"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:919
+#: src/engine/imap-engine/imap-engine-generic-account.vala:941
 msgid "Archive | Archives"
 msgstr "Архив | Archive | Archives"
 
-#. / 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:236
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%a, %b %-e, %Y күні, уақыты %H:%M"
-
-#. / 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:242
+#: src/engine/rfc822/rfc822-message.vala:531
 #, c-format
-msgid "On %1$s, %2$s wrote:"
-msgstr "%1$s, %2$s жазған:"
+msgid "Could not determine mime type for “%s”."
+msgstr ""
 
-#. / 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:249
+#: src/engine/rfc822/rfc822-message.vala:542
 #, c-format
-msgid "%s wrote:"
-msgstr "%s жазған:"
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr ""
 
-#. / 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:255
-#, c-format
-msgid "On %s:"
-msgstr "%s:"
+#: src/engine/rfc822/rfc822-message.vala:1001
+msgid "(no subject)"
+msgstr "(тақырыпсыз)"
 
-#: src/engine/rfc822/rfc822-utils.vala:282
-msgid "---------- Forwarded message ----------"
-msgstr "---------- Қайта бағдарланған хат ----------"
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
+msgid "Add an account"
+msgstr "Тіркелгіні қосу"
 
-#: src/engine/rfc822/rfc822-utils.vala:286
-#, c-format
-msgid "From: %s\n"
-msgstr "Кімнен: %s\n"
+#: ui/accounts_editor_add_pane.ui:53
+msgid "_Create"
+msgstr "Жа_сау"
 
-#: src/engine/rfc822/rfc822-utils.vala:287
-#, c-format
-msgid "Subject: %s\n"
-msgstr "Тақырып: %s\n"
+#: ui/accounts_editor_add_pane.ui:131 ui/accounts_editor_servers_pane.ui:125
+msgid "Receiving"
+msgstr "Қабылдау"
 
-#: src/engine/rfc822/rfc822-utils.vala:288
-#, c-format
-msgid "Date: %s\n"
-msgstr "Күні: %s\n"
+#: ui/accounts_editor_add_pane.ui:179 ui/accounts_editor_servers_pane.ui:165
+msgid "Sending"
+msgstr "Жіберу"
 
-#: src/engine/rfc822/rfc822-utils.vala:291
-#, c-format
-msgid "To: %s\n"
-msgstr "Кімге: %s\n"
+#: ui/accounts_editor_edit_pane.ui:8
+#| msgid "Edit account"
+msgid "Edit Account"
+msgstr "Тіркелгіні түзету"
 
-#: src/engine/rfc822/rfc822-utils.vala:294
-#, c-format
-msgid "Cc: %s\n"
-msgstr "Көшірмесі: %s\n"
+#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+msgid "Account Name"
+msgstr "Тіркелгі аты"
 
-#: ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Тіркелгіні өшіру мүмкін емес</span> "
+#: ui/accounts_editor_edit_pane.ui:124
+msgid "Email addresses"
+msgstr "Эл. пошта адрестері"
 
-#: ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"Бұл тіркелгімен сәйкестелген жаңа хатты жазу терезесі ашық болып тұр. Хатты "
-"жіберіңіз не елемеңіз, одан кейін қайталап көріңіз."
+#: ui/accounts_editor_edit_pane.ui:164
+msgid "Signature"
+msgstr "Қолы"
 
-#: ui/account_list.glade:69
-msgid "Add account"
-msgstr "Тіркелгіні қосу"
+#: ui/accounts_editor_edit_pane.ui:201
+msgid "Settings"
+msgstr "Баптаулар"
 
-#: ui/account_list.glade:82
-msgid "Edit account"
-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 "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"
+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/account_list.glade:95
+#: 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 ""
+
+#: ui/accounts_editor_remove_pane.ui:122
 msgid "Remove account"
 msgstr "Тіркелгіні өшіру"
 
-#: ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "Geary тіркелгіңізді тексеріп болғанша дейін күте тұрыңыз."
+#: ui/accounts_editor_servers_pane.ui:47
+msgid "Apply"
+msgstr "Іске асыру"
 
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
@@ -2072,265 +2823,392 @@ msgstr "Бұл серверге _сену"
 msgid "_Don’t Trust This Server"
 msgstr "_Бұл серверге сенбеу"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Бөліп жіберу (Ctrl+D)"
-
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Файлды қосып жіберу"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Бастапқы салынымдарды қосып жіберу"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgid "Detach the composer from the window"
+msgstr ""
 
-#: ui/composer-headerbar.ui:202
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "_Жіберу"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Жіберу (Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:230
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "Елемеу және жабу"
 
-#: ui/composer-headerbar.ui:254
+#: 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:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "Бұл URL-мен жаңа сілтемені кірістіру"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Қосу"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "Сілтеме URL-ы"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "Бұл сілтеменің URL-ын жаңарту"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Жаңарту"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Бұл сілтемені өшіру"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Бұл сілтемені ашу"
-
-#: ui/composer-menus.ui:7
-msgid "S_ans Serif"
-msgstr "S_ans Serif"
-
-#: ui/composer-menus.ui:12
-msgid "S_erif"
-msgstr "S_erif"
-
-#: ui/composer-menus.ui:17
-msgid "_Fixed Width"
-msgstr "Бе_кітілген ені"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "_Кішкентай"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "О_рташа"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "Үл_кен"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "_Түсі"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "_Кеңейтілген пішімдеу"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Кеңейтілген өрістерді көрсету"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "Бол_дырмау"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "Қай_талау"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "Қ_иып алу"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "_Көшіру"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "Кірі_стіру"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "Пішімдеу_сіз кірістіру"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "Барлығын _таңдау"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "_Бақылау…"
 
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:60
+#| msgid "_From:"
+msgid "_From"
+msgstr "Кі_мнен"
+
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
+#: ui/composer-widget.ui:130
 msgid "_To"
 msgstr "Кі_мге"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Көшірме, Жасырын көшірме және Кімге Жауап Беру өрістерін көрсету"
+
+#: ui/composer-widget.ui:219
 msgid "_Cc"
 msgstr "Көшірме_сі"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Тақырып"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:267
 msgid "_Bcc"
 msgstr "_Жасырын көшірме"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:315
 msgid "_Reply-To"
 msgstr "Жауап бе_ру"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "Кімнен"
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "_Тақырып"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:445
 msgid "Drop files here"
 msgstr "Файлдарды осында тастау"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:461
 msgid "To add them as attachments"
 msgstr "Оларды салынымдар ретінде қосу үшін"
 
-#: ui/composer-widget.ui:348
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Соңғы түзетуді болдырмау (Ctrl+Z)"
+#: ui/composer-widget.ui:602
+msgid "Bold text"
+msgstr "Жуан қаріп"
 
-#: ui/composer-widget.ui:372
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Соңғы түзетуді қайталау (Ctrl+Z)"
+#: ui/composer-widget.ui:626
+#| msgctxt "shortcut window"
+#| msgid "Italicize text"
+msgid "Italic text"
+msgstr "Көлбеу мәтін"
 
-#: ui/composer-widget.ui:410
-msgid "Bold (Ctrl+B)"
-msgstr "Жуан (Ctrl+B)"
+#: ui/composer-widget.ui:650
+msgid "Underline text"
+msgstr "Асты сызылған"
 
-#: ui/composer-widget.ui:434
-msgid "Italic (Ctrl+I)"
-msgstr "Көлбеу (Ctrl+I)"
+#: ui/composer-widget.ui:674
+#| msgctxt "shortcut window"
+#| msgid "Strike text"
+msgid "Strikethrough text"
+msgstr "Сызылған мәтін"
 
-#: ui/composer-widget.ui:458
-msgid "Underline (Ctrl+U)"
-msgstr "Асты сызылған (Ctrl+U)"
+#: ui/composer-widget.ui:707
+#| msgid "Insert ordered list"
+msgid "Insert bulleted list"
+msgstr ""
 
-#: ui/composer-widget.ui:482
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Сызып тастау (Ctrl+K)"
+#: ui/composer-widget.ui:731
+#| msgid "Insert ordered list"
+msgid "Insert numbered list"
+msgstr ""
 
-#: ui/composer-widget.ui:520
-msgid "Insert unordered list"
+#: ui/composer-widget.ui:764
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Indent or quote text"
 msgstr ""
 
-#: ui/composer-widget.ui:544
-msgid "Insert ordered list"
-msgstr "Реттелген тізімді кірістіру"
+#: ui/composer-widget.ui:788
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Un-indent or unquote text"
+msgstr ""
 
-#: ui/composer-widget.ui:582
-msgid "Quote text  (Ctrl+])"
-msgstr "Мәтінді дәйексөз қылу (Ctrl+])"
+#: ui/composer-widget.ui:817
+#| msgctxt "shortcut window"
+#| msgid "Remove formatting"
+msgid "Remove text formatting"
+msgstr ""
 
-#: ui/composer-widget.ui:606
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Мәтінді дәйексөз емес қылу (Ctrl+[)"
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr "Қаріп түрін өзгерту"
 
-#: ui/composer-widget.ui:644
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Таңдалғанның сілтемесін кірістіру немесе жаңарту (Ctrl+L)"
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:668
-msgid "Insert an image (Ctrl+G)"
-msgstr "Суретті кірістіру (Ctrl+G)"
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "Serif"
 
-#: ui/composer-widget.ui:702
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Таңдалғанның пішімдеуін өшіру (Ctrl+Space)"
+#: ui/composer-widget.ui:873
+msgid "Fixed Width"
+msgstr "Бекітілген ені"
 
-#: ui/composer-widget.ui:726
-msgid "Select spell checking languages"
-msgstr "Емлені тексеру тілдерін таңдау"
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr "Қаріп түсін өзгерту"
 
-#: ui/conversation-email.ui:27
-msgid "Save all attachments"
-msgstr "Барлық салынымдарды сақтау"
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+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 "Бұл хабарламаны жұлдызшамен белгілеу"
+#: ui/composer-widget.ui:949
+#| msgid "Insert or update selection link (Ctrl+L)"
+msgid "Insert or update text link"
+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 "Бұл хабарламадан жұлдызшаны алып тастау"
+#: ui/composer-widget.ui:973
+msgid "Insert an image"
+msgstr "Суретті кірістіру"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Хабарлама мәзірін көрсету"
+#: ui/composer-widget.ui:1015
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Undo last edit"
+msgstr "Соңғы өңдеуді болдырмау"
 
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Таңдалған салынымдарды ашу"
+#: ui/composer-widget.ui:1039
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Redo last edit"
+msgstr "Соңғы өңдеуді қайталау"
 
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Таңдалған салынымдарды сақтау"
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+msgid "Attach a file"
+msgstr "Файлды қосып жіберу"
 
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
+#: ui/composer-widget.ui:1117
+#| msgid "Include Original Attachments"
+msgid "Add original attachments"
+msgstr ""
+
+#: ui/composer-widget.ui:1162
+msgid "More options"
+msgstr "Көбірек опциялар"
+
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr ""
+
+#: ui/composer-widget.ui:1200
+msgid "Select spell checking languages"
+msgstr "Емлені тексеру тілдерін таңдау"
+
+#: ui/composer-widget.ui:1263
+msgid "S_ans Serif"
+msgstr "S_ans Serif"
+
+#: ui/composer-widget.ui:1268
+msgid "S_erif"
+msgstr "S_erif"
+
+#: ui/composer-widget.ui:1273
+msgid "_Fixed Width"
+msgstr "Бе_кітілген ені"
+
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "_Кішкентай"
+
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "О_рташа"
+
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "Үл_кен"
+
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "_Кеңейтілген пішімдеу"
+
+#: ui/composer-widget.ui:1308
+#| msgid "_Rich Text"
+msgid "_Plain Text"
+msgstr "А_шық мәтін"
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
 msgstr "Барлық салынымдарды таңдау"
 
-#: ui/conversation-email.ui:240
-msgid "Edit Draft"
-msgstr "Шимайды түзету"
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Таңдалған салынымдарды сақтау"
 
-#: ui/conversation-email.ui:267
-msgid "Draft message"
-msgstr "Шимай қағаз хабарламасы"
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Таңдалған салынымдарды ашу"
 
-#: ui/conversation-email.ui:283
-msgid "This message has not yet been sent."
-msgstr "Бұл хат әлі жіберілмеген."
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "Б_арлығын сақтау"
 
-#: ui/conversation-email.ui:329
-msgid "Message not saved"
-msgstr "Хат сақталмады"
+#: ui/components-inspector-error-view.ui:33
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
+"\">new bug report</a>."
+msgstr ""
 
-#: ui/conversation-email.ui:345
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Бұл хат сәтті жіберілді, бірақ сіздің тіркегіңізге сақталмады."
+#: ui/components-inspector-error-view.ui:49
+msgid "Details:"
+msgstr "Ақпараты:"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:19 ui/problem-details-dialog.ui:19
+#| 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:46
+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:62
+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"
+msgstr "Эл. пошта адресін көшіріп алу"
+
+#: ui/conversation-contact-popover.ui:182
+#| msgid "Save and Close"
+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 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
@@ -2354,24 +3232,43 @@ msgid "Mark Unread From _Here"
 msgstr "Ос_ыдан бастап оқылмаған етіп белгілеу"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "Қ_оқыс шелегі"
+#| msgctxt "shortcut window"
+#| msgid "Move to trash"
+msgid "Move message to _Trash"
+msgstr ""
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
-msgstr "Ө_шіру…"
+#| msgid "_Delete…"
+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-email-menus.ui:87
-msgid "_Save All"
-msgstr "Барл_ығын сақтау"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Бірақ, шын мәнінде мына жерге барады:"
+
+#: ui/conversation-message-link-popover.ui:84
+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 Link"
@@ -2382,8 +3279,9 @@ msgid "Copy Link _Address"
 msgstr "Сілтеме адр_есін көшіру"
 
 #: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "Жаңа _хатты жіберу…"
+#| msgid "Move conversation"
+msgid "_New Conversation…"
+msgstr "_Жаңа сөйлесу…"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2397,110 +3295,42 @@ msgstr "Суретті қалайша _сақтау…"
 msgid "_Select All"
 msgstr "Бар_лығын таңдау"
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "Келесіден хабарламаларды іздеу:"
-
-#: ui/conversation-message.ui:64
+#: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "<email> жіберген"
 
-#: ui/conversation-message.ui:80 ui/conversation-message.ui:179
+#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
 msgid "1/1/1970\t"
 msgstr "1/1/1970\t"
 
-#: ui/conversation-message.ui:103
+#: ui/conversation-message.ui:102
 msgid "Preview body text."
 msgstr "Дене мәтінін алдын-ала қарау."
 
-#: ui/conversation-message.ui:203
+#: ui/conversation-message.ui:202
 msgid "Sent by:"
 msgstr "Кім жіберген:"
 
-#: ui/conversation-message.ui:248
+#: ui/conversation-message.ui:247
 msgid "Reply to:"
 msgstr "Кімге жауап беру:"
 
-#: ui/conversation-message.ui:292
+#: ui/conversation-message.ui:291
 msgid "Subject"
 msgstr "Тақырыбы"
 
-#: ui/conversation-message.ui:313
-msgid "To:"
-msgstr "Кімге:"
-
-#: ui/conversation-message.ui:358
-msgid "Cc:"
-msgstr "Көшірмесі:"
-
-#: ui/conversation-message.ui:403
-msgid "Bcc:"
-msgstr "Жасырын көшірме:"
-
-#: ui/conversation-message.ui:502
-msgid "Show Images"
-msgstr "Суреттерді көрсету"
-
-#: ui/conversation-message.ui:515
-msgid "Always Show From Sender"
-msgstr "Жіберушіден әрқашан көрсету"
-
-#: ui/conversation-message.ui:543
-msgid "Remote images not shown"
-msgstr "Қашықтағы суреттер көрсетілмейді"
-
-#: ui/conversation-message.ui:560
-msgid "Only show remote images from senders you trust."
-msgstr "Тек өзіңіз сенетін жіберушілерден суреттерді көрсету."
-
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Бірақ, шын мәнінде мына жерге барады:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Бұл сілтеме осы жерге көрсетіп тұрған сияқты:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Зиянкес сілтеме табылды"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "Эл. поштаны жіберуші сізді қате сайтқа бағдарлауы мүмкін."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr "Сенімсіз болсаңыз, жалғастыру алдында жіберушіге хабарласыңыз."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Сөйлесуден табу"
 
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "Ізделетін мәтіннің алдыңғы кездесуін табу."
 
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "Ізделетін мәтіннің келесі кездесуін табу."
 
-#: ui/edit_alternate_emails.glade:112
-msgid "Remove email address"
-msgstr "Эл. пошта адресін өшіру"
-
-#: ui/edit_alternate_emails.glade:136
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"Кейбір эл. пошта қызметтері серверде қосымша адрестердің бапталуын талап "
-"етеді. Көбірек білу үшін өз эл. пошта ұсынушысыңызға хабарласыңыз."
-
-#: ui/edit_alternate_emails.glade:175
-msgid "_Update"
-msgstr "_Жаңарту"
-
 #: ui/find_bar.glade:66
 msgid "Find:"
 msgstr "Іздеу:"
@@ -2525,526 +3355,882 @@ msgstr "белгі"
 msgid "Conversation Shortcuts"
 msgstr "Сөйлесулер жарлықтары"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:377
 msgctxt "shortcut window"
-msgid "General"
-msgstr "Жалпы"
+msgid "Actions"
+msgstr "Әрекеттер"
 
 #: ui/gtk/help-overlay.ui:17
+#| msgid "Move conversation"
 msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "Фокусты келесі/алдыңғы панельге жылжыту"
+msgid "New conversation"
+msgstr "Жаңа сөйлесу"
 
 #: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "Фокусты сөйлесулер тізіміне жылжыту"
+msgid "Reply to sender"
+msgstr "Жіберушіге жауап беру"
 
-#: ui/gtk/help-overlay.ui:31
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:281
 msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "Жаңа хатты жазу терезесін бөліп жіберу"
+msgid "Reply to all"
+msgstr "Барлығына жауап беру"
 
-#: ui/gtk/help-overlay.ui:38
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:288
 msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "Жаңа хатты жазу терезесін жабу"
+msgid "Forward"
+msgstr "Қайта бағдарлау"
 
-#: ui/gtk/help-overlay.ui:45
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:295
+#| msgctxt "shortcut window"
+#| msgid "Mark read"
 msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "Пернетақта жарлықтарын көрсету"
+msgid "Un-mark/mark read"
+msgstr "Оқылмаған/оқылған ретінде белгілеу"
 
-#: ui/gtk/help-overlay.ui:52
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:302
 msgctxt "shortcut window"
-msgid "Show help"
-msgstr "Көмекті көрсету"
+msgid "Mark/un-mark starred"
+msgstr "Жұлдызшаны белгілеу/алып тастау"
 
-#: ui/gtk/help-overlay.ui:59
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:309
+#| msgid "Archive conversations (A)"
 msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "Қолданба жұмысын аяқтау"
+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
+#| msgctxt "shortcut window"
+#| msgid "Label the conversation"
+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:68
+#: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Іздеу"
 
-#: ui/gtk/help-overlay.ui:72
+#: ui/gtk/help-overlay.ui:108
+#| msgid "Mark conversations"
 msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "Іздеу жолағына өту"
+msgid "Search for conversations"
+msgstr "Сөйлесулерді іздеу"
 
-#: ui/gtk/help-overlay.ui:79
+#: ui/gtk/help-overlay.ui:115 ui/gtk/help-overlay.ui:354
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "Ағымдағы сөйлесуден табу"
 
-#: ui/gtk/help-overlay.ui:86
+#: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "Ағымдағы сөйлесуден алдыңғы/келесі сәйкестікті табу"
+msgid "Undo"
+msgstr "Болдырмау"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Actions"
-msgstr "Әрекеттер"
+msgid "Undo the last action"
+msgstr "Соңғы әрекетті болдырмау"
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "Жаңа хатты жазу"
+msgid "Redo the last action"
+msgstr "Соңғы әрекетті қайталау"
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "Жіберушіге жауап беру "
+msgid "View"
+msgstr "Қарау"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "Барлығына жауап беру"
+msgid "Zoom in"
+msgstr "Үлкейту"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
-msgid "Forward"
-msgstr "Қайта бағдарлау"
+msgid "Zoom out"
+msgstr "Кішірейту"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "Архивтек"
+msgid "Reset zoom"
+msgstr "Масштабты тастау"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:397
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "Қоқыс шелегіне тастау"
+msgid "General"
+msgstr "Жалпы"
 
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:192
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "Спам күйін ауыстыру"
+msgid "Show help"
+msgstr "Көмекті көрсету"
 
-#: ui/gtk/help-overlay.ui:148
+#: ui/gtk/help-overlay.ui:199
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "Сөйлесуді жылжыту"
+msgid "Show keyboard shortcuts"
+msgstr "Пернетақта жарлықтарын көрсету"
 
-#: ui/gtk/help-overlay.ui:155
+#: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "Сөйлесуге белгіні орнату"
+msgid "Open a new window"
+msgstr "Жаңа терезені ашу"
 
-#: ui/gtk/help-overlay.ui:163
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "Оқылған етіп белгілеу"
+msgid "Close the current window"
+msgstr "Ағымдағы терезені жабу"
 
-#: ui/gtk/help-overlay.ui:170
+#: ui/gtk/help-overlay.ui:220
 msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "Оқылмаған етіп белгілеу"
+msgid "Quit the application"
+msgstr "Қолданба жұмысын аяқтау"
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
-msgid "View"
-msgstr "Қарау"
+msgid "Keyboard navigation"
+msgstr "Пернетақта навигациясы"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:233
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "Үлкейту"
+msgid "Go to next/previous pane"
+msgstr "Келесі/алдыңғы панельге өту"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:241
+#| msgctxt "shortcut window"
+#| msgid "Find next/previous in current conversation"
 msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "Кішірейту"
+msgid "Select next/previous conversation"
+msgstr "Келесі/алдыңғы сөйлесуді таңдау"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:248
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "Масштабты тастау"
+msgid "Focus next/previous message"
+msgstr "Келесі/алдыңғы хабарламаға фокусты орнату"
 
-#: ui/gtk/help-overlay.ui:206
+#: ui/gtk/help-overlay.ui:260
+#| msgctxt "shortcut window"
+#| msgid "Additional Shortcuts"
+msgid "Single-key Shortcuts"
+msgstr "Дара перне жарлықтары"
+
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "Қосымша жарлықтар"
+msgid "Single-key shortcuts (if enabled)"
+msgstr "Дара перне жарлықтары (іске қосылған болса)"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "Жұлдызшаны орнату"
+msgid "Reply to sender "
+msgstr "Жіберушіге жауап беру "
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:361
+#| msgctxt "shortcut window"
+#| msgid "Find next/previous in current conversation"
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "Жұлдызшаны алып тастау"
+msgid "Select next/previous conversations"
+msgstr "Келесі/алдыңғы сөйлесулерді таңдау"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:373
+msgid "Composer Shortcuts"
+msgstr "Хатты жазу терезесінің жарлықтары"
+
+#: ui/gtk/help-overlay.ui:381
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "Өшіру"
+msgid "Send"
+msgstr "Жіберу"
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:388
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "Келесі (ескілеу) сөйлесуге өту"
+msgid "Add attachment"
+msgstr "Салынымды қосу"
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:401
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "Алдыңғы (жаңалау) сөйлесуге өту"
+msgid "Close composer window"
+msgstr "Жаңа хатты жазу терезесін жабу"
 
-#: ui/gtk/help-overlay.ui:250
-msgid "Composer Shortcuts"
-msgstr "Хатты жазу терезесінің жарлықтары"
+#: ui/gtk/help-overlay.ui:408
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "Жаңа хатты жазу терезесін бөліп жіберу"
 
-#: ui/gtk/help-overlay.ui:258
+#: ui/gtk/help-overlay.ui:415
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "Түзету"
+
+#: ui/gtk/help-overlay.ui:420
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr "Таңдалғанды алмасу буферіне жылжыту"
+
+#: ui/gtk/help-overlay.ui:427
+#| msgid "Copy to Clipboard"
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "Таңдалғанды алмасу буферіне көшіріп алу"
+
+#: ui/gtk/help-overlay.ui:434
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr "Алмасу буферінен кірістіру"
+
+#: ui/gtk/help-overlay.ui:441
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Мәтінді дәйексөз қылу"
 
-#: ui/gtk/help-overlay.ui:265
+#: ui/gtk/help-overlay.ui:448
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Мәтінді дәйексөз емес қылу"
 
-#: ui/gtk/help-overlay.ui:278
+#: ui/gtk/help-overlay.ui:457
+#| msgctxt "shortcut window"
+#| msgid "Rich text mode"
 msgctxt "shortcut window"
-msgid "Send"
-msgstr "Жіберу"
-
-#: ui/gtk/help-overlay.ui:285
-msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "Салынымды қосу"
+msgid "Rich text editing"
+msgstr "Кеңейтілген пішімдеу"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:461
+#| msgctxt "Clipboard paste as plain text"
+#| msgid "Paste _Without Formatting"
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "Кеңейтілген пішімдеу"
+msgid "Paste without formatting"
+msgstr "Пішімдеусіз кірістіру"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:468
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Жуан қаріп"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:475
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Мәтінді көлбеу қылу"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:482
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Асты сызылған"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:489
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Мәтінді сызылған қылу"
 
-#: ui/gtk/help-overlay.ui:326
+#: ui/gtk/help-overlay.ui:496
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "Пішімдеуді өшіру"
+
+#: ui/gtk/help-overlay.ui:503
+#| msgid "Insert an image (Ctrl+G)"
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "Суретті кірістіру"
+
+#: ui/gtk/help-overlay.ui:510
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Сілтемені кірістіру"
 
-#: ui/gtk/help-overlay.ui:333
-msgctxt "shortcut window"
-msgid "Remove formatting"
-msgstr "Пішімдеуді өшіру"
+#: ui/main-toolbar.ui:24
+msgctxt "tooltip"
+msgid "Compose Message"
+msgstr "Хатты жазу"
 
-#: ui/gtk/menus.ui:13
-msgid "A_ccounts"
+#: ui/main-toolbar.ui:62
+msgid "Toggle search bar"
+msgstr "Іздеу панелін іске қосу/сөндіру"
+
+#: ui/main-toolbar.ui:114
+msgid "Reply"
+msgstr "Жауап беру"
+
+#: ui/main-toolbar.ui:137
+msgid "Reply All"
+msgstr "Барлығына жауап беру"
+
+#: ui/main-toolbar.ui:160
+msgid "Forward"
+msgstr "Қайта бағдарлау"
+
+#: ui/main-toolbar.ui:265
+msgid "Toggle find bar"
+msgstr "Іздеу панелін іске қосу/сөндіру"
+
+#: ui/main-toolbar.ui:286
+msgid "_Archive"
+msgstr "_Архивтеу"
+
+#: ui/main-toolbar-menus.ui:21
+#| msgctxt "shortcut window"
+#| msgid "Toggle spam"
+msgid "Toggle as _Junk"
+msgstr "_Спам ретінде белгілеу/алып тастау"
+
+#: ui/main-toolbar-menus.ui:28
+msgid "_Accounts"
 msgstr "_Тіркелгілер"
 
-#: ui/gtk/menus.ui:23
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "Пернетақта жарлықтары"
 
-#: ui/login.glade:88
-msgid "email example com"
-msgstr "email example com"
+#: ui/main-toolbar-menus.ui:47
+#| msgid "_About"
+msgid "_About Geary"
+msgstr "Geary тур_алы"
 
-#: ui/login.glade:107 ui/password-dialog.glade:108
-msgid "Password"
-msgstr "Пароль"
+#: ui/password-dialog.glade:74
+msgid "SMTP Credentials"
+msgstr "SMTP тіркелгі ақпараты"
 
-#: ui/login.glade:123
-msgid "E_mail address"
-msgstr "Эл. _пошта адресі"
+#: ui/password-dialog.glade:91
+msgid "Username"
+msgstr "Пайдаланушы аты"
 
-#: ui/login.glade:144 ui/login.glade:635
-msgid "_Password"
-msgstr "_Пароль"
+#: ui/password-dialog.glade:152
+msgid "_Remember password"
+msgstr "Парольді есте сақ_тау"
 
-#: ui/login.glade:178
-msgid "S_ervice"
-msgstr "Қ_ызмет"
+#: ui/password-dialog.glade:210
+msgid "_Authenticate"
+msgstr "_Аутентификация"
 
-#: ui/login.glade:199
-msgid "N_ame"
-msgstr "А_ты"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Geary жаңартуы жүруде…"
 
-#: ui/login.glade:256
-msgid "N_ickname"
-msgstr "Н_ик аты"
+#~ msgid "mail-send"
+#~ msgstr "mail-send"
 
-#: ui/login.glade:280
-msgid "Work, Home, etc."
-msgstr "Үй, Жұмыс, т.с.с."
+#~ msgid "org.gnome.Geary"
+#~ msgstr "org.gnome.Geary"
 
-#: ui/login.glade:291
-msgid "_Save sent mail"
-msgstr "Жіберілген поштаны _сақтау"
+#~ msgid "Default attachments directory"
+#~ msgstr "Салынымдардың негізгі бумасы"
 
-#: ui/login.glade:309
-msgid "Addi_tional email addresses…"
-msgstr "Қосы_мша эл. пошта адрестері…"
+#~ msgid "Location used when opening and saving attachments."
+#~ msgstr "Салынымдарды ашу және сақтаудың орны."
 
-#: ui/login.glade:353
-msgid "IMAP settings"
-msgstr "IMAP баптаулары"
+#~ msgid "Enable notification sounds"
+#~ msgstr "Хабарлау дыбыстарын ойнату"
 
-#: ui/login.glade:372
-msgid "Se_rver"
-msgstr "Се_рвер"
+#~ msgid "Additional addresses for %s"
+#~ msgstr "%s үшін қосымша адрестер"
 
-#: ui/login.glade:393
-msgid "imap.example.com"
-msgstr "imap.example.com"
+#~ msgid "First Last"
+#~ msgstr "Аты Фамилиясы"
 
-#: ui/login.glade:409
-msgid "P_ort"
-msgstr "_Порт"
+#~ msgid "Enter your account information to get started."
+#~ msgstr "Бастау үшін тіркелгі ақпаратыңызды енгізіңіз."
 
-#: ui/login.glade:448
-msgid "smtp.example.com"
-msgstr "smtp.example.com"
+#~ msgid "Preview"
+#~ msgstr "Алдын-ала қарау"
 
-#: ui/login.glade:480
-msgid "Ser_ver"
-msgstr "Сер_вер"
+#~ msgid "Remem_ber passwords"
+#~ msgstr "Парольдерді есте сақ_тау"
 
-#: ui/login.glade:501
-msgid "Por_t"
-msgstr "Пор_т"
+#~ msgid "Remem_ber password"
+#~ msgstr "Парольді есте сақ_тау"
 
-#: ui/login.glade:522
-msgid "SMTP settings"
-msgstr "SMTP баптаулары"
+#~ msgid "Unable to validate:\n"
+#~ msgstr "Тексеру сәтсіз аяқталды:\n"
 
-#: ui/login.glade:541
-msgid "User_name"
-msgstr "Па_йдаланушы аты"
+#~ msgid "        • Invalid account nickname.\n"
+#~ msgstr "        • Тіркелгінің ник аты қате.\n"
 
-#: ui/login.glade:562
-msgid "Pass_word"
-msgstr "Пар_оль"
+#~ msgid "        • Email address already added to Geary.\n"
+#~ msgstr "        • Эл. пошта адресі Geary-ге бұрын қосылған.\n"
 
-#: ui/login.glade:582
-msgid "SMTP username"
-msgstr "SMTP пайдаланушы аты"
+#~ msgid "        • IMAP connection error.\n"
+#~ msgstr "        • IMAP байланысу қатесі.\n"
 
-#: ui/login.glade:598
-msgid "SMTP password"
-msgstr "SMTP паролі"
+#~ msgid "        • IMAP username or password incorrect.\n"
+#~ msgstr "        • IMAP пайдаланушы аты не паролі қате.\n"
 
-#: ui/login.glade:614
-msgid "_Username"
-msgstr "_Пайдаланушы аты"
+#~ msgid "        • SMTP connection error.\n"
+#~ msgstr "        • SMTP байланысу қатесі.\n"
 
-#: ui/login.glade:655
-msgid "IMAP username"
-msgstr "IMAP пайдаланушы аты"
+#~ msgid "        • SMTP username or password incorrect.\n"
+#~ msgstr "        • SMTP пайдаланушы аты не паролі қате.\n"
 
-#: ui/login.glade:671
-msgid "IMAP password"
-msgstr "IMAP паролі"
+#~ msgid "        • Connection error.\n"
+#~ msgstr "        • Байланыс қатесі.\n"
 
-#: ui/login.glade:688
-msgid "Encr_yption"
-msgstr "_Шифрлеу"
+#~ msgid "        • Username or password incorrect.\n"
+#~ msgstr "        • Пайдаланушы аты не паролі қате.\n"
 
-#: ui/login.glade:711
-msgid "Encrypt_ion"
-msgstr "Ш_ифрлеу"
+#~ msgid "Output debugging information"
+#~ msgstr "Жөндеу ақпаратын көрсету"
 
-#: ui/login.glade:733 ui/login.glade:751
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#~ msgid "Log network serialization"
+#~ msgstr "Желілік сериализациясын журналдау"
 
-#: ui/login.glade:734 ui/login.glade:752
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#~ msgid "Log periodic activity"
+#~ msgstr "Мезгіл-мезгіл белсенділікті журналдау"
 
-#: ui/login.glade:764
-msgid "No authentication re_quired"
-msgstr "Аутентификация керек е_мес"
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "WebView бақылауды рұқсат ету"
 
-#: ui/login.glade:781
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP тіркелгі _деректерін қолдану"
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "Пікірлер, ұсыныстар және ақаулықтарды хабарлау жері:"
 
-#: ui/login.glade:888
-msgid "Composer"
-msgstr "Хатты жазу терезесі"
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "Командалық жол опцияларын талдау сәтсіз аяқталды: %s\n"
 
-#: ui/login.glade:901
-msgid "Save dra_fts on server"
-msgstr "Ши_май хаттарды серверде сақату"
+#~ msgid "Unable to store server trust exception"
+#~ msgstr "Серверге сену ережесін сақтау қатесі"
 
-#: ui/login.glade:918
-msgid "Si_gn emails (HTML allowed):"
-msgstr "Эл. пошта хаттарына қол_таңбаны қою (HTML рұқсат етілген):"
+#~ msgid "Your settings are insecure"
+#~ msgstr "Сіздің баптауларыңыз қауіпсіз емес"
 
-#: ui/login.glade:976
-msgid "Storage"
-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/login.glade:998
-msgid "_Download mail"
-msgstr "_Поштаны жүктеп алу"
+#~ msgid "Co_ntinue"
+#~ msgstr "Жалғ_астыру"
 
-#: ui/main-toolbar.ui:51
-msgid "Toggle search bar"
-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/main-toolbar.ui:72
-msgid "Empty Spam or Trash folders"
-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 жіберілген хатты Жіберілген хаттар бумасына сақтау кезінде қате "
+#~ "орын алды. Бұл хат сіз оны қолмен өшірілгенге дейін Шығыс бумасында қала "
+#~ "береді."
 
-#: ui/main-toolbar.ui:112
-msgid "Reply"
-msgstr "Жауап беру"
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "%s үшін жергілікті эл. пошта жәшігін ашу мүмкін емес"
 
-#: ui/main-toolbar.ui:135
-msgid "Reply All"
-msgstr "Барлығына жауап беру"
+#~ 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"
+#~ "\n"
+#~ "%s"
 
-#: ui/main-toolbar.ui:158
-msgid "Forward"
-msgstr "Қайта бағдарлау"
+#~ 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 қолданбасының соңғы нұсқасын орнатып, қайталап көріңіз."
 
-#: ui/main-toolbar.ui:264
-msgid "Toggle find bar"
-msgstr "Іздеу панелін іске қосу/сөндіру"
+#~ 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 қолданбасын қайта іске қосыңыз."
 
-#: ui/main-toolbar.ui:306
-msgid "_Archive"
-msgstr "_Архивтеу"
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "Жылжытуды болдырмау (Ctrl+Z)"
 
-#: ui/main-toolbar-menus.ui:5
-msgid "Empty _Spam…"
-msgstr "_Спам бумасын босату…"
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "Ашық шимай хаттарды жабу керек пе?"
 
-#: ui/main-toolbar-menus.ui:9
-msgid "Empty _Trash…"
-msgstr "Қ_оқыс шелегін босату…"
+#~ msgid "Error emptying %s"
+#~ msgstr "%s босату сәтсіз аяқталды"
 
-#: ui/main-toolbar-menus.ui:32
-msgid "Mark as S_pam"
-msgstr "С_пам етіп белгілеу"
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "Қоқыс шелегіне тастауды болдырмау (Ctrl+Z)"
 
-#: ui/main-toolbar-menus.ui:36
-msgid "Mark as not S_pam"
-msgstr "С_пам емес етіп белгілеу"
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "Архивтеуді болдырмау (Ctrl+Z)"
 
-#: ui/main-window-info-bar.ui:97
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "Болдырмау (Ctrl+Z)"
 
-#: ui/main-window-info-bar.ui:113
-msgid "Details:"
-msgstr "Ақпараты:"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Үнсіз келісім бойынша мәтіндік түзеткішін ашу сәтсіз аяқталды."
 
-#: ui/password-dialog.glade:74
-msgid "SMTP Credentials"
-msgstr "SMTP тіркелгі ақпараты"
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgstr "Сөйлесуді өшіру (Shift+Delete)"
 
-#: ui/password-dialog.glade:91
-msgid "Username"
-msgstr "Пайдаланушы аты"
+#~ msgid "Delete conversations (Shift+Delete)"
+#~ msgstr "Сөйлесулерді өшіру (Shift+Delete)"
 
-#: ui/password-dialog.glade:152
-msgid "_Remember password"
-msgstr "Парольді есте сақ_тау"
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgstr "Сөйлесуді қоқыс шелегіне тастау (Delete, Backspace)"
 
-#: ui/password-dialog.glade:210
-msgid "_Authenticate"
-msgstr "_Аутентификация"
+#~ msgid "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr "Сөйлесудерді қоқыс шелегіне тастау (Delete, Backspace)"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "Оқу"
+#~ msgid "Add label to conversations"
+#~ msgstr "Сөйлесулерге белгіні қосу"
 
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "Келесі хатты _автотаңдау"
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "%s үшін кіріс серверіне байланысу қатесі"
 
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "Сөйлесудің алдын-ала көрінісін көр_сету"
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "%s үшін шығыс серверіне байланысу қатесі"
 
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "_Ағаш тектес панель көрінісін қолдану"
+#~ msgid "Problem with connection to outgoing server for %s"
+#~ msgstr "%s үшін шығыс серверіне байланысу қатесі"
 
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "Хабарламалар"
+#~ msgid "Indexing %s account"
+#~ msgstr "%s тіркелгісін индекстеу"
 
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "Хабарлау дыбы_старын ойнату"
+#~ msgid "To: "
+#~ msgstr "Кімге: "
 
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "Жаңа хаттар үшін _хабарламаларды көрсету"
+#~ msgid "Cc: "
+#~ msgstr "Көшірмесі: "
 
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "Жабылған кезінде жаңа хаттар келгенін _бақылау"
+#~ msgid "Bcc: "
+#~ msgstr "Жасырын көшірме: "
 
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr ""
+#~ msgid "Geary will exit if you have no other open email accounts."
+#~ msgstr ""
+#~ "Сізде басқа ашық эл. пошта тіркелгілері жоқ болса, Geary өз жұмысын "
+#~ "аяқтайды."
 
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "Баптаулар"
+#~ msgid "Open"
+#~ msgstr "Ашу"
 
-#: ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Бұл тіркелгіні өшіруді шынымен "
-"қалайсыз ба?</span> "
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%H:%M"
 
-#: ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"Бұл тіркелгімен байланысқан барлық эл. пошта хаттары компьютеріңізден "
-"өшірілетін болады. Бірақ, сервердегі хаттарға әсері болмайды."
+#~ msgid "%x"
+#~ msgstr "%x"
 
-#: ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "Ник:"
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
 
-#: ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "Эл. пошта адресі:"
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary жаңартуы жүруде…"
+#~ msgid "Other"
+#~ msgstr "Басқа"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Жіберілген хаттар"
+
+#~ msgid "Spam"
+#~ msgstr "Спам"
+
+#~ msgid "From: %s\n"
+#~ msgstr "Кімнен: %s\n"
+
+#~ msgid "Subject: %s\n"
+#~ msgstr "Тақырып: %s\n"
+
+#~ msgid "Date: %s\n"
+#~ msgstr "Күні: %s\n"
+
+#~ msgid "To: %s\n"
+#~ msgstr "Кімге: %s\n"
+
+#~ msgid "Cc: %s\n"
+#~ msgstr "Көшірмесі: %s\n"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Тіркелгіні өшіру мүмкін емес</span> "
+
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "Бұл тіркелгімен сәйкестелген жаңа хатты жазу терезесі ашық болып тұр. "
+#~ "Хатты жіберіңіз не елемеңіз, одан кейін қайталап көріңіз."
+
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "Geary тіркелгіңізді тексеріп болғанша дейін күте тұрыңыз."
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Бөліп жіберу (Ctrl+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Файлды қосып жіберу"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Жіберу (Ctrl+Enter)"
+
+#~ msgid "Open this link"
+#~ msgstr "Бұл сілтемені ашу"
+
+#~ msgid "C_olor"
+#~ msgstr "_Түсі"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Кеңейтілген өрістерді көрсету"
+
+#~ msgid "From"
+#~ msgstr "Кімнен"
+
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Соңғы түзетуді қайталау (Ctrl+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Жуан (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Көлбеу (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Асты сызылған (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Сызып тастау (Ctrl+K)"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Мәтінді дәйексөз қылу (Ctrl+])"
+
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Мәтінді дәйексөз емес қылу (Ctrl+[)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Таңдалғанның пішімдеуін өшіру (Ctrl+Space)"
+
+#~ msgid "Display the message menu"
+#~ msgstr "Хабарлама мәзірін көрсету"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Шимайды түзету"
+
+#~ msgid "_Trash"
+#~ msgstr "Қ_оқыс шелегі"
+
+#~ msgid "Send New _Message…"
+#~ msgstr "Жаңа _хатты жіберу…"
+
+#~ msgid "Search for messages from"
+#~ msgstr "Келесіден хабарламаларды іздеу:"
+
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "Кейбір эл. пошта қызметтері серверде қосымша адрестердің бапталуын талап "
+#~ "етеді. Көбірек білу үшін өз эл. пошта ұсынушысыңызға хабарласыңыз."
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move focus to conversation list"
+#~ msgstr "Фокусты сөйлесулер тізіміне жылжыту"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "Іздеу жолағына өту"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "Жаңа хатты жазу"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "Архивтек"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "Сөйлесуді жылжыту"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "Оқылмаған етіп белгілеу"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "Жұлдызшаны алып тастау"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "Өшіру"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "Келесі (ескілеу) сөйлесуге өту"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "Алдыңғы (жаңалау) сөйлесуге өту"
+
+#~ msgid "A_ccounts"
+#~ msgstr "_Тіркелгілер"
+
+#~ msgid "E_mail address"
+#~ msgstr "Эл. _пошта адресі"
+
+#~ msgid "_Password"
+#~ msgstr "_Пароль"
+
+#~ msgid "S_ervice"
+#~ msgstr "Қ_ызмет"
+
+#~ msgid "N_ame"
+#~ msgstr "А_ты"
+
+#~ msgid "N_ickname"
+#~ msgstr "Н_ик аты"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "Үй, Жұмыс, т.с.с."
+
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "Қосы_мша эл. пошта адрестері…"
+
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP баптаулары"
+
+#~ msgid "Se_rver"
+#~ msgstr "Се_рвер"
+
+#~ msgid "P_ort"
+#~ msgstr "_Порт"
+
+#~ msgid "Ser_ver"
+#~ msgstr "Сер_вер"
+
+#~ msgid "Por_t"
+#~ msgstr "Пор_т"
+
+#~ msgid "User_name"
+#~ msgstr "Па_йдаланушы аты"
+
+#~ msgid "Pass_word"
+#~ msgstr "Пар_оль"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP паролі"
+
+#~ msgid "_Username"
+#~ msgstr "_Пайдаланушы аты"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP паролі"
+
+#~ msgid "Encr_yption"
+#~ msgstr "_Шифрлеу"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "Ш_ифрлеу"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "Аутентификация керек е_мес"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "IMAP тіркелгі _деректерін қолдану"
+
+#~ msgid "Composer"
+#~ msgstr "Хатты жазу терезесі"
+
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "Эл. пошта хаттарына қол_таңбаны қою (HTML рұқсат етілген):"
+
+#~ msgid "Storage"
+#~ msgstr "Сақтау құрылғылары"
+
+#~ msgid "Empty Spam or Trash folders"
+#~ msgstr "Спам немесе Қоқыс шелегі бумаларын босату"
+
+#~ msgid "Empty _Spam…"
+#~ msgstr "_Спам бумасын босату…"
+
+#~ msgid "Empty _Trash…"
+#~ msgstr "Қ_оқыс шелегін босату…"
+
+#~ msgid "Mark as S_pam"
+#~ msgstr "С_пам етіп белгілеу"
+
+#~ msgid "Mark as not S_pam"
+#~ msgstr "С_пам емес етіп белгілеу"
+
+#~ msgid "Reading"
+#~ msgstr "Оқу"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "Хабарлау дыбы_старын ойнату"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "Жаңа хаттар үшін _хабарламаларды көрсету"
+
+#~ 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 "Geary Email"
 #~ msgstr "Geary поштасы"
@@ -3055,9 +4241,6 @@ msgstr "Geary жаңартуы жүруде…"
 #~ msgid "Geary Mail"
 #~ msgstr "Geary поштасы"
 
-#~ msgid "Send files using Geary"
-#~ msgstr "Файлдарды Geary көмегімен жіберу"
-
 #~ msgid "_Mark as…"
 #~ msgstr "Қалайша _белгілеу…"
 
@@ -3095,9 +4278,6 @@ msgstr "Geary жаңартуы жүруде…"
 #~ msgid "Geary will run in the background and notify of new mail"
 #~ msgstr "Geary фонда орындалып, жаңа түскен хаттар жөнінде хабарлайды"
 
-#~ msgid "Empty"
-#~ msgstr "Босату"
-
 #~ msgid "%i match"
 #~ msgid_plural "%i matches"
 #~ msgstr[0] "%i сәйкестік"
@@ -3106,18 +4286,9 @@ msgstr "Geary жаңартуы жүруде…"
 #~ msgid_plural "%i matches (wrapped)"
 #~ msgstr[0] "%i сәйкестік (тасымалданған)"
 
-#~ msgid "not found"
-#~ msgstr "табылмады"
-
 #~ msgid "No search results found."
 #~ msgstr "Іздеу нәтижелері жоқ."
 
-#~ msgid "From:"
-#~ msgstr "Кімнен:"
-
-#~ msgid "Date:"
-#~ msgstr "Күні:"
-
 #~ msgid "Copy _Link"
 #~ msgstr "_Сілтемені көшіріп алу"
 
@@ -3127,9 +4298,6 @@ msgstr "Geary жаңартуы жүруде…"
 #~ msgid " (Invalid?)"
 #~ msgstr " (Жарамсыз?)"
 
-#~ msgid "_Save As..."
-#~ msgstr "Қала_йша сақтау..."
-
 #~ msgid "Save A_ttachment..."
 #~ msgid_plural "Save All A_ttachments..."
 #~ msgstr[0] "Салы_нымдарды сақтау..."
@@ -3152,9 +4320,6 @@ msgstr "Geary жаңартуы жүруде…"
 #~ msgid "Link (Ctrl+L)"
 #~ msgstr "Сілтеме (Ctrl+L)"
 
-#~ msgid "More options"
-#~ msgstr "Көбірек опциялар"
-
 #~ msgctxt "Label"
 #~ msgid "Close and Save"
 #~ msgstr "Жабу және сақтау"
@@ -3188,21 +4353,9 @@ msgstr "Geary жаңартуы жүруде…"
 #~ msgid "Small"
 #~ msgstr "Кішкентай"
 
-#~ msgid "Sans Serif"
-#~ msgstr "Sans Serif"
-
-#~ msgid "Serif"
-#~ msgstr "Serif"
-
-#~ msgid "Fixed Width"
-#~ msgstr "Бекітілген ені"
-
 #~ msgid "_Attach File"
 #~ msgstr "Ф_айлды қосып жіберу"
 
-#~ msgid "Attach File"
-#~ msgstr "Файлды қосып жіберу"
-
 #~ msgid "_Include Original Attachments"
 #~ msgstr "Бастапқы салынымдарды қ_осып жіберу"
 


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