[geary] Update Basque translation



commit c9db1f1a678573d4584b247df82411593bb162ec
Author: Asier Sarasua Garmendia <asier sarasua gmail com>
Date:   Thu Apr 9 15:55:36 2020 +0000

    Update Basque translation

 po/eu.po | 2330 ++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 1369 insertions(+), 961 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 8e434f7e..338fe218 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,13 +5,13 @@
 #
 # Translators:
 # Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2014.
-# Asier Sarasua Garmendia <asier sarasua gmail com>, 2019.
+# Asier Sarasua Garmendia <asier sarasua gmail com>, 2019, 2020.
 #
 msgid ""
 msgstr "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-10-06 13:46+0000\n"
-"PO-Revision-Date: 2019-10-20 10:00+0100\n"
+"POT-Creation-Date: 2020-03-31 15:07+0000\n"
+"PO-Revision-Date: 2020-04-09 10:00+0100\n"
 "Last-Translator: Asier Sarasua Garmendia <asier sarasua gmail com>\n"
 "Language-Team: Basque <librezale librezale eus>\n"
 "Language: eu\n"
@@ -34,6 +34,7 @@ msgstr "Bidali fitxategiak Geary erabilita"
 #: 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"
 
@@ -46,7 +47,7 @@ msgstr "Posta elektronikoa"
 #: desktop/geary-autostart.desktop.in.in:5
 #: desktop/org.gnome.Geary.appdata.xml.in.in:16
 #: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/geary-application.vala:31
+#: src/client/application/application-client.vala:32
 msgid "Send and receive email"
 msgstr "Bidali eta jaso mezuak"
 
@@ -120,6 +121,10 @@ msgstr "Posta;Posta elektronikoa;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr "Leiho berria"
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "Maximizatu leihoa"
@@ -150,7 +155,7 @@ msgstr "Karpeta-zerrendaren panelaren posizioa"
 
 #: desktop/org.gnome.Geary.gschema.xml:27
 msgid "Position of the folder list Paned grabber."
-msgstr ""
+msgstr "Karpeta-zerrendaren panelaren heldulekuaren posizioa."
 
 #: desktop/org.gnome.Geary.gschema.xml:32
 msgid "Position of folder list pane when horizontal"
@@ -159,7 +164,7 @@ msgstr "Karpeta-zerrendaren panelaren posizioa horizontalean"
 #: desktop/org.gnome.Geary.gschema.xml:33
 msgid ""
 "Position of the folder list Paned grabber in the horizontal orientation."
-msgstr ""
+msgstr "Karpeta-zerrendaren panelaren heldulekuaren posizioa orientazio horizontalean."
 
 #: desktop/org.gnome.Geary.gschema.xml:38
 msgid "Position of folder list pane when vertical"
@@ -167,7 +172,7 @@ msgstr "Karpeta-zerrendaren panelaren posizioa bertikalean"
 
 #: desktop/org.gnome.Geary.gschema.xml:39
 msgid "Position of the folder list Paned grabber in the vertical orientation."
-msgstr ""
+msgstr "Karpeta-zerrendaren panelaren heldulekuaren posizioa orientazio bertikalean."
 
 #: desktop/org.gnome.Geary.gschema.xml:44
 msgid "Orientation of the folder list pane"
@@ -178,103 +183,149 @@ msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr "Egia karpeta-zerrendaren panela orientazio horizontalean badago."
 
 #: desktop/org.gnome.Geary.gschema.xml:50
+msgid "Show/hide formatting toolbar"
+msgstr "Erakutsi/ezkutatu formatuaren tresna-barra"
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "True if the formatting toolbar in the composer is shown."
+msgstr "Egia konposatzailean formatuaren tresna-barra erakusten bada."
+
+#: desktop/org.gnome.Geary.gschema.xml:56
 msgid "Position of message list pane"
 msgstr "Mezu-zerrendaren panelaren posizioa"
 
-#: desktop/org.gnome.Geary.gschema.xml:51
+#: desktop/org.gnome.Geary.gschema.xml:57
 msgid "Position of the message list Paned grabber."
-msgstr ""
+msgstr "Mezu-zerrendaren panelaren heldulekuaren posizioa."
 
-#: desktop/org.gnome.Geary.gschema.xml:56
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "Hautatu automatikoki hurrengo mezua"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr "Egia hurrengo berriketa eskuragarria automatikoki hautatzeko."
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "Bistaratu mezuen aurrebistak"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr "Egia mezu bakoitzaren aurrebista laburra bistaratzeko."
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Use single key shortcuts"
+msgstr "Erabili tekla bakarreko lasterbideak"
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr "<Ctrl> sakatzea behar ez duten lasterbideak gaitzen ditu posta-ekintzetarako, Gmail-ek erabiltzen 
dituenak emulatzeko."
+
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "Ortografia-egiaztatzailean erabiliko diren hizkuntzak"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: 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 ""
+msgstr "POSIX hizkuntzen zerrenda bat, zerrenda hutsak ortografia egiaztatzea desgaitzen du eta zerrenda 
nuluak mahaigainaren hizkuntza lehenetsia erabiltzen du."
 
-#: desktop/org.gnome.Geary.gschema.xml:76
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr "Ortografia-egiaztatzailearen bunbuiloan bistaratuko diren hizkuntzak"
 
-#: desktop/org.gnome.Geary.gschema.xml:77
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr "Ortografia-egiaztatzailearen bunbuiloan beti bistaratuko diren hizkuntzak"
 
-#: desktop/org.gnome.Geary.gschema.xml:82
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "Jakinarazi mezu berriak abioan"
 
-#: desktop/org.gnome.Geary.gschema.xml:83
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr "Egia abioan mezu berriak daudela jakinarazteko."
 
-#: desktop/org.gnome.Geary.gschema.xml:88
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "Galdetu eranskin bat irekitzean"
 
-#: desktop/org.gnome.Geary.gschema.xml:89
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "Egia eranskin bat irekitzean galdetzeko."
 
-#: desktop/org.gnome.Geary.gschema.xml:94
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "Mezuak HTML formatuan sortuko diren ala ez"
 
-#: desktop/org.gnome.Geary.gschema.xml:95
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "Egia posta-mezuak HTML formatuan konposatzeko; faltsua testu soilerako."
 
-#: desktop/org.gnome.Geary.gschema.xml:100
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
-msgstr ""
+msgstr "Testu osoak bilatzeko gomendatzen den estrategia"
 
-#: desktop/org.gnome.Geary.gschema.xml:101
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
-msgstr ""
+msgstr "Balio onartuak: “exact” (zehatza), “conservative” (kontserbadorea), “aggressive” (erasokorra) eta 
“horizon” (zeruertza)."
 
-#: desktop/org.gnome.Geary.gschema.xml:106
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "Berriketa-ikustailearen zooma"
 
-#: desktop/org.gnome.Geary.gschema.xml:107
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr "Berriketa-ikustaileari aplikatuko zaion zooma."
 
-#: desktop/org.gnome.Geary.gschema.xml:112
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "Askatutako konposatzaile-leihoaren tamaina"
 
-#: desktop/org.gnome.Geary.gschema.xml:113
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr "Askatutako konposatzaile-leihoan erregistratu den azken tamaina."
 
-#: desktop/org.gnome.Geary.gschema.xml:118
+#: desktop/org.gnome.Geary.gschema.xml:132
+msgid "Undo sending email delay"
+msgstr "Desegin mezua bidaltzearen atzerapena"
+
+#: 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 "Mezu bat bidali baino lehen igaroko den segundo kopurua. Ezarri zero balioa desgaitzeko."
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr "Jakinarazpen laburren bistaratze-denbora"
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr "Jakinarazpen laburrak zenbat denbora bistaratuko diren, segundotan."
+
+#: desktop/org.gnome.Geary.gschema.xml:146
+msgid "List of optional plugins"
+msgstr "Aukerako pluginen zerrenda"
+
+#: desktop/org.gnome.Geary.gschema.xml:147
+msgid "Plugins listed here will be loaded on startup."
+msgstr "Hemen zerrendatutako pluginak abioan kargatuko dira."
+
+#: desktop/org.gnome.Geary.gschema.xml:152
 msgid "Whether we migrated the old settings"
 msgstr "Ezarpen zaharrak migratuko diren ala ez"
 
-#: desktop/org.gnome.Geary.gschema.xml:119
+#: desktop/org.gnome.Geary.gschema.xml:153
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr "Faltsua “org.yorba.geary”-eskema zaharra egiaztatzeko eta haren balioak kopiatzeko."
@@ -282,24 +333,24 @@ msgstr "Faltsua “org.yorba.geary”-eskema zaharra egiaztatzeko eta haren bali
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:204
+#: src/client/accounts/accounts-editor.vala:210
 msgid "Failed to store certificate"
 msgstr "Huts egin du ziurtagiria biltegiratzeak"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
 msgstr "Beste guztiak"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: 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 "Egiaztatu mezuak jasotzeko saio-hasiera eta pasahitza"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: 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 "Egiaztatu mezuak jasotzeko zerbitzari-xehetasunak"
@@ -309,51 +360,51 @@ msgstr "Egiaztatu mezuak jasotzeko zerbitzari-xehetasunak"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: 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 "Egiaztatu mezuak bidaltzeko saio-hasiera eta pasahitza"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: 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 "Egiaztatu mezuak bidaltzeko zerbitzari-xehetasunak"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
 msgstr "Egiaztatu zure saio-hasiera eta pasahitza"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
 msgstr "Ezin da konektatu, egiaztatu zure sarea"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
 msgid "An unexpected problem occurred"
 msgstr "Espero gabeko arazoa gertatu da"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
 msgid "Account not created: %s"
 msgstr "Kontua ez da sortu: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
 msgid "Your name"
 msgstr "Zure izena"
 
 #. 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:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
 msgid "Email address"
 msgstr "Helbide elektronikoa"
 
@@ -362,8 +413,8 @@ msgstr "Helbide elektronikoa"
 #. 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:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
 msgid "person example com"
 msgstr "pertsona abidibea com"
 
@@ -371,15 +422,15 @@ msgstr "pertsona abidibea com"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:884
 msgid "Login name"
 msgstr "Saioa hasteko izena"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: 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 "Pasahitza"
@@ -388,14 +439,14 @@ msgstr "Pasahitza"
 #. 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:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:728
 msgid "IMAP server"
 msgstr "IMAP zerbitzaria"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
 msgid "imap.example.com"
 msgstr "imap.adibidea.com"
 
@@ -403,20 +454,20 @@ msgstr "imap.adibidea.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:734
 msgid "SMTP server"
 msgstr "SMTP zerbitzaria"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
 msgid "smtp.example.com"
 msgstr "smtp.adibidea.com"
 
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
 #: ui/accounts_editor_remove_pane.ui:123
 msgid "Account name"
 msgstr "Kontuaren izena"
@@ -425,46 +476,46 @@ msgstr "Kontuaren izena"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "Aldatu kontuaren izena eta erabili berriro “%s”"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
 msgid "Add a new sender email address"
 msgstr "Gehitu bidaltzailearen posta-helbide berria"
 
 #. 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:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
 msgid "Name not set"
 msgstr "Izena ez da ezarri"
 
 #. 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:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
 msgstr "Bidaltzailearen izena"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
 msgstr "Kendu"
 
 #. 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:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
 msgid "Sender name"
 msgstr "Bidaltzailearen izena"
 
 #. 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:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
 msgid "Remove “%s”"
 msgstr "Kendu “%s”"
@@ -472,7 +523,7 @@ msgstr "Kendu “%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:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "Desegin aldaketak “%s” helbidean"
@@ -480,7 +531,7 @@ msgstr "Desegin aldaketak “%s” helbidean"
 #. 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:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
 #, c-format
 msgid "Add “%s” back"
 msgstr "Gehitu “%s” berriro"
@@ -488,14 +539,14 @@ msgstr "Gehitu “%s” berriro"
 #. 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:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
 msgstr "Desegin sinadura-aldaketak"
 
 #. 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:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
 msgid "Download mail"
 msgstr "Deskargatu mezuak"
 
@@ -504,99 +555,100 @@ msgstr "Deskargatu mezuak"
 #. 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:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "Aldatu deskarga-tartea berriro honetara: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
 msgstr "Dena"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2 aste atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "Hilabete 1 atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3 hilabete atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6 hilabete atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "Urte 1 atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2 urte atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4 urte atzera"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "Egun %d atzera"
 msgstr[1] "%d egun atzera"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:248
-#: src/client/application/application-controller.vala:2370
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2060
 msgid "Undo"
 msgstr "Desegin"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:257
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2043
 msgid "Redo"
 msgstr "Berregin"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:351
-#: src/client/accounts/accounts-editor-list-pane.vala:439
+#: 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/accounts-editor-list-pane.vala:355
-#: src/client/accounts/accounts-editor-list-pane.vala:443
+#: 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:359
-#: src/client/accounts/accounts-editor-list-pane.vala:447
+#: 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:377
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
 msgstr "Kontu hau desgaitu egin da"
 
 #. 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:386
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 msgid "This account has encountered a problem and is unavailable"
 msgstr "Kontu honetan arazo bat aurkitu da eta ez dago erabilgarri"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:436
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
 msgstr "Beste posta-hornitzaile batzuk"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:553
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "“%s” kontua kendu egin da"
@@ -604,7 +656,7 @@ msgstr "“%s” kontua kendu egin da"
 #. 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:560
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "“%s” kontua berrezarri egin da"
@@ -631,9 +683,8 @@ msgstr "Konezioaren segurtasuna"
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
 #: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
-#: src/engine/api/geary-special-folder-type.vala:58
+#: src/client/accounts/accounts-editor-servers-pane.vala:755
+#: src/client/accounts/accounts-editor-servers-pane.vala:970
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -648,8 +699,9 @@ msgstr "TLS"
 #. Translators: Label for source of SMTP authentication
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
-#. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
+#. Translators: An info bar button label
+#: src/client/accounts/accounts-editor-row.vala:534
+#: src/client/application/application-main-window.vala:544
 msgid "Login"
 msgstr "Saio-hasiera"
 
@@ -709,327 +761,186 @@ msgstr "Gorde bidalitako mezua zerbitzarian"
 #. 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:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:956
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s OAuth2 erabilita"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:966
 msgid "Use receiving server login"
-msgstr ""
+msgstr "Erabili jasotako zerbitzariaren saio-hasiera"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:59
+#: src/client/application/application-attachment-manager.vala:21
 msgid "Untitled"
 msgstr "Izengabea"
 
-#. / Notification title.
-#: src/client/application/application-controller.vala:532
-#, c-format
-msgid "A problem occurred sending email for %s"
-msgstr "Arazoa gertatu da mezua honetara bidaltzean: %s"
-
-#. / Notification body
-#: src/client/application/application-controller.vala:536
-msgid "Email will not be sent until re-connected"
-msgstr "Mezua ez da bidaliko berriro konektatu arte"
-
-#: src/client/application/application-controller.vala:887
-msgid "Labels"
-msgstr "Etiketak"
-
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: src/client/application/application-controller.vala:900
-#, c-format
-msgid "Unable to open the database for %s"
-msgstr "Ezin da '%s'(r)en datu-basea ireki"
-
-#: src/client/application/application-controller.vala:901
-#, 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. "
-"<b>The mail on the your server will not be affected.</b>"
-msgstr "Errorea gertatu da kontu honen lokaleko postaren datu-basea irekitzean. Baliteke datu-basearen 
fitxategia hondatuta egotea direktorio honetan:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary-k datu-basea berreraiki eta zerbitzariarekin berriro sinkroniza dezake, edo irten.\n"
-"\n"
-"Datu-basea berreraikitzean lokaleko mezu guztiak (beraien eranskinekin) ezabatzea dakar. <b>Zerbitzariko 
zure mezuak ez dute eraginik jasoko.</b>"
-
-#: src/client/application/application-controller.vala:903
-msgid "_Rebuild"
-msgstr "_Berreraiki"
-
-#: src/client/application/application-controller.vala:903
-msgid "E_xit"
-msgstr "I_rten"
-
-#: src/client/application/application-controller.vala:912
-#, c-format
-msgid "Unable to rebuild database for “%s”"
-msgstr "Ezin izan da datu-basea berreraiki honetarako: “%s”"
-
-#: src/client/application/application-controller.vala:913
-#, c-format
-msgid ""
-"Error during rebuild:\n"
-"\n"
-"%s"
-msgstr "Errorea berreraikitzean:\n"
-"\n"
-"%s"
-
-#: src/client/application/application-controller.vala:1703
-#, c-format
-msgid "Moved %d message to %s"
-msgid_plural "Moved %d messages to %s"
-msgstr[0] "Mezu %d lekuz aldatu da hona: %s"
-msgstr[1] "%d mezu lekuz aldatu dira hona: %s"
-
-#: src/client/application/application-controller.vala:1713
-msgid "Are you sure you want to open these attachments?"
-msgstr "Ziur zaude eranskin horiek ireki nahi dituzula?"
-
-#: src/client/application/application-controller.vala:1714
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
-msgstr "Eranskinek kalteak sor ditzakete sisteman irekitzen badira. Iturburu fidagarrietako fitxategiak 
bakarrik ireki."
-
-#: src/client/application/application-controller.vala:1715
-msgid "Don’t _ask me again"
-msgstr "_Ez galdetu berriro"
-
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/application-controller.vala:1838
+#. / 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' izeneko fitxategia badago lehendik. Ordeztea nahi duzu?"
 
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/application-controller.vala:1845
+#. / 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'(e)n badago fitxategia lehendik. Hau ordeztean bere eduki guztia gainidatziko da."
 
-#: src/client/application/application-controller.vala:1849
+#: src/client/application/application-attachment-manager.vala:236
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: src/client/application/application-controller.vala:2209
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "Hustu zure %s karpetako mezu guztiak?"
-
-#: src/client/application/application-controller.vala:2210
-msgid "This removes the email from Geary and your email server."
-msgstr "Honek posta kentzen du Geary-tik eta posta-zerbitzaritik."
-
-#: src/client/application/application-controller.vala:2211
-msgid "This cannot be undone."
-msgstr "Hau ezin da desegin."
-
-#: src/client/application/application-controller.vala:2212
-#, c-format
-msgid "Empty %s"
-msgstr "Hustu %s"
-
-#: src/client/application/application-controller.vala:2229
-#, c-format
-msgid "Error emptying %s"
-msgstr "Errorea %s hustean"
-
-#: src/client/application/application-controller.vala:2260
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "Mezu hau betirako ezabatzea nahi duzu?"
-msgstr[1] "Mezu hauek betirako ezabatzea nahi dituzu?"
-
-#: src/client/application/application-controller.vala:2262
-msgid "Delete"
-msgstr "Ezabatu"
-
-#: src/client/application/application-controller.vala:2276
-#, c-format
-msgid "Trashed %d message"
-msgid_plural "Trashed %d messages"
-msgstr[0] "Mezu %d zakarrontzira bota da"
-msgstr[1] "%d mezu zakarrontzira bota dira"
-
-#: src/client/application/application-controller.vala:2323
-#, c-format
-msgid "Archived %d message"
-msgid_plural "Archived %d messages"
-msgstr[0] "Mezu %d artxibatu egin da"
-msgstr[1] "%d mezu artxibatu egin dira"
-
-#. 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:2452
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "Mezua ongi bidali da %s helbidera."
-
-#: src/client/application/application-controller.vala:2531
-msgid "Failed to open default text editor."
-msgstr "Huts egin du testuaren editore lehenetsia irekitzean."
-
-#: src/client/application/geary-application.vala:32
+#: src/client/application/application-client.vala:33
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright-a © 2001-2014 Free Software Foundation, Inc."
 
-#: src/client/application/geary-application.vala:33
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 Geary garatzile-taldea."
+#: src/client/application/application-client.vala:34
+msgid "Copyright 2016-2020 Geary Development Team."
+msgstr "Copyright 2016-2020 Geary garapen-taldea."
 
-#: src/client/application/geary-application.vala:35
+#: src/client/application/application-client.vala:36
 msgid "Visit the Geary web site"
 msgstr "Bisitatu Geary-ren webgunea"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:110
+#: src/client/application/application-client.vala:97
 msgid "Print debug logging"
 msgstr "Inprimatu arazketa-egunkaria"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:113
+#: src/client/application/application-client.vala:100
 msgid "Start with the main window hidden (deprecated)"
 msgstr "Abiarazi leiho nagusia ezkutuan dela (zaharkitua)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:116
+#: src/client/application/application-client.vala:103
 msgid "Enable WebKitGTK Inspector in web views"
 msgstr "Gaitu WebKitGTK Inspector web bistetan"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:119
+#: src/client/application/application-client.vala:106
 msgid "Log conversation monitoring"
 msgstr "Erregistratu berriketaren monitorizazioa"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:122
+#: src/client/application/application-client.vala:109
 msgid "Log IMAP network deserialization"
 msgstr "Erregistratu IMAP sarearen deserializatzea"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
-#: src/client/application/geary-application.vala:126
+#: src/client/application/application-client.vala:113
 msgid "Log folder normalization"
 msgstr "Erregistratu karpetaren normalizazioa"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:129
+#: src/client/application/application-client.vala:116
 msgid "Log network activity"
 msgstr "Erregistratu sareko jarduera"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:132
+#: src/client/application/application-client.vala:119
 msgid "Log periodic activity"
 msgstr "Erregistratu aldiko jarduera"
 
 #. / Command line option. The IMAP replay queue is how changes
 #. / on the server are replicated on the client.  It could
 #. / also be called the IMAP events queue.
-#: src/client/application/geary-application.vala:137
+#: src/client/application/application-client.vala:124
 msgid "Log IMAP replay queue"
 msgstr "Erregistratu IMAP gertaeren ilara"
 
 #. / Command line option. Serialization is how commands and
 #. / responses are converted into a stream of bytes for
 #. / network transmission
-#: src/client/application/geary-application.vala:142
+#: src/client/application/application-client.vala:129
 msgid "Log IMAP network serialization"
 msgstr "Erregistratu IMAP sarearen serializatzea"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:145
+#: src/client/application/application-client.vala:132
 msgid "Log database queries (generates lots of messages)"
 msgstr "Erregistratu datu-basearen kontsultak (mezu ugari sortzen ditu)"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:148
+#: src/client/application/application-client.vala:135
 msgid "Perform a graceful quit"
-msgstr ""
+msgstr "Irten egokiro"
+
+#: src/client/application/application-client.vala:137
+msgid "Open a new window"
+msgstr "Ireki leiho berria"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:151
+#: src/client/application/application-client.vala:140
 msgid "Revoke all pinned TLS server certificates"
-msgstr ""
+msgstr "Errebokatu sastatutako TLS zerbitzari-ziurtagiri guztiak"
 
 #. / Command line option
-#: src/client/application/geary-application.vala:154
+#: src/client/application/application-client.vala:143
 msgid "Display program version"
 msgstr "Bistaratu programaren bertsioa"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:285
+#: src/client/application/application-client.vala:267
 msgid "Geary version"
 msgstr "Geary bertsioa"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:287
+#: src/client/application/application-client.vala:269
 msgid "Geary revision"
 msgstr "Geary berrikuspena"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:289
+#: src/client/application/application-client.vala:271
 msgid "GTK version"
 msgstr "GTK bertsioa"
 
 #. / Applciation runtime information label
-#: src/client/application/geary-application.vala:296
+#: src/client/application/application-client.vala:278
 msgid "GLib version"
 msgstr "GLib bertsioa"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:303
+#: src/client/application/application-client.vala:285
 msgid "WebKitGTK version"
 msgstr "WebKitGTK bertsioa"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:310
+#: src/client/application/application-client.vala:292
 msgid "Desktop environment"
 msgstr "Mahaigaineko ingurunea"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: src/client/application/geary-application.vala:312
-#: src/client/conversation-viewer/conversation-email.vala:159
+#: src/client/application/application-client.vala:294
+#: src/client/components/components-attachment-pane.vala:91
 msgid "Unknown"
 msgstr "Ezezaguna"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:342
+#: src/client/application/application-client.vala:324
 msgid "Distribution name"
 msgstr "Banaketaren izena"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:347
+#: src/client/application/application-client.vala:329
 msgid "Distribution release"
 msgstr "Banaketaren bertsioa"
 
 #. / Application runtime information label
-#: src/client/application/geary-application.vala:355
+#: src/client/application/application-client.vala:337
 msgid "Installation prefix"
 msgstr "Instalazio-aurrizkia"
 
-#: src/client/application/geary-application.vala:515
+#: src/client/application/application-client.vala:590
 #, c-format
 msgid "About %s"
 msgstr "%s aplikazioari buruz"
@@ -1037,133 +948,420 @@ msgstr "%s aplikazioari buruz"
 #. 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:519
+#: src/client/application/application-client.vala:594
 msgid "translator-credits"
 msgstr "Asier Sarasua Garmendia <asier sarasua gmail com>"
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/geary-application.vala:841
+#: src/client/application/application-client.vala:941
 msgid "The `--hidden` option is deprecated and will be removed in the future."
-msgstr ""
+msgstr "`--hidden` aukera zaharkituta dago eta kendu egingo da etorkizunean."
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/geary-application.vala:873
+#: src/client/application/application-client.vala:974
 #, c-format
 msgid "Unrecognised program argument: “%s”"
 msgstr "Programa-argumentu ezezaguna: “%s”"
 
-#: src/client/components/components-inspector.vala:68
-msgid "Inspector"
-msgstr "Ikuskatzailea"
+#. / Notification title.
+#: src/client/application/application-controller.vala:455
+#, c-format
+msgid "A problem occurred sending email for %s"
+msgstr "Arazoa gertatu da mezua honetara bidaltzean: %s"
 
-#. / Translators: Title for Inspector logs pane
-#. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:77
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:91
-msgid "Logs"
-msgstr "Egunkariak"
+#. / Notification body
+#: src/client/application/application-controller.vala:459
+msgid "Email will not be sent until re-connected"
+msgstr "Mezua ez da bidaliko berriro konektatu arte"
 
-#. / Translators: Title for Inspector system system information pane
-#. / Translators: Title for problem report system information
-#. / pane
-#: src/client/components/components-inspector.vala:81
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:94
-msgid "System"
-msgstr "Sistema"
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:565
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "Berriketa markatu da"
+msgstr[1] "Berriketak markatu dira"
+
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:571
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "Berriketari marka kendu zaio"
+msgstr[1] "Berriketei marka kendu zaie"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:597
+#: src/client/application/application-controller.vala:681
+#, c-format
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "Berriketa %s karpetara eraman da"
+msgstr[1] "Berriketak %s karpetara eraman dira"
+
+#. / 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:605
+#: src/client/application/application-controller.vala:627
+#, c-format
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "Berriketa %s karpetan leheneratu da"
+msgstr[1] "Berriketak %s karpetan leheneratu dira"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:648
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "Berriketa artxibatu da"
+msgstr[1] "Berriketak artxibatu dira"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:704
+#, c-format
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "Mezua %s karpetara leheneratu da"
+msgstr[1] "Mezuak %s karpetara leheneratu dira"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:725
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "Mezua artxibatu da"
+msgstr[1] "Mezuak artxibatu dira"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:760
+#, c-format
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "Mezua %s karpetara eraman da"
+msgstr[1] "Mezuak %s karpetara eraman dira"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:788
+#, c-format
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "Berriketari %s etiketa jarri zaio"
+msgstr[1] "Berriketei %s etiketa jarri zaie"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:796
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] "Berriketari %s etiketa kendu zaio"
+msgstr[1] "Berriketei %s etiketa kendu zaie"
 
-#. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:198
-#: src/client/components/components-inspector.vala:201
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:210
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:213
-#: ui/problem-details-dialog.ui:42
-msgid "Save As"
-msgstr "Gorde honela"
+#: src/client/application/application-controller.vala:1215
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr "Ezin da '%s'(r)en datu-basea ireki"
 
-#: src/client/components/components-inspector.vala:202
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
-#: ui/accounts_editor_servers_pane.ui:17
-msgid "Cancel"
-msgstr "Utzi"
+#: src/client/application/application-controller.vala:1216
+#, 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. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr "Errorea gertatu da kontu honen lokaleko postaren datu-basea irekitzean. Baliteke datu-basearen 
fitxategia hondatuta egotea direktorio honetan:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary-k datu-basea berreraiki eta zerbitzariarekin berriro sinkroniza dezake, edo irten.\n"
+"\n"
+"Datu-basea berreraikitzean lokaleko mezu guztiak (beraien eranskinekin) ezabatzea dakar. <b>Zerbitzariko 
zure mezuak ez dute eraginik jasoko.</b>"
 
-#. 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:378
-msgid "An email address is required"
-msgstr "Helbide elektroniko bat behar da"
+#: src/client/application/application-controller.vala:1218
+msgid "_Rebuild"
+msgstr "_Berreraiki"
 
-#. 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:382
-msgid "Not a valid email address"
-msgstr "Ez da baliozko helbide elektronikoa"
+#: src/client/application/application-controller.vala:1218
+msgid "E_xit"
+msgstr "I_rten"
 
-#. 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:428
-msgid "A server name is required"
-msgstr "Zerbitzari-izena behar da"
+#: src/client/application/application-controller.vala:1228
+#, c-format
+msgid "Unable to rebuild database for “%s”"
+msgstr "Ezin izan da datu-basea berreraiki honetarako: “%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:433
-msgid "Could not look up server name"
-msgstr ""
+#: src/client/application/application-controller.vala:1229
+#, c-format
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr "Errorea berreraikitzean:\n"
+"\n"
+"%s"
 
-#: src/client/components/main-toolbar.vala:139
-msgid "Mark conversation"
-msgid_plural "Mark conversations"
-msgstr[0] "Markatu berriketa"
-msgstr[1] "Markatu berriketak"
+#. / 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:1468
+#, c-format
+msgid "Email sent to %s"
+msgstr "Mezua %s helbidera bidali da"
 
-#: src/client/components/main-toolbar.vala:144
-msgid "Add label to conversation"
-msgid_plural "Add label to conversations"
-msgstr[0] "Gehitu etiketa berriketari"
-msgstr[1] "Gehitu etiketa berriketei"
+#. / 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:2564
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr "%s helbiderako mezua bidaltzeko ilaran jarri da"
 
-#: src/client/components/main-toolbar.vala:149
-msgid "Move conversation"
-msgid_plural "Move conversations"
-msgstr[0] "Aldatu berriketa lekuz"
-msgstr[1] "Aldatu berriketak lekuz"
+#. / 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:2628
+#, c-format
+msgid "Email to %s saved"
+msgstr "%s helbiderako mezua gorde da"
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2643
+#: src/client/application/application-controller.vala:2701
+msgid "Composer could not be restored"
+msgstr "Konposatzaile ezin izan da leheneratu"
+
+#. / 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:2686
+#, c-format
+msgid "Email to %s discarded"
+msgstr "%s helbiderako mezua baztertu da"
 
-#: src/client/components/main-toolbar.vala:154
-msgid "Archive conversation"
-msgid_plural "Archive conversations"
-msgstr[0] "Artxibatu berriketa"
-msgstr[1] "Artxibatu berriketak"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:530
+msgid "Working offline"
+msgstr "Lineaz kanpo lanean"
 
-#: src/client/components/main-toolbar.vala:163
-msgid "Move conversation to Trash"
-msgid_plural "Move conversations to Trash"
-msgstr[0] "Eraman berriketa zakarrontzira"
-msgstr[1] "Eraman berriketak zakarrontzira"
+#. 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 "Ezin izango duzu postarik bidali edo jaso berriro konektatu arte."
 
-#: src/client/components/main-toolbar.vala:171
-msgid "Delete conversation"
-msgid_plural "Delete conversations"
-msgstr[0] "Ezabatu berriketa"
-msgstr[1] "Ezabatu berriketak"
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:539
+msgid "Login problem"
+msgstr "Arazoa saioa hastean"
+
+#. 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 "Kontu batek saio-haste edo pasahitz oker baten berri eman du."
+
+#. 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 "Saiatu berriro saioa hasten, pasahitza eskatuko zaizu."
+
+#. Translators: An info bar status label
+#: src/client/application/application-main-window.vala:554
+msgid "Security problem"
+msgstr "Segurtasun-arazoa"
+
+#. Translators: An info bar description label
+#: src/client/application/application-main-window.vala:556
+msgid "An account has reported an untrusted server.."
+msgstr "Kontu batek fidagarria ez den zerbitzari baten berri eman du."
+
+#. Translators: An info bar button label
+#: src/client/application/application-main-window.vala:559
+msgid "Check"
+msgstr "Egiaztatu"
+
+#. Translators: An info bar button tool-tip
+#: src/client/application/application-main-window.vala:562
+msgid "Check the security details for the connection"
+msgstr "Egiaztatu konexioaren segurtasun-xehetasunak"
+
+#. / 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"
+
+#: src/client/application/application-main-window.vala:991
+msgid "Labels"
+msgstr "Etiketak"
+
+#: src/client/application/application-main-window.vala:1290
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "Hustu zure %s karpetako mezu guztiak?"
 
-#: src/client/components/main-window.vala:738
+#: src/client/application/application-main-window.vala:1291
+msgid "This removes the email from Geary and your email server."
+msgstr "Horrek posta Geary-tik eta posta-zerbitzaritik kenduko du."
+
+#: src/client/application/application-main-window.vala:1292
+msgid "This cannot be undone."
+msgstr "Hau ezin da desegin."
+
+#: src/client/application/application-main-window.vala:1293
+#, c-format
+msgid "Empty %s"
+msgstr "Hustu %s"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1350
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "Berriketa hau betiko ezabatu nahi dituzu?"
+msgstr[1] "Berriketa hauek betiko ezabatu nahi dituzu?"
+
+#: src/client/application/application-main-window.vala:1355
+#: src/client/application/application-main-window.vala:1370
+msgid "Delete"
+msgstr "Ezabatu"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1365
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "Mezu hau betirako ezabatzea nahi duzu?"
+msgstr[1] "Mezu hauek betirako ezabatzea nahi dituzu?"
+
+#: src/client/application/application-main-window.vala:1698
 #, c-format
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
+#. 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:1839
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
+msgid "Are you sure you want to open these attachments?"
+msgstr "Ziur zaude eranskin horiek ireki nahi dituzula?"
+
+#: 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 "Eranskinek kalteak sor ditzakete sisteman irekitzen badira. Iturburu fidagarrietako fitxategiak 
bakarrik ireki."
+
+#: src/client/components/components-attachment-pane.vala:381
+msgid "Don’t _ask me again"
+msgstr "_Ez galdetu berriro"
+
+#: src/client/components/components-inspector.vala:72
+msgid "Inspector"
+msgstr "Ikuskatzailea"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:87
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
+msgid "Logs"
+msgstr "Egunkariak"
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:91
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
+msgid "System"
+msgstr "Sistema"
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:208
+#: src/client/components/components-inspector.vala:211
+#: 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 "Gorde honela"
+
+#: src/client/components/components-inspector.vala:212
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "Utzi"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:52
+msgid "_Automatically select next message"
+msgstr "Hautatu _automatikoki hurrengo mezua"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:62
+msgid "_Display conversation preview"
+msgstr "_Bistaratu berriketaren aurrebista"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:72
+msgid "Use _three pane view"
+msgstr "Erabili _hiru paneleko bista"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:82
+msgid "Use _single key email shortcuts"
+msgstr "Erabili _tekla bakarreko lasterbideak"
+
+#: src/client/components/components-preferences-window.vala:84
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr "Gaitu <Ctrl> sakatzea behar ez duten lasterbideak posta-ekintzetarako"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:95
+msgid "_Watch for new mail when closed"
+msgstr "_Zaindu posta berririk iritsi den aplikazioa itxitakoan"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:99
+msgid "Geary will keep running after all windows are closed"
+msgstr "Geary-k abian jarraituko du leiho guztiak itxi ondoren"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:117
+msgid "Preferences"
+msgstr "Hobespenak"
+
+#. / Translators: Preferences page title
+#: src/client/components/components-preferences-window.vala:179
+msgid "Plugins"
+msgstr "Pluginak"
+
 #. Translators: Info bar title for a generic account
 #. problem.
-#: src/client/components/main-window-info-bar.vala:44
+#: src/client/components/components-problem-report-info-bar.vala:36
 msgid "Account problem"
 msgstr "Kontu-arazoa"
 
 #. Translators: Info bar sub-title for a generic account
 #. problem. String substitution is the account name.
-#: src/client/components/main-window-info-bar.vala:48
+#: src/client/components/components-problem-report-info-bar.vala:40
 #, c-format
 msgid "Geary has encountered a problem with %s."
 msgstr "Geary-k arazoa aurkitu du %s kontuarekin."
@@ -1171,81 +1369,141 @@ msgstr "Geary-k arazoa aurkitu du %s kontuarekin."
 #. Translators: Info bar sub-title for a generic
 #. account problem. String substitution is the
 #. account name.
-#: src/client/components/main-window-info-bar.vala:61
+#: src/client/components/components-problem-report-info-bar.vala:53
 #, c-format
 msgid "Geary encountered a problem checking mail for %s."
 msgstr "Geary-k arazoa aurkitu du %s kontuaren mezuak begiratzean."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:65
+#: src/client/components/components-problem-report-info-bar.vala:57
 msgid "Try reconnecting"
 msgstr "Saiatu berriro konektatzen"
 
 #. Translators: Info bar title for an outgoing
 #. account problem. String substitution is the
 #. account name
-#: src/client/components/main-window-info-bar.vala:73
+#: src/client/components/components-problem-report-info-bar.vala:65
 #, c-format
 msgid "Geary encountered a problem sending email for %s."
 msgstr "Geary-k arazoa aurkitu du %s kontuaren mezuak bidaltzean."
 
 #. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:77
+#: src/client/components/components-problem-report-info-bar.vala:69
 msgid "Retry sending queued messages"
 msgstr "Saiatu berriro ilaran dauden mezuak bidaltzen"
 
 #. Translators: Info bar title for a generic application
 #. problem.
-#: src/client/components/main-window-info-bar.vala:84
+#: src/client/components/components-problem-report-info-bar.vala:76
 msgid "Geary has encountered a problem"
 msgstr "Geary-k arazo bat aurkitu du"
 
 #. Translators: Info bar sub-title for a generic
 #. application problem.
-#: src/client/components/main-window-info-bar.vala:88
+#: src/client/components/components-problem-report-info-bar.vala:80
 msgid "Please report the details if it persists."
 msgstr "Eman xehetasunen berri arazoak jarraitzen badu"
 
 #. Translators: Button label for viewing technical details
 #. for a problem report.
-#: src/client/components/main-window-info-bar.vala:99
+#: src/client/components/components-problem-report-info-bar.vala:94
 msgid "_Details"
 msgstr "_Xehetasunak"
 
 #. Translators: Tooltip for viewing technical details for
 #. a problem report.
-#: src/client/components/main-window-info-bar.vala:102
+#: src/client/components/components-problem-report-info-bar.vala:97
 msgid "View technical details about the error"
 msgstr "Begiratu errorearen xehetasun teknikoak"
 
 #. Translators: Button label for retrying a server
 #. connection
-#: src/client/components/main-window-info-bar.vala:108
+#: src/client/components/components-problem-report-info-bar.vala:103
 msgid "_Retry"
 msgstr "S_aiatu berriro"
 
-#: 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
+#. / 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 "Bilatu"
 
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "Bilatu kontuaren mezu guztietan gako-hitzak (Ctrl+S)"
-
-#: src/client/components/search-bar.vala:83
-#, c-format
-msgid "Indexing %s account"
-msgstr "'%s' kontua indexatzen"
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+msgid "Search all mail in account for keywords"
+msgstr "Bilatu gako-hitzak kontuaren mezu guztietan"
 
-#: src/client/components/search-bar.vala:110
-#: src/client/folder-list/folder-list-search-branch.vala:39
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
 #, c-format
 msgid "Search %s account"
 msgstr "Bilatu '%s' kontua"
 
+#. 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 "An email address is required"
+msgstr "Helbide elektroniko bat behar da"
+
+#. 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 "Not a valid email address"
+msgstr "Ez da baliozko helbide elektronikoa"
+
+#. 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 "Zerbitzari-izena behar da"
+
+#. 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 "Ezin izan da zerbitzari-izena kontsultatu"
+
+#: src/client/components/main-toolbar.vala:116
+msgid "Mark conversation"
+msgid_plural "Mark conversations"
+msgstr[0] "Markatu berriketa"
+msgstr[1] "Markatu berriketak"
+
+#: src/client/components/main-toolbar.vala:121
+msgid "Add label to conversation"
+msgid_plural "Add label to conversations"
+msgstr[0] "Gehitu etiketa berriketari"
+msgstr[1] "Gehitu etiketa berriketei"
+
+#: src/client/components/main-toolbar.vala:126
+msgid "Move conversation"
+msgid_plural "Move conversations"
+msgstr[0] "Aldatu berriketa lekuz"
+msgstr[1] "Aldatu berriketak lekuz"
+
+#: src/client/components/main-toolbar.vala:131
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
+msgstr[0] "Artxibatu berriketa"
+msgstr[1] "Artxibatu berriketak"
+
+#: src/client/components/main-toolbar.vala:142
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "Eraman berriketa zakarrontzira"
+msgstr[1] "Eraman berriketak zakarrontzira"
+
+#: src/client/components/main-toolbar.vala:152
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "Ezabatu berriketa"
+msgstr[1] "Ezabatu berriketak"
+
 #. / 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…"
@@ -1286,15 +1544,15 @@ msgstr "It_xi"
 msgid "_Discard"
 msgstr "_Baztertu"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:42
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: 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 "_Ireki"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:32
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
@@ -1311,7 +1569,8 @@ msgstr "I_rten"
 msgid "_Remove"
 msgstr "_Kendu"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "_Gorde"
 
@@ -1319,141 +1578,137 @@ msgstr "_Gorde"
 msgid "_Keep"
 msgstr "_Mantendu"
 
-#: 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 "Estekako URLak ez du formatu zuzena, adibidez http://adibidea.com";
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "Estekako URL baliogabea"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "Posta-helbide baliogabea"
 
-#: src/client/composer/composer-widget.vala:156
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:30
+msgid "New Message"
+msgstr "Mezu berria"
+
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "Gordeta"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "Gordetzen"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "Errorea gordetzean"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Sakatu atzerako tekla aipamena ezabatzeko"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:168
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:236
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
-msgstr ""
+msgstr "erantsi|eransten|erantsita|eranskina|eranskinak|atxiki|atxikita|atxikipena|atxikitzea|atxikimendua"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1181
+#: src/client/composer/composer-widget.vala:843
 msgid "Do you want to keep or discard this draft message?"
 msgstr "Zirriborro-mezua mantendu ala baztertu nahi duzu?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1211
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "Zirriborro-mezua baztertu nahi duzu?"
 
-#: src/client/composer/composer-widget.vala:1330
+#: src/client/composer/composer-widget.vala:1508
 msgid "Send message with an empty subject and body?"
 msgstr "Bidali gairik eta gorputzik gabeko mezua?"
 
-#: src/client/composer/composer-widget.vala:1332
+#: src/client/composer/composer-widget.vala:1510
 msgid "Send message with an empty subject?"
 msgstr "Bidali gairik gabeko mezua?"
 
-#: src/client/composer/composer-widget.vala:1334
+#: src/client/composer/composer-widget.vala:1512
 msgid "Send message with an empty body?"
 msgstr "Bidali gorputzik gabeko mezua?"
 
-#: src/client/composer/composer-widget.vala:1338
+#: src/client/composer/composer-widget.vala:1521
 msgid "Send message without an attachment?"
 msgstr "Bidali eranskinik gabeko mezua?"
 
-#: src/client/composer/composer-widget.vala:1652
+#: src/client/composer/composer-widget.vala:1825
 #, c-format
 msgid "“%s” already attached for delivery."
-msgstr ""
+msgstr "“%s” dagoeneko erantsita dago bidalia izateko."
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1660
-#: src/client/conversation-viewer/conversation-email.vala:173
+#: src/client/composer/composer-widget.vala:1861
+#: src/client/composer/composer-widget.vala:1911
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "“%s” is an empty file."
+msgstr "“%s” fitxategi hutsa da."
 
-#: src/client/composer/composer-widget.vala:1697
+#: src/client/composer/composer-widget.vala:1899
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s” ez da aurkitu."
 
-#: src/client/composer/composer-widget.vala:1703
+#: src/client/composer/composer-widget.vala:1905
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s” karpeta bat da."
 
-#: src/client/composer/composer-widget.vala:1709
-#, c-format
-msgid "“%s” is an empty file."
-msgstr "“%s” fitxategi hutsa da."
-
-#: src/client/composer/composer-widget.vala:1722
+#: src/client/composer/composer-widget.vala:1924
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s” ezin izan da ireki irakurtzeko."
 
-#: src/client/composer/composer-widget.vala:1730
+#: src/client/composer/composer-widget.vala:1932
 msgid "Cannot add attachment"
 msgstr "Ezin da eranskina gehitu"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1787
-#: src/client/conversation-viewer/conversation-email.vala:976
-#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:1989
+#: src/client/conversation-viewer/conversation-email.vala:542
+#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "Hona:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1793
-#: src/client/conversation-viewer/conversation-email.vala:981
-#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:1995
+#: src/client/conversation-viewer/conversation-email.vala:547
+#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1799
-#: src/client/conversation-viewer/conversation-email.vala:986
+#: src/client/composer/composer-widget.vala:2001
+#: src/client/conversation-viewer/conversation-email.vala:552
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1805
+#: src/client/composer/composer-widget.vala:2007
 msgid "Reply-To: "
 msgstr "Erantzun honi: "
 
-#: src/client/composer/composer-widget.vala:1945
+#: src/client/composer/composer-widget.vala:2259
 msgid "Select Color"
 msgstr "Hautatu kolorea"
 
@@ -1462,41 +1717,31 @@ msgstr "Hautatu kolorea"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2137
+#: src/client/composer/composer-widget.vala:2445
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s %2$s bidez"
 
-#. Composer label (with mnemonic underscore) for the account selector
-#. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2192
-msgid "_From:"
-msgstr "H_emendik:"
-
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2472
+#: src/client/composer/composer-widget.vala:2802
 msgid "Images"
 msgstr "Irudiak"
 
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "Mezu berria"
-
-#: src/client/composer/spell-check-popover.vala:108
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "Kendu hizkuntza hau hobetsien zerrendatik"
 
-#: src/client/composer/spell-check-popover.vala:112
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "Gehitu hizkuntza hau hobetsien zerrendara"
 
-#: src/client/composer/spell-check-popover.vala:199
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "Bilatu hizkuntza gehiago"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:337
+#: src/client/conversation-list/conversation-list-view.vala:335
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "Eraman berriketa _zakarrontzira"
@@ -1509,38 +1754,38 @@ msgid_plural "_Delete conversations"
 msgstr[0] "_Ezabatu berriketa"
 msgstr[1] "_Ezabatu berriketak"
 
-#: src/client/conversation-list/conversation-list-view.vala:356
+#: src/client/conversation-list/conversation-list-view.vala:360
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "Markatu _irakurrita gisa"
 
-#: src/client/conversation-list/conversation-list-view.vala:359
+#: src/client/conversation-list/conversation-list-view.vala:368
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: src/client/conversation-list/conversation-list-view.vala:362
+#: src/client/conversation-list/conversation-list-view.vala:376
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "Ke_ndu izarra"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:383
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "_Izarra"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:367
+#: src/client/conversation-list/conversation-list-view.vala:392
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:398
 msgid "R_eply All"
 msgstr "Erantzun _denei"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:369
+#: src/client/conversation-list/conversation-list-view.vala:404
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "A_urrera"
@@ -1550,69 +1795,105 @@ msgid "Me"
 msgstr "Ni"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:971
-#: src/client/util/util-email.vala:207
+#: src/client/conversation-viewer/conversation-email.vala:537
+#: src/client/util/util-email.vala:226
 msgid "From:"
 msgstr "Nondik:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:991
-#: src/client/util/util-email.vala:212
+#: src/client/conversation-viewer/conversation-email.vala:557
+#: src/client/util/util-email.vala:231
 msgid "Date:"
 msgstr "Data:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1001
-#: src/client/util/util-email.vala:210
+#: src/client/conversation-viewer/conversation-email.vala:567
+#: src/client/util/util-email.vala:229
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: src/client/conversation-viewer/conversation-message.vala:129
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "Posta-helbide hori faltsua izan daiteke"
 
+#. 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 less"
+msgstr "Erakutsi gutxiago"
+
+#. 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 gehiago…"
+
 #. 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:447
+#: src/client/conversation-viewer/conversation-message.vala:529
 msgid "No sender"
 msgstr "Bidaltzailerik ez"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:839
+#: 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:959
+#: src/client/conversation-viewer/conversation-message.vala:1040
 msgid "Image"
 msgstr "Irudia"
 
+#. Translators: Info bar status message
+#: src/client/conversation-viewer/conversation-message.vala:1304
+msgid "Remote images not shown"
+msgstr "Urruneko irudiak ez dira erakutsi"
+
+#. Translators: Info bar description
+#: src/client/conversation-viewer/conversation-message.vala:1306
+msgid "Only show remote images from senders you trust."
+msgstr "Erakutsi fidagarriak diren bidaltzaileen urruneko irudiak soilik."
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1310
+msgid "Show"
+msgstr "Erakutsi"
+
+#. Translators: Info bar button label
+#: src/client/conversation-viewer/conversation-message.vala:1314
+msgid "Always show from sender"
+msgstr "Erakutsi beti bidaltzailetik"
+
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:82
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "Ez da berriketarik hautatu"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:86
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "Zerrendako berriketa bat hautatzen bada, hemen bistaratuko da"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "Berriketa anitz hautatu da"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:99
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "Ekintza bat aukeratzean, hautatutako berriketa guztiei aplikatuko zaie"
 
@@ -1620,20 +1901,20 @@ msgstr "Ekintza bat aukeratzean, hautatutako berriketa guztiei aplikatuko zaie"
 #. 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:108
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "Ez da berriketarik aurkitu"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:112
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "Karpeta honek ez du berriketarik"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:125
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "Zure bilaketak ez du emaitzarik eman, saiatu bilaketa-hitzak hobetzen"
 
@@ -1653,35 +1934,35 @@ msgstr "Konexio ez-fidagarria: %s"
 #: src/client/dialogs/certificate-warning-dialog.vala:38
 #, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
-msgstr ""
+msgstr "%s posta-zerbitzariak %s:%u(e)n duen nortasuna ezin izan da egiaztatu."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:48
 msgid ""
 "Selecting “Trust This Server” or “Always Trust This Server” may cause your "
 "username and password to be transmitted insecurely."
-msgstr ""
+msgstr "“Fidatu zerbitzari honetaz” edo “Fidatu beti zerbitzari honetaz” hautatzen bada, zure 
erabiltzaile-izena eta pasahitza segurua ez den moduan transmititzeko arriskua dago."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:56
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
-msgstr ""
+msgstr "“Ez fidatu zerbitzari honetaz” hautatzen bada, beharbada Geary-k ezin izango du zerbitzaria atzitu."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:58
 msgid "Geary will not add or update this email account."
-msgstr ""
+msgstr "Geary-k ez du posta-kontu hau gehituko edo eguneratuko."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:63
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
-msgstr ""
+msgstr "“Ez fidatu zerbitzari honetaz” hautatzen bada, Geary-k kontu hau atzitzeari utziko dio."
 
 #: 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."
-msgstr ""
+msgstr "Jarri harremanetan zure sistema-administratzailearekin edo zerbitzu-hornitzailearekin auzi horiei 
buruzko galderarik baduzu."
 
 #: src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server’s certificate is not signed by a known authority"
@@ -1714,7 +1995,7 @@ msgstr "Errorea gertatu da zerbitzariaren ziurtagiria prozesatzean"
 #. / 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:89
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
 #: ui/problem-details-dialog.ui:12
 msgid "Details"
 msgstr "Xehetasunak"
@@ -1727,7 +2008,7 @@ msgid "Geary requires your email password to continue"
 msgstr "Geary-k zure postaren pasahitza behar du jarraitzeko"
 
 #. Label displaying total number of email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:32
+#: src/client/folder-list/folder-list-folder-entry.vala:30
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -1735,7 +2016,7 @@ msgstr[0] "Mezu %d"
 msgstr[1] "%d mezu"
 
 #. / Label displaying number of unread email messages in a folder
-#: src/client/folder-list/folder-list-folder-entry.vala:39
+#: src/client/folder-list/folder-list-folder-entry.vala:37
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1745,7 +2026,7 @@ msgstr[1] "%d irakurri gabe"
 #. / 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
+#: src/client/folder-list/folder-list-folder-entry.vala:43
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
@@ -1754,50 +2035,147 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "Sarrera"
 
-#: 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] "Emaitza %d"
 msgstr[1] "%d emaitza"
 
-#. / Notification body text for new email when no other
-#. / new messages are already awaiting.
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:4
+msgid "Desktop Notifications"
+msgstr "Mahaigaineko jakinarazpenak"
+
+#: src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in:5
+msgid "Displays desktop notifications when new email is delivered"
+msgstr "Mahaigaineko jakinarazpenak bistaratzen ditu mezu berriak jaso direnean"
+
+#. / 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\n"
+"(%d other new message)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages)"
+msgstr[0] "%s\n"
+"(beste mezu berri %d)"
+msgstr[1] "%s\n"
+"(beste %d mezu berri)"
+
+#. / 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] "Mezu berri %d"
 msgstr[1] "%d mezu berri"
 
-#. / Notification body text for new email when
-#. / other new messages have already been notified
-#. / about
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
+#. / 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, mezu berri %d guztira"
 msgstr[1] "%s, %d mezu berri guztira"
 
-#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] "%1$s\n"
-"%3$s(r)en beste mezu berri %2$d"
-msgstr[1] "%1$s\n"
-"%3$s(r)en beste %2$d mezu berri"
+#. / Notification title when new messages have been
+#. / received
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:284
+msgid "New message"
+msgid_plural "New messages"
+msgstr[0] "Mezu berria"
+msgstr[1] "Mezu berriak"
+
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:4
+msgid "Folder Highlight"
+msgstr "Karpeta nabarmentzea"
+
+#: src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in:5
+msgid "Highlights folders that have newly delivered mail"
+msgstr "Mezu berriak jaso dituzten karpetak nabarmentzen ditu"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:4
+msgid "Messaging Menu"
+msgstr "Mezuen menua"
+
+#: src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in:5
+msgid "Displays Unity Messaging Menu notifications for new email"
+msgstr "Unity-ren mezuen menuaren jakinarazpenak bistaratzen ditu mezu berriak daudenean"
 
-#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#: src/client/plugin/messaging-menu/messaging-menu.vala:75
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — Mezu berriak"
 
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:4
+msgid "Notification Badge"
+msgstr "Jakinarazpenak"
+
+#: src/client/plugin/notification-badge/notification-badge.plugin.desktop.in:5
+msgid "Displays a dock badge showing the number of new messages"
+msgstr "Mezu berrien kopurua erakusten duen atrakatutako jakinarazpen bat bistaratzen du"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:4
+msgid "Sent Sound"
+msgstr "Soinua bidalitakoan"
+
+#: src/client/plugin/sent-sound/sent-sound.plugin.desktop.in:5
+msgid "Plays the desktop sent-mail sound when an email is sent"
+msgstr "Mahaigainak mezu bidalientzako duen soinua erreproduzitzen du mezu bat bidaltzen denean"
+
+#: src/client/plugin/special-folders/special-folders.plugin.desktop.in:4
+msgid "Special Folders"
+msgstr "Karpeta bereziak"
+
+#. Translators: Info bar button label for emptying
+#. trash/spam folders
+#: src/client/plugin/special-folders/special-folders.vala:140
+msgid "Empty"
+msgstr "Hutsa"
+
+#. Translators: Info bar status message for a draft email
+#: src/client/plugin/special-folders/special-folders.vala:152
+msgid "Draft message"
+msgstr "Mezu-zirriborroa"
+
+#. Translators: Info bar status description for a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:155
+msgid "This message has not yet been sent."
+msgstr "Mezu hau ez da oraindik bidali."
+
+#. Translators: Info bar button label for editing a draft
+#. email
+#: src/client/plugin/special-folders/special-folders.vala:160
+msgid "Edit"
+msgstr "Editatu"
+
+#. Translators: Info bar status message for an sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:171
+msgid "Message not saved"
+msgstr "Mezua ez da gorde"
+
+#. Translators: Info bar status description for a sent but
+#. unsaved email
+#: src/client/plugin/special-folders/special-folders.vala:174
+msgid "This message was sent, but has not been saved to your account."
+msgstr "Mezu hau bidali da, baina ez da gorde zure kontuan."
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -1884,23 +2262,23 @@ msgstr "%a, %b %-e, %Y, %H:%M"
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%a, %b %-e, %Y, %X"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:944
-msgid "(no subject)"
-msgstr "(gairik ez)"
+#: src/client/util/util-email.vala:38
+msgid "(No subject)"
+msgstr "(Gairik ez)"
 
-#. 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:116
+#. / 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:134
 msgid "(No recipients)"
 msgstr "(Hartzailerik ez)"
 
-#. 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:130
+#. / 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:146
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -1910,26 +2288,26 @@ msgstr[1] "%s eta beste %d"
 #. / 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:160
+#: src/client/util/util-email.vala:179
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr "%2$s(e)k %1$s(e)an idatzita:"
 
 #. / 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:167
+#: src/client/util/util-email.vala:186
 #, c-format
 msgid "%s wrote:"
 msgstr "'%s'(e)k idatzita:"
 
 #. / 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:173
+#: src/client/util/util-email.vala:192
 #, c-format
 msgid "On %s:"
 msgstr "%s(e)an:"
 
-#: src/client/util/util-email.vala:202
+#: src/client/util/util-email.vala:221
 msgid "---------- Forwarded message ----------"
 msgstr "---------- Birbidalitako mezua ----------"
 
@@ -1957,43 +2335,43 @@ msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: src/engine/api/geary-special-folder-type.vala:24
+#: src/client/util/util-i18n.vala:271
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
-#: src/engine/api/geary-special-folder-type.vala:27
+#: src/client/util/util-i18n.vala:274
 msgid "Drafts"
 msgstr "Zirriborroa"
 
-#: src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "Bidalita"
+#: src/client/util/util-i18n.vala:277
+msgid "Sent"
+msgstr "Bidalitakoak"
 
-#: src/engine/api/geary-special-folder-type.vala:33
+#: src/client/util/util-i18n.vala:280
 msgid "Starred"
 msgstr "Izarduna"
 
-#: src/engine/api/geary-special-folder-type.vala:36
+#: src/client/util/util-i18n.vala:283
 msgid "Important"
 msgstr "Garrantzitsua"
 
-#: src/engine/api/geary-special-folder-type.vala:39
+#: src/client/util/util-i18n.vala:286
 msgid "All Mail"
 msgstr "Posta guztiak"
 
-#: src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "Baztergarria"
+#: src/client/util/util-i18n.vala:289
+msgid "Junk"
+msgstr "Baztergarriak"
 
-#: src/engine/api/geary-special-folder-type.vala:45
+#: src/client/util/util-i18n.vala:292
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: src/engine/api/geary-special-folder-type.vala:48
+#: src/client/util/util-i18n.vala:295
 msgid "Outbox"
 msgstr "Irteerako ontzia"
 
-#: src/engine/api/geary-special-folder-type.vala:54
+#: src/client/util/util-i18n.vala:301
 msgid "Archive"
 msgstr "Artxiboa"
 
@@ -2010,7 +2388,7 @@ msgstr "Artxiboa"
 #. 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/search/imap-db-search-query.vala:73
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr "eranskina"
@@ -2023,7 +2401,7 @@ msgstr "eranskina"
 #. 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/search/imap-db-search-query.vala:82
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr "bcc"
@@ -2035,7 +2413,7 @@ msgstr "bcc"
 #. 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/search/imap-db-search-query.vala:90
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr "gorputza"
@@ -2048,7 +2426,7 @@ msgstr "gorputza"
 #. 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/search/imap-db-search-query.vala:99
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr "cc"
@@ -2061,7 +2439,7 @@ msgstr "cc"
 #. 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/search/imap-db-search-query.vala:108
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr "diskoa:"
@@ -2073,7 +2451,7 @@ msgstr "diskoa:"
 #. 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/search/imap-db-search-query.vala:116
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr "da"
@@ -2085,7 +2463,7 @@ msgstr "da"
 #. 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/search/imap-db-search-query.vala:124
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr "gaia"
@@ -2098,7 +2476,7 @@ msgstr "gaia"
 #. 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/search/imap-db-search-query.vala:133
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr "-"
@@ -2111,7 +2489,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/search/imap-db-search-query.vala:154
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr "ni"
@@ -2123,7 +2501,7 @@ msgstr "ni"
 #. 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/search/imap-db-search-query.vala:166
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr "ni"
@@ -2135,7 +2513,7 @@ msgstr "ni"
 #. 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/search/imap-db-search-query.vala:178
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr "irakurri"
@@ -2148,7 +2526,7 @@ msgstr "irakurri"
 #. 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/search/imap-db-search-query.vala:189
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr "starred"
@@ -2160,7 +2538,7 @@ msgstr "starred"
 #. 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/search/imap-db-search-query.vala:199
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr "irakurri gabe"
@@ -2169,7 +2547,7 @@ msgstr "irakurri gabe"
 #. 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:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:884
 msgid "Drafts | Draft"
 msgstr "Zirriborroak | Zirriborroa | Drafts | Draft"
 
@@ -2177,22 +2555,22 @@ msgstr "Zirriborroak | Zirriborroa | Drafts | Draft"
 #. 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:962
+#: src/engine/imap-engine/imap-engine-generic-account.vala:893
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "Bidalita | Posta bidalita | Mezua bidalita | 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:967
+#: src/engine/imap-engine/imap-engine-generic-account.vala:898
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "Bidalitako elementuak"
 
 #. 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:977
+#. 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:908
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2202,13 +2580,13 @@ msgstr "Baztergarria | Baztergarriak | Posta baztergarria | Mezu baztergarria |
 #. 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:987
+#: src/engine/imap-engine/imap-engine-generic-account.vala:918
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "Zakarrontzia | 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:992
+#: src/engine/imap-engine/imap-engine-generic-account.vala:923
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "Ezabatutako elementuak"
@@ -2217,10 +2595,24 @@ msgstr "Ezabatutako elementuak"
 #. 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:1002
+#: src/engine/imap-engine/imap-engine-generic-account.vala:933
 msgid "Archive | Archives"
 msgstr "Artxiboa | Artxiboak"
 
+#: src/engine/rfc822/rfc822-message.vala:461
+#, c-format
+msgid "Could not determine mime type for “%s”."
+msgstr "Ezin izan da “%s” elementuaren mime mota zehaztu."
+
+#: src/engine/rfc822/rfc822-message.vala:472
+#, c-format
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr "Ezin izan da “%s” mime motaren eduki mota zehaztu “%s” elementurako."
+
+#: src/engine/rfc822/rfc822-message.vala:1003
+msgid "(no subject)"
+msgstr "(gairik ez)"
+
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "Gehitu kontua"
@@ -2319,223 +2711,271 @@ msgstr "Fi_datu zerbitzari honetaz"
 msgid "_Don’t Trust This Server"
 msgstr "_Ez fidatu zerbitzari honetaz"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "Askatu (Ctrl+D)"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+msgid "Detach the composer from the window"
+msgstr "Askatu konposatzailea leihotik"
 
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "Erantsi fitxategia (Ctrl+T)"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "Barneratu jatorrizko eranskinak"
-
-#: ui/composer-headerbar.ui:202
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "_Bidali"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "Bidali (Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:230
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "Baztertu eta itxi"
 
-#: ui/composer-headerbar.ui:254
+#: ui/composer-headerbar.ui:186
 msgid "Save and Close"
 msgstr "Gorde eta itxi"
 
 #. 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 "Txertatu URL hau duen esteka berria"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+msgid "Add"
+msgstr "Gehitu"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "Estekaren URLa"
 
 #. 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 "Eguneratu esteka honen URLa"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+msgid "Update"
+msgstr "Eguneratu"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "Ezabatu esteka hau"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "Ireki esteka hau"
-
-#: 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 "_Zabalera finkoa"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "_Txikia"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "Ta_rtekoa"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "_Handia"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "_Kolorea"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "Testu a_beratsa"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "Erakutsi eremu hedatuak"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "_Desegin"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "_Berregin"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "_Ebaki"
 
-#: 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 "_Kopiatu"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "Itsatsi _formaturik gabe"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "Hautatu _dena"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "Ik_uskatu…"
 
+#. Geary account mail will be sent from
+#: ui/composer-widget.ui:60
+msgid "_From"
+msgstr "Nor_k"
+
 #. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
+#: ui/composer-widget.ui:130
 msgid "_To"
 msgstr "Nor_i"
 
-#: ui/composer-widget.ui:75
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr "Erakutsi 'Cc', 'Bcc' eta 'Erantzun honi' eremuak"
+
+#: ui/composer-widget.ui:219
 msgid "_Cc"
 msgstr "_Cc"
 
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "_Gaia"
-
-#: ui/composer-widget.ui:149
+#: ui/composer-widget.ui:267
 msgid "_Bcc"
 msgstr "_Bcc"
 
-#: ui/composer-widget.ui:179
+#: ui/composer-widget.ui:315
 msgid "_Reply-To"
 msgstr "_Erantzun honi"
 
-#. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
-msgid "From"
-msgstr "Nondik"
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "_Gaia"
 
-#: ui/composer-widget.ui:293
+#: ui/composer-widget.ui:445
 msgid "Drop files here"
 msgstr "Jaregin fitxategiak hemen"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:461
 msgid "To add them as attachments"
 msgstr "Eranskin gisa gehitzeko"
 
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "Desegin azken edizioa (Ctrl+Z)"
+#: ui/composer-widget.ui:602
+msgid "Bold text"
+msgstr "Testu lodia"
+
+#: ui/composer-widget.ui:626
+msgid "Italic text"
+msgstr "Testu etzana"
+
+#: ui/composer-widget.ui:650
+msgid "Underline text"
+msgstr "Testu azpimarratua"
+
+#: ui/composer-widget.ui:674
+msgid "Strikethrough text"
+msgstr "Testu marratua"
 
-#: ui/composer-widget.ui:377
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "Berregin azken edizioa (Ctrl+Shift+Z)"
+#: ui/composer-widget.ui:707
+msgid "Insert bulleted list"
+msgstr "Txertatu buletdun zerrenda"
 
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "Lodia (Ctrl+B)"
+#: ui/composer-widget.ui:731
+msgid "Insert numbered list"
+msgstr "Txertatu zenbakitutako zerrenda"
 
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "Etzana (Ctrl+I)"
+#: ui/composer-widget.ui:764
+msgid "Indent or quote text"
+msgstr "Koskatu edo aipatu testua"
 
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "Azpimarratua (Ctrl+U)"
+#: ui/composer-widget.ui:788
+msgid "Un-indent or unquote text"
+msgstr "Kendu koska edo aipua testuari"
 
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "Marratua (Ctrl+K)"
+#: ui/composer-widget.ui:817
+msgid "Remove text formatting"
+msgstr "Kendu testuaren formatua"
 
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "Txertatu ordenatu gabeko zerrenda"
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr "Aldatu letra-tipoa"
 
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "Txertatu zerrenda ordenatua"
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "Sans Serif"
 
-#: ui/composer-widget.ui:587
-msgid "Quote text  (Ctrl+])"
-msgstr "Jarri komatxoak testuari (Ctrl+])"
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "Serif"
 
-#: ui/composer-widget.ui:611
-msgid "Unquote text  (Ctrl+[)"
-msgstr "Kendu komatxoak testuari (Ctrl+[)"
+#: ui/composer-widget.ui:873
+msgid "Fixed Width"
+msgstr "Zabalera finkoa"
 
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "Txertatu edo eguneratu hautapenaren esteka (Ctrl+L)"
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr "Aldatu letra-kolorea"
 
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "Txertatu irudi bat (Ctrl+G)"
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+msgstr "Aldatu letra-tamaina"
 
-#: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "Kendu hautapenaren formatua (Ctrl+Space)"
+#: ui/composer-widget.ui:949
+msgid "Insert or update text link"
+msgstr "Txertatu edo eguneratu testuaren esteka"
 
-#: ui/composer-widget.ui:731
+#: ui/composer-widget.ui:973
+msgid "Insert an image"
+msgstr "Txertatu irudi bat"
+
+#: ui/composer-widget.ui:1015
+msgid "Undo last edit"
+msgstr "Desegin azken edizioa"
+
+#: ui/composer-widget.ui:1039
+msgid "Redo last edit"
+msgstr "Berregin azken edizioa"
+
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+msgid "Attach a file"
+msgstr "Erantsi fitxategi bat"
+
+#: ui/composer-widget.ui:1117
+msgid "Add original attachments"
+msgstr "Gehitu jatorrizko eranskinak"
+
+#: ui/composer-widget.ui:1162
+msgid "More options"
+msgstr "Aukera gehiago"
+
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr "Erakutsi formatuaren tresna-barra"
+
+#: ui/composer-widget.ui:1200
 msgid "Select spell checking languages"
 msgstr "Hautatu ortografia-egiaztapenaren hizkuntzak"
 
+#: 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 "_Zabalera finkoa"
+
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "_Txikia"
+
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "Ta_rtekoa"
+
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "_Handia"
+
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "Testu a_beratsa"
+
+#: ui/composer-widget.ui:1308
+msgid "_Plain Text"
+msgstr "_Testu soila"
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "Hautatu eranskin guztiak"
+
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "Gorde hautatutako eranskinak"
+
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "Ireki hautatutako eranskinak"
+
+#: ui/components-attachment-pane-menus.ui:17
+msgid "Save _All"
+msgstr "Gorde _dena"
+
 #: 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 ""
+msgstr "Arazoa larria edo iraunkorra bada, gorde xehetasun hauek eta bidali <a 
href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>posta-zerrendara</a> edo erantsi <a 
href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>akatsen jakinarazpen berri bati</a>."
 
 #: ui/components-inspector-error-view.ui:49
 msgid "Details:"
@@ -2622,42 +3062,6 @@ msgstr "Markatu mezu hau izar batekin"
 msgid "Mark this message as not starred"
 msgstr "Kendu mezu honi izarraren marka"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "Bistaratu mezuen menua"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "Ireki hautatutako eranskinak"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "Gorde hautatutako eranskinak"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "Hautatu eranskin guztiak"
-
-#: ui/conversation-email.ui:240
-msgid "Edit Draft"
-msgstr "Editatu zirriborroa"
-
-#: ui/conversation-email.ui:267
-msgid "Draft message"
-msgstr "Mezu-zirriborroa"
-
-#: ui/conversation-email.ui:283
-msgid "This message has not yet been sent."
-msgstr "Mezu hau ez da oraindik bidali."
-
-#: ui/conversation-email.ui:329
-msgid "Message not saved"
-msgstr "Mezua ez da gorde"
-
-#: ui/conversation-email.ui:345
-msgid "This message was sent, but has not been saved to your account."
-msgstr "Mezu hau bidali da, baina ez da gorde zure kontuan."
-
 #. Translators: Menu item to reply to a specific message.
 #: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
@@ -2695,9 +3099,25 @@ msgstr "_Ezabatu mezua…"
 msgid "_View Source"
 msgstr "Ikusi i_turburua"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "Gorde _dena"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "Baina hona doa:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "Badirudi esteka hona doala:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "Esteka iruzurtia aurkitu da"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr "Posta-mezua bidali dizunak okerreko webgunera eraman nahi dizula dirudi."
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr "Ez bazaude seguru, hitz egin bidaltzailearekin eta galdetu aurrera egin baino lehen."
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2725,7 +3145,7 @@ msgstr "_Hautatu denak"
 
 #: ui/conversation-message.ui:63
 msgid "From <email>"
-msgstr ""
+msgstr "Bidaltzailea: <email>"
 
 #: ui/conversation-message.ui:79 ui/conversation-message.ui:178
 msgid "1/1/1970\t"
@@ -2747,42 +3167,6 @@ msgstr "Erantzun honi:"
 msgid "Subject"
 msgstr "Gaia"
 
-#: ui/conversation-message.ui:501
-msgid "Show Images"
-msgstr "Erakutsi irudiak"
-
-#: ui/conversation-message.ui:514
-msgid "Always Show From Sender"
-msgstr "Erakutsi beti bidaltzailetik"
-
-#: ui/conversation-message.ui:542
-msgid "Remote images not shown"
-msgstr "Urruneko irudiak ez dira erakutsi"
-
-#: ui/conversation-message.ui:559
-msgid "Only show remote images from senders you trust."
-msgstr "Erakutsi fidagarriak diren bidaltzaileen urruneko irudiak soilik."
-
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "Baina hona doa:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "Badirudi esteka hona doala:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "Esteka iruzurtia aurkitu da"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr "Posta-mezua bidali dizunak okerreko webgunera eraman nahi dizula dirudi."
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr "Ez bazaude seguru, hitz egin bidaltzailearekin eta galdetu aurrera egin baino lehen."
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "Aurkitu berriketan"
@@ -2819,7 +3203,7 @@ msgstr "etiketa"
 msgid "Conversation Shortcuts"
 msgstr "Berriketen lasterbideak"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "Ekintzak"
@@ -2834,55 +3218,55 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "Erantzun bidaltzaileari"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "Erantzun denei"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "Aurrera"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
-msgstr ""
+msgstr "Markatu irakurritako gisa/kendu marka"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
-msgstr ""
+msgstr "Markatu izarrarekin/kendu marka"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
 msgctxt "shortcut window"
-msgid "Archive conversation"
-msgstr "Artxibatu berriketa"
+msgid "Archive conversations"
+msgstr "Artxibatu berriketak"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
 msgctxt "shortcut window"
-msgid "Move conversation"
-msgstr "Aldatu berriketa lekuz"
+msgid "Move conversations"
+msgstr "Aldatu berriketak lekuz"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
 msgctxt "shortcut window"
-msgid "Label conversation"
-msgstr "Gehitu etiketa berriketari"
+msgid "Label conversations"
+msgstr "Gehitu etiketa berriketei"
 
 #: ui/gtk/help-overlay.ui:80
 msgctxt "shortcut window"
-msgid "Trash conversation"
-msgstr "Eraman berriketa zakarrontzira"
+msgid "Trash conversations"
+msgstr "Eraman berriketak zakarrontzira"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
 msgctxt "shortcut window"
-msgid "Move to Spam"
-msgstr "Eraman spam-karpetara"
+msgid "Junk conversations"
+msgstr "Baztertu berriketak"
 
-#: ui/gtk/help-overlay.ui:95
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
 msgctxt "shortcut window"
-msgid "Delete conversation"
-msgstr "Ezabatu berriketa"
+msgid "Delete conversations"
+msgstr "Ezabatu berriketak"
 
 #: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
@@ -2934,7 +3318,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "Berrezarri zooma"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Orokorra"
@@ -2951,281 +3335,203 @@ msgstr "Erakutsi lasterbideak"
 
 #: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
-msgid "Close current window"
-msgstr "Itxi uneko leihoa"
+msgid "Open a new window"
+msgstr "Ireki leiho berria"
 
 #: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "Itxi uneko leihoa"
+
+#: ui/gtk/help-overlay.ui:220
+msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "Irten aplikaziotik"
 
-#: ui/gtk/help-overlay.ui:222
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Keyboard navigation"
 msgstr "Teklatu bidezko nabigazioa"
 
-#: ui/gtk/help-overlay.ui:226
-msgctxt "shortcut window"
-msgid "Focus the next pane"
-msgstr "Enfokatu hurrengo panela"
-
 #: ui/gtk/help-overlay.ui:233
 msgctxt "shortcut window"
-msgid "Focus the previous pane"
-msgstr "Enfokatu aurreko panela"
-
-#: ui/gtk/help-overlay.ui:240
-msgctxt "shortcut window"
-msgid "Focus the conversation list"
-msgstr "Enfokatu berriketen zerrenda"
-
-#: ui/gtk/help-overlay.ui:247
-msgctxt "shortcut window"
-msgid "Select the conversation down"
-msgstr "Hautatu berriketa behera"
+msgid "Go to next/previous pane"
+msgstr "Joan hurrengo/aurreko panelera"
 
-#: ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:241
 msgctxt "shortcut window"
-msgid "Select the conversation up"
-msgstr "Hautatu berriketa gora"
+msgid "Select next/previous conversation"
+msgstr "Hautatu hurrengo/aurreko berriketa"
 
-#: ui/gtk/help-overlay.ui:261
+#: ui/gtk/help-overlay.ui:248
 msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "Enfokatu aurreko/hurrengo mezua"
 
-#: ui/gtk/help-overlay.ui:271
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Single-key shortcuts"
 msgstr "Tekla bakarreko lasterbideak"
 
-#: ui/gtk/help-overlay.ui:275
+#: ui/gtk/help-overlay.ui:262
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "Erantzun bidaltzaileari "
 
-#: ui/gtk/help-overlay.ui:343
+#: ui/gtk/help-overlay.ui:332
+msgctxt "shortcut window"
+msgid "Find in current conversations"
+msgstr "Aurkitu uneko berriketetan"
+
+#: ui/gtk/help-overlay.ui:339
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "Hautatu hurrengo/aurreko berriketak"
+
+#: ui/gtk/help-overlay.ui:351
 msgid "Composer Shortcuts"
 msgstr "Konposatzailearen lasterbideak"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:359
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "Bidali"
 
-#: ui/gtk/help-overlay.ui:358
+#: ui/gtk/help-overlay.ui:366
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "Gehitu eranskina"
 
-#: ui/gtk/help-overlay.ui:371
+#: ui/gtk/help-overlay.ui:379
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "Itxi konposatzaile-leihoa"
 
-#: ui/gtk/help-overlay.ui:378
+#: ui/gtk/help-overlay.ui:386
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "Askatu konposatzaile-leihoa"
 
-#: ui/gtk/help-overlay.ui:385
+#: ui/gtk/help-overlay.ui:393
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "Edizioa"
 
-#: ui/gtk/help-overlay.ui:390
+#: ui/gtk/help-overlay.ui:398
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "Eraman hautapena arbelera"
 
-#: ui/gtk/help-overlay.ui:397
+#: ui/gtk/help-overlay.ui:405
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "Kopiatu hautapena arbelean"
 
-#: ui/gtk/help-overlay.ui:404
+#: ui/gtk/help-overlay.ui:412
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "Itsatsi arbeletik"
 
-#: ui/gtk/help-overlay.ui:411
+#: ui/gtk/help-overlay.ui:419
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "Aipatu testua"
 
-#: ui/gtk/help-overlay.ui:418
+#: ui/gtk/help-overlay.ui:426
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "Kendu aipua testuari"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:435
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "Testu aberatseko edizioa"
 
-#: ui/gtk/help-overlay.ui:431
+#: ui/gtk/help-overlay.ui:439
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "Itsatsi formaturik gabe"
 
-#: ui/gtk/help-overlay.ui:438
+#: ui/gtk/help-overlay.ui:446
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "Testu lodia"
 
-#: ui/gtk/help-overlay.ui:445
+#: ui/gtk/help-overlay.ui:453
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "Testu etzana"
 
-#: ui/gtk/help-overlay.ui:452
+#: ui/gtk/help-overlay.ui:460
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "Testu azpimarratua"
 
-#: ui/gtk/help-overlay.ui:459
+#: ui/gtk/help-overlay.ui:467
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "Testu marratua"
 
-#: ui/gtk/help-overlay.ui:466
+#: ui/gtk/help-overlay.ui:474
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "Kendu formatua"
 
-#: ui/gtk/help-overlay.ui:473
+#: ui/gtk/help-overlay.ui:481
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "Txertatu irudi bat"
 
-#: ui/gtk/help-overlay.ui:480
+#: ui/gtk/help-overlay.ui:488
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "Txertatu esteka"
 
-#: ui/main-toolbar.ui:23
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
-#: ui/main-toolbar.ui:61
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "Aktibatu/desaktibatu bilaketa-barra"
 
-#: ui/main-toolbar.ui:113
+#: ui/main-toolbar.ui:114
 msgid "Reply"
 msgstr "Erantzun"
 
-#: ui/main-toolbar.ui:136
+#: ui/main-toolbar.ui:137
 msgid "Reply All"
 msgstr "Erantzun denei"
 
-#: ui/main-toolbar.ui:159
+#: ui/main-toolbar.ui:160
 msgid "Forward"
 msgstr "Aurrera"
 
 #: ui/main-toolbar.ui:265
 msgid "Toggle find bar"
-msgstr ""
+msgstr "Aktibatu/desaktibatu bilaketa-barra"
 
 #: ui/main-toolbar.ui:286
 msgid "_Archive"
 msgstr "_Artxiboa"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "Markatu _baztergarri gisa"
-
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "Markatu e_z-baztergarri gisa"
-
-#: ui/main-toolbar-menus.ui:32
-msgid "Empty _Spam…"
-msgstr ""
-
-#: ui/main-toolbar-menus.ui:36
-msgid "Empty _Trash…"
-msgstr "Hustu _zakarrontzia…"
+msgid "Toggle as _Junk"
+msgstr "Txandaktu ba_ztergarri gisa"
 
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:28
 msgid "_Accounts"
 msgstr "_Kontuak"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:36
 msgid "_Keyboard Shortcuts"
 msgstr "Las_ter-teklak"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:47
 msgid "_About Geary"
 msgstr "Geary aplikazioari _buruz"
 
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:185
-msgid "Working offline"
-msgstr "Lineaz kanpo lanean"
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr ""
-
-#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:249
-msgid "Check"
-msgstr "Egiaztatu"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr ""
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:282
-msgid "Security problem"
-msgstr "Segurtasun-arazoa"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "Kontu batek fidagarria ez den zerbitzari baten berri eman du."
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr "Saiatu berriro saioa hasten, pasahitza eskatuko zaizu."
-
-#. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:379
-msgid "Login problem"
-msgstr "Arazoa saioa hastean"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "Kontu batek saio-haste edo pasahitz oker baten berri eman du."
-
 #: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "SMTP kredentzialak"
@@ -3242,31 +3548,133 @@ msgstr "_Gogoratu pasahitza"
 msgid "_Authenticate"
 msgstr "_Autentifikatu"
 
-#: ui/preferences-dialog.ui:15
-msgid "Preferences"
-msgstr "Hobespenak"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Geary-ren eguneratzea abian…"
 
-#: ui/preferences-dialog.ui:43
-msgid "_Automatically select next message"
-msgstr "Hautatu _automatikoki hurrengo mezua"
+#~ msgid "Moved %d message to %s"
+#~ msgid_plural "Moved %d messages to %s"
+#~ msgstr[0] "Mezu %d lekuz aldatu da hona: %s"
+#~ msgstr[1] "%d mezu lekuz aldatu dira hona: %s"
 
-#: ui/preferences-dialog.ui:64
-msgid "_Display conversation preview"
-msgstr "_Bistaratu berriketaren aurrebista"
+#~ msgid "Error emptying %s"
+#~ msgstr "Errorea %s hustean"
 
-#: ui/preferences-dialog.ui:85
-msgid "Use _three pane view"
-msgstr "Erabili _hiru paneleko bista"
+#~ msgid "Trashed %d message"
+#~ msgid_plural "Trashed %d messages"
+#~ msgstr[0] "Mezu %d zakarrontzira bota da"
+#~ msgstr[1] "%d mezu zakarrontzira bota dira"
 
-#: ui/preferences-dialog.ui:106
-msgid "_Watch for new mail when closed"
-msgstr ""
+#~ msgid "Archived %d message"
+#~ msgid_plural "Archived %d messages"
+#~ msgstr[0] "Mezu %d artxibatu egin da"
+#~ msgstr[1] "%d mezu artxibatu egin dira"
 
-#: ui/preferences-dialog.ui:110
-msgid "Geary will keep running after all windows are closed"
-msgstr "Geary-k abian jarraituko du leiho guztiak itxi ondoren"
+#~ msgid "Successfully sent mail to %s."
+#~ msgstr "Mezua ongi bidali da %s helbidera."
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary-ren eguneratzea abian…"
+#~ msgid "Failed to open default text editor."
+#~ msgstr "Huts egin du testuaren editore lehenetsia irekitzean."
+
+#~ msgid "Indexing %s account"
+#~ msgstr "'%s' kontua indexatzen"
+
+#~ msgid "Sent Mail"
+#~ msgstr "Bidalita"
+
+#~ msgid "Spam"
+#~ msgstr "Baztergarria"
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "Askatu (Ctrl+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "Erantsi fitxategia (Ctrl+T)"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "Bidali (Ctrl+Enter)"
+
+#~ msgid "Open this link"
+#~ msgstr "Ireki esteka hau"
+
+#~ msgid "C_olor"
+#~ msgstr "_Kolorea"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "Erakutsi eremu hedatuak"
+
+#~ msgid "From"
+#~ msgstr "Nondik"
+
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "Berregin azken edizioa (Ctrl+Shift+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "Lodia (Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "Etzana (Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "Azpimarratua (Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "Marratua (Ctrl+K)"
+
+#~ msgid "Insert ordered list"
+#~ msgstr "Txertatu zerrenda ordenatua"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "Jarri komatxoak testuari (Ctrl+])"
+
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "Kendu komatxoak testuari (Ctrl+[)"
+
+#~ msgid "Insert an image (Ctrl+G)"
+#~ msgstr "Txertatu irudi bat (Ctrl+G)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "Kendu hautapenaren formatua (Ctrl+Space)"
+
+#~ msgid "Display the message menu"
+#~ msgstr "Bistaratu mezuen menua"
+
+#~ msgid "Edit Draft"
+#~ msgstr "Editatu zirriborroa"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive conversation"
+#~ msgstr "Artxibatu berriketa"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move conversation"
+#~ msgstr "Aldatu berriketa lekuz"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move to Spam"
+#~ msgstr "Eraman spam-karpetara"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete conversation"
+#~ msgstr "Ezabatu berriketa"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the next pane"
+#~ msgstr "Enfokatu hurrengo panela"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the conversation list"
+#~ msgstr "Enfokatu berriketen zerrenda"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Select the conversation down"
+#~ msgstr "Hautatu berriketa behera"
+
+#~ msgid "Mark as S_pam"
+#~ msgstr "Markatu _baztergarri gisa"
+
+#~ msgid "Mark as not S_pam"
+#~ msgstr "Markatu e_z-baztergarri gisa"
 
+#~ msgid "Empty _Trash…"
+#~ msgstr "Hustu _zakarrontzia…"



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