[geary/pantheon_mail: 31/32] Launchpad automatic translations update.

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 7d3e01428234ae3b91baf4ab5d8130d53106e708
Author: Launchpad Translations on behalf of elementary-apps <Unknown>
Date:   Wed Nov 25 05:40:33 2015 +0000

    Launchpad automatic translations update.

 po/ar.po       |   19 +-
 po/bs.po       |   19 +-
 po/ca.po       |   17 +-
 po/cs.po       |   17 +-
 po/da.po       |   19 +-
 po/de.po       |   19 +-
 po/el.po       |   19 +-
 po/en_CA.po    |   17 +-
 po/en_GB.po    |   19 +-
 po/eo.po       |   17 +-
 po/es.po       |   17 +-
 po/et.po       |   17 +-
 po/eu.po       |   19 +-
 po/fa.po       |   19 +-
 po/fi.po       |   19 +-
 po/fr.po       |   17 +-
 po/gl.po       |   19 +-
 po/he.po       |   19 +-
 po/hi.po       |   17 +-
 po/hr.po       |   19 +-
 po/hu.po       |   17 +-
 po/id.po       |   17 +-
 po/it.po       |   19 +-
 po/ja.po       |   17 +-
 po/kk.po       |   19 +-
 po/km.po       |   17 +-
 po/lt.po       |   17 +-
 po/ms.po       |   19 +-
 po/nb.po       |   17 +-
 po/nl.po       |   19 +-
 po/pl.po       |   17 +-
 po/pt.po       |   17 +-
 po/pt_BR.po    |   65 ++-
 po/ro.po       |   17 +-
 po/ru.po       |   21 +-
 po/sk.po       |   17 +-
 po/sl.po       |   17 +-
 po/sq.po       | 1392 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/sr.po       |   17 +-
 po/sr latin po |   17 +-
 po/sv.po       |   19 +-
 po/te.po       |   17 +-
 po/tr.po       |   19 +-
 po/uk.po       |   19 +-
 po/vi.po       |   17 +-
 po/zh_CN.po    |   19 +-
 po/zh_TW.po    |   17 +-
 47 files changed, 2129 insertions(+), 137 deletions(-)
---
diff --git a/po/ar.po b/po/ar.po
index e4ec0ba..3476b92 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:48+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Arabic "
 "(http://www.transifex.com/projects/p/geary/language/ar/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: ar\n"
 
@@ -291,6 +291,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "تأشير المحادثة"
 
@@ -299,6 +300,7 @@ msgid "Mark conversations"
 msgstr "تأشير المحادثات"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "إضافة وسم للمحادثة"
 
@@ -308,6 +310,7 @@ msgstr "إضافة وسم للمحادثات"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr ""
 
@@ -711,6 +714,7 @@ msgid "%s - New Messages"
 msgstr "%s - رسائل جديدة"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d صفر رسالة جديدة"
@@ -721,12 +725,14 @@ msgstr[4] "%d رسائل جديدة"
 msgstr[5] "%d رسائل جديدة"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -737,6 +743,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "فتح"
 
@@ -824,6 +831,7 @@ msgstr "اختر ملف"
 msgid "_Attach"
 msgstr "_ارفاق"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1335,6 +1343,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1398,3 +1407,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/bs.po b/po/bs.po
index f7a53ac..0950c44 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,8 +9,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:49+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:43+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Bosnian <bs li org>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: bs\n"
 
@@ -291,6 +291,7 @@ msgstr "Označi kao da nije S_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Označi konverzaciju"
 
@@ -299,6 +300,7 @@ msgid "Mark conversations"
 msgstr "Označi konverzacije"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Dodaj oznaku konverzacije"
 
@@ -308,6 +310,7 @@ msgstr "Dodaj oznaku konverzacija"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Pomjeri konverzaciju"
 
@@ -752,6 +755,7 @@ msgstr "%s - Novih poruka"
 
 #         translations.
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova poruka"
@@ -760,6 +764,7 @@ msgstr[2] "%d novih poruka"
 
 #         translations.
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nova poruka ukupno"
@@ -768,6 +773,7 @@ msgstr[2] "%s, %d novih poruka ukupno"
 
 #         translations.
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -785,6 +791,7 @@ msgstr[2] ""
 "(%d druge nove poruke za %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Otvori"
 
@@ -881,6 +888,7 @@ msgstr "Izaberite datoteku"
 msgid "_Attach"
 msgstr "_Prikači"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1406,6 +1414,7 @@ msgid "_From:"
 msgstr "_Od:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1473,3 +1482,7 @@ msgstr "Traži ključne riječi u svim porukama korisničkog računa (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksiranje %s korisničkog računa"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 43eca9a..3592cab 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Catalan "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: ca\n"
 
@@ -290,6 +290,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marca la conversa"
 
@@ -298,6 +299,7 @@ msgid "Mark conversations"
 msgstr "Marca les converses"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Afegeix etiqueta a la conversa"
 
@@ -307,6 +309,7 @@ msgstr "Afegeix etiqueta a converses"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Mou la conversa"
 
@@ -711,18 +714,21 @@ msgid "%s - New Messages"
 msgstr "%s - Missatges Nous"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d missatge nou"
 msgstr[1] "%d missatges nous"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -733,6 +739,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Obre"
 
@@ -820,6 +827,7 @@ msgstr "Escolliu un fitxer"
 msgid "_Attach"
 msgstr "_Adjunta"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1327,6 +1335,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1390,3 +1399,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 1a835f6..d77c46e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:49+0000\n"
 "Last-Translator: Marv-CZ <marek manet cz>\n"
 "Language-Team: Czech <gnome-cs-list gnome org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: cs\n"
 
@@ -297,6 +297,7 @@ msgstr "Označit, že není nevyžá_dané"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Označit konverzaci"
 
@@ -305,6 +306,7 @@ msgid "Mark conversations"
 msgstr "Označit konverzace"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Přiřadit konverzaci štítek"
 
@@ -314,6 +316,7 @@ msgstr "Přiřadit konverzacím štítek"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Přesunout konverzaci"
 
@@ -752,6 +755,7 @@ msgid "%s - New Messages"
 msgstr "%s – nové zprávy"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nová zpráva"
@@ -759,6 +763,7 @@ msgstr[1] "%d nové zprávy"
 msgstr[2] "%d nových zpráv"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nová zpráva celkem"
@@ -766,6 +771,7 @@ msgstr[1] "%s, %d nové zprávy celkem"
 msgstr[2] "%s, %d nových zpráv celkem"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -783,6 +789,7 @@ msgstr[2] ""
 "(%d dalších nových zpráv pro %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Otevřít"
 
@@ -879,6 +886,7 @@ msgstr "Vybrat soubor"
 msgid "_Attach"
 msgstr "_Příloha"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Dodatečné adresy pro %s"
@@ -1397,6 +1405,7 @@ msgid "_From:"
 msgstr "_Od:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1462,3 +1471,7 @@ msgstr "Prohledat všechny e-maily v účtu podle klíčového slova (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexuje se účet %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/da.po b/po/da.po
index 218d703..d3a4f0f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:51+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:45+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Danish "
 "(http://www.transifex.com/projects/p/geary/language/da/)\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: da\n"
 
@@ -290,6 +290,7 @@ msgstr "Marker som ikke s_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Markér samtale"
 
@@ -298,6 +299,7 @@ msgid "Mark conversations"
 msgstr "Markér samtaler"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Tilføj label til samtale"
 
@@ -307,6 +309,7 @@ msgstr "Tilføj label til samtaler"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Flyt samtale"
 
@@ -744,18 +747,21 @@ msgid "%s - New Messages"
 msgstr "%s - Nye beskeder"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d ny besked"
 msgstr[1] "%d nye beskeder"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d ny besked i alt"
 msgstr[1] "%s, %d nye beskeder i alt"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -770,6 +776,7 @@ msgstr[1] ""
 "(%d andre nye beskeder for %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Åbn"
 
@@ -857,6 +864,7 @@ msgstr "Vælg en fil"
 msgid "_Attach"
 msgstr "_Vedhæft"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1364,6 +1372,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1427,3 +1436,7 @@ msgstr "Søg efter ord i al mail tilhørende kontoen %Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksérer %s konto"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/de.po b/po/de.po
index 1d045bb..1d064bd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -19,15 +19,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:47+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Deutsch <gnome-de gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: de\n"
 
@@ -302,6 +302,7 @@ msgstr "S_pam-Markierung entfernen"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Konversation markieren"
 
@@ -310,6 +311,7 @@ msgid "Mark conversations"
 msgstr "Konversationen markieren"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Konversation ein Label zuweisen"
 
@@ -319,6 +321,7 @@ msgstr "Konversationen ein Label zuweisen"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Konversation verschieben"
 
@@ -762,18 +765,21 @@ msgid "%s - New Messages"
 msgstr "%s - Neue Nachrichten"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, insgesamt %d neue Nachricht"
 msgstr[1] "%s, insegesamt %d neue Nachrichten"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -788,6 +794,7 @@ msgstr[1] ""
 "(%d andere neue Nachrichten für %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Öffnen"
 
@@ -892,6 +899,7 @@ msgstr "Datei auswählen"
 msgid "_Attach"
 msgstr "_Anhängen"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Zusätzliche Adressen für %s"
@@ -1403,6 +1411,7 @@ msgid "_From:"
 msgstr "_Von:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1466,3 +1475,7 @@ msgstr "Alle E-Mails dieses Kontos nach Stichworten durchsuchen (Strg+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "%s-Konto indizieren"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/el.po b/po/el.po
index 8cdc9ca..002b4e2 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13,15 +13,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:51+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:46+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: www.gnome.gr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
 "Language: el\n"
@@ -300,6 +300,7 @@ msgstr "Σημείωση ως μη ανεπιθύ_μητα"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Σήμανση συνομιλίας"
 
@@ -308,6 +309,7 @@ msgid "Mark conversations"
 msgstr "Σήμανση συνομιλιών"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Προσθήκη ετικέτας στην συνομιλία"
 
@@ -317,6 +319,7 @@ msgstr "Προσθήκη ετικέτας στις συνομιλίες"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Μετακίνηση συνομιλίας"
 
@@ -771,18 +774,21 @@ msgid "%s - New Messages"
 msgstr "%s - Νέα μηνύματα"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d νέο μήνυμα"
 msgstr[1] "%d νέα μηνύματα"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, συνολικά %d νέο μήνυμα"
 msgstr[1] "%s, συνολικά %d νέα μηνύματα"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -797,6 +803,7 @@ msgstr[1] ""
 "(%d άλλα μηνύματα για το %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Aνοιχτό"
 
@@ -905,6 +912,7 @@ msgstr "Επιλέξτε ένα αρχείο"
 msgid "_Attach"
 msgstr "_Επισύναψη"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1419,6 +1427,7 @@ msgid "_From:"
 msgstr "_Από:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1483,3 +1492,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Ευρετηρίαση λογαριασμού %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/en_CA.po b/po/en_CA.po
index b96a293..e20822f 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:49+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: English (Canada) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: en_CA\n"
 
@@ -289,6 +289,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr ""
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr ""
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr ""
 
@@ -306,6 +308,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr ""
 
@@ -710,18 +713,21 @@ msgid "%s - New Messages"
 msgstr ""
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d new message"
 msgstr[1] "%d new messages"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -732,6 +738,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Open"
 
@@ -819,6 +826,7 @@ msgstr "Choose a file"
 msgid "_Attach"
 msgstr "_Attach"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1326,6 +1334,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1389,3 +1398,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 074b57c..b5fb42c 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:47+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: English (United Kingdom) "
 "(http://www.transifex.com/projects/p/geary/language/en_GB/)\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: en_GB\n"
 
@@ -291,6 +291,7 @@ msgstr "Mark as not S_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Mark conversation"
 
@@ -299,6 +300,7 @@ msgid "Mark conversations"
 msgstr "Mark conversations"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Add label to conversation"
 
@@ -308,6 +310,7 @@ msgstr "Add label to conversations"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Move conversation"
 
@@ -743,18 +746,21 @@ msgid "%s - New Messages"
 msgstr "%s - New Messages"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d new message"
 msgstr[1] "%d new messages"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d new message total"
 msgstr[1] "%s, %d new messages total"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -769,6 +775,7 @@ msgstr[1] ""
 "(%d other new messages for %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Open"
 
@@ -856,6 +863,7 @@ msgstr "Choose a file"
 msgid "_Attach"
 msgstr "_Attach"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1363,6 +1371,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1426,3 +1435,7 @@ msgstr "Search all mail in account for keywords (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexing %s account"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/eo.po b/po/eo.po
index f960551..dc356f8 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Esperanto "
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: eo\n"
 
@@ -291,6 +291,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr ""
 
@@ -299,6 +300,7 @@ msgid "Mark conversations"
 msgstr ""
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr ""
 
@@ -308,6 +310,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr ""
 
@@ -709,18 +712,21 @@ msgid "%s - New Messages"
 msgstr ""
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova mesaĝo"
 msgstr[1] "%d novaj mesaĝoj"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -731,6 +737,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Malfermi"
 
@@ -818,6 +825,7 @@ msgstr "Elektu dosieron"
 msgid "_Attach"
 msgstr "Kunsendi"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1325,6 +1333,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1388,3 +1397,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/es.po b/po/es.po
index 45231b2..4caea1a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido gmail com>\n"
 "Language-Team: Español; Castellano <gnome-es-list gnome org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: es\n"
 
@@ -301,6 +301,7 @@ msgstr "Marcar como no _spam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marcar conversación"
 
@@ -309,6 +310,7 @@ msgid "Mark conversations"
 msgstr "Marcar conversaciones"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Añadir etiqueta a la conversación"
 
@@ -318,6 +320,7 @@ msgstr "Añadir etiqueta a las conversaciones"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Mover conversación"
 
@@ -759,18 +762,21 @@ msgid "%s - New Messages"
 msgstr "%s: mensajes nuevos"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaje nuevo"
 msgstr[1] "%d mensajes nuevos"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d mensaje nuevo en total"
 msgstr[1] "%s, %d mensajes nuevos en total"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -785,6 +791,7 @@ msgstr[1] ""
 "(%d mensajes nuevos más para %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Abrir"
 
@@ -884,6 +891,7 @@ msgstr "Elija un archivo"
 msgid "_Attach"
 msgstr "_Adjuntar"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Direcciones adicionales para %s"
@@ -1395,6 +1403,7 @@ msgid "_From:"
 msgstr "_De:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1458,3 +1467,7 @@ msgstr "Buscar palabras en todo el correo de la cuenta (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexando la cuenta %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/et.po b/po/et.po
index ed27d9b..662abc9 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:50+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Estonian "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: et\n"
 
@@ -290,6 +290,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Märgi kui..."
 
@@ -298,6 +299,7 @@ msgid "Mark conversations"
 msgstr "Märgi kui..."
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Sildista kui..."
 
@@ -307,6 +309,7 @@ msgstr "Sildista kui..."
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Liiguta asukohta..."
 
@@ -712,18 +715,21 @@ msgid "%s - New Messages"
 msgstr "%s - uued kirjad"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d uus kiri"
 msgstr[1] "%d uut kirja"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -734,6 +740,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Ava"
 
@@ -821,6 +828,7 @@ msgstr "Manuse valimine"
 msgid "_Attach"
 msgstr "_Olgu"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1328,6 +1336,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1391,3 +1400,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/eu.po b/po/eu.po
index aee0208..cb040ee 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 20:59+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:52+0000\n"
 "Last-Translator: Félix Brezo <felixbrezo gmail com>\n"
 "Language-Team: Basque <librezale librezale org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: eu\n"
 
@@ -293,6 +293,7 @@ msgstr "Markatu e_z-baztergarri gisa"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Markatu berriketa"
 
@@ -301,6 +302,7 @@ msgid "Mark conversations"
 msgstr "Markatu berriketak"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Gehitu etiketa berriketari"
 
@@ -310,6 +312,7 @@ msgstr "Gehitu etiketa berriketei"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Aldatu berriketa lekuz"
 
@@ -749,18 +752,21 @@ msgid "%s - New Messages"
 msgstr "%s - Mezu berriak"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "Mezu berri %d"
 msgstr[1] "%d mezu berri"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 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/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -775,6 +781,7 @@ msgstr[1] ""
 "%3$s(r)en beste %2$d mezu berri"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Ireki"
 
@@ -862,6 +869,7 @@ msgstr "Aukeratu fitxategia"
 msgid "_Attach"
 msgstr "_Erantsi"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1369,6 +1377,7 @@ msgid "_From:"
 msgstr "_Nork:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1432,3 +1441,7 @@ msgstr "Bilatu kontuaren mezu guztietan gako-hitzak (Ktrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "'%s' kontua indexatzen"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/fa.po b/po/fa.po
index dd941bc..3c3e5e5 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:48+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:43+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Persian "
 "(http://www.transifex.com/projects/p/geary/language/fa/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: fa\n"
 
@@ -289,6 +289,7 @@ msgstr "نشان گذاری به عنوان غیر هرزنامه"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "نشان گذاری گفتگو"
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr "نشان گذاری گفتگوها"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "افزودن برچسب به گفتگو"
 
@@ -306,6 +308,7 @@ msgstr "افزودن برچسب به گفتگوها"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "انتقال گفتگو"
 
@@ -744,16 +747,19 @@ msgid "%s - New Messages"
 msgstr "%s - پیام جدید"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d پیام جدید"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d پیام جدید در کل"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -765,6 +771,7 @@ msgstr[0] ""
 "(%d پیام جدید دیگر برای %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "باز کردن"
 
@@ -852,6 +859,7 @@ msgstr "یک فایل را انتخاب کنید"
 msgid "_Attach"
 msgstr "پیوست"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1356,6 +1364,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1419,3 +1428,7 @@ msgstr "یافتن همه‌ی ایمیل‌های حساب، حاوی کلما
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "فهرست کردن %s حساب"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 123bb3e..1cf3797 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -12,15 +12,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:54+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: suomi <gnome-fi-laatu lists sourceforge net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: fi\n"
 
@@ -294,6 +294,7 @@ msgstr "Poista _roskapostimerkintä"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Merkitse keskustelu"
 
@@ -302,6 +303,7 @@ msgid "Mark conversations"
 msgstr "Merkitse keskustelut"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Lisää tunniste keskusteluun"
 
@@ -311,6 +313,7 @@ msgstr "Lisää tunniste keskusteluihin"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Siirrä keskustelu"
 
@@ -752,18 +755,21 @@ msgid "%s - New Messages"
 msgstr "%s - Uusia viestejä"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d uusi viesti"
 msgstr[1] "%d uutta viestiä"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d uusi viesti yhteensä"
 msgstr[1] "%s, %d uutta viestiä yhteensä"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -778,6 +784,7 @@ msgstr[1] ""
 "(%d muuta uutta viestiä tilille %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Avaa"
 
@@ -876,6 +883,7 @@ msgstr "Valitse tiedosto"
 msgid "_Attach"
 msgstr "_Liitä"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Lisäosoitteet tilille %s"
@@ -1388,6 +1396,7 @@ msgid "_From:"
 msgstr "_Lähettäjä:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1451,3 +1460,7 @@ msgstr "Etsi hakusanoilla kaikista tilin sähköpostiviesteistä (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksoidaan tiliä %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 8a8c69c..9c574c9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:50+0000\n"
 "Last-Translator: Cédric Bellegarde <cedric bellegarde adishatz org>\n"
 "Language-Team: français <gnomefr traduc org>\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: fr\n"
 
@@ -305,6 +305,7 @@ msgstr "Marquer comme non _pourriel"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marquer la conversation"
 
@@ -313,6 +314,7 @@ msgid "Mark conversations"
 msgstr "Marquer les conversations"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Ajouter une étiquette à la conversation"
 
@@ -322,6 +324,7 @@ msgstr "Ajouter une étiquette aux conversations"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Déplacer la conversation"
 
@@ -775,18 +778,21 @@ msgid "%s - New Messages"
 msgstr "%s - Nouveaux messages"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nouveau message"
 msgstr[1] "%d nouveaux messages"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nouveau message au total"
 msgstr[1] "%s, %d nouveaux messages au total"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -801,6 +807,7 @@ msgstr[1] ""
 "(%d nouveaux messages restants pour %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Ouvrir"
 
@@ -901,6 +908,7 @@ msgstr "Choisir un fichier"
 msgid "_Attach"
 msgstr "_Joindre"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Adresses supplémentaires pour %s"
@@ -1409,6 +1417,7 @@ msgid "_From:"
 msgstr "_De :"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1472,3 +1481,7 @@ msgstr "Rechercher par mots-clés dans tous les messages du compte (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexation du compte %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 7ccc87e..3f747c9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:47+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: gnome-l10n-gl gnome org\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: gl\n"
 
@@ -289,6 +289,7 @@ msgstr "Marcar como _non é lixo"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marcar a conversa"
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr "Marcar as conversas"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Engadir etiqueta á conversa"
 
@@ -306,6 +308,7 @@ msgstr "Engadir etiqueta ás conversas"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Mover a conversa"
 
@@ -746,18 +749,21 @@ msgid "%s - New Messages"
 msgstr "%s - Mensaxes novas"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mensaxe nova"
 msgstr[1] "%d mensaxes novas"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nova mensaxe en total"
 msgstr[1] "%s, %d novas mensaxes en total"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -772,6 +778,7 @@ msgstr[1] ""
 "(outras %d novas mensaxes para %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Aberto"
 
@@ -859,6 +866,7 @@ msgstr "Escolla un ficheiro"
 msgid "_Attach"
 msgstr "_Anexar"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1367,6 +1375,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1430,3 +1439,7 @@ msgstr "Buscar en todas as mensaxes da conta por palabras clave (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexando %s conta(s)"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/he.po b/po/he.po
index a9305cf..9c44995 100644
--- a/po/he.po
+++ b/po/he.po
@@ -16,15 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:49+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:44+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: עברית <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: he\n"
 
@@ -297,6 +297,7 @@ msgstr "סימון כלא דואר ז_בל"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "סימון שיחה"
 
@@ -305,6 +306,7 @@ msgid "Mark conversations"
 msgstr "סימון שיחות"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "הוספת תווית לשיחה"
 
@@ -314,6 +316,7 @@ msgstr "הוספת תווית לשיחות"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "הזזת שיחה"
 
@@ -747,18 +750,21 @@ msgid "%s - New Messages"
 msgstr "‏%s - הודעות חדשות"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "הודעה חדשה אחת"
 msgstr[1] "%d הודעות חדשות"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d הודעה חדשה סך הכל"
 msgstr[1] "%s, %d הודעות חדשות סך הכל"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -773,6 +779,7 @@ msgstr[1] ""
 "(%d הודעות חדשות עבור %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "פתיחה"
 
@@ -864,6 +871,7 @@ msgstr "בחירת קובץ"
 msgid "_Attach"
 msgstr "_צירוף"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "כתובות נוספות עבור %s"
@@ -1371,6 +1379,7 @@ msgid "_From:"
 msgstr "_מאת:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1434,3 +1443,7 @@ msgstr "חיפוש בכל חשבונות הדואר עם צירוף מקשים (
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "מפתוּח חשבון %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/hi.po b/po/hi.po
index b8f8f11..2b1a463 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Hindi (India) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: hi_IN\n"
 
@@ -289,6 +289,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr ""
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr ""
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr ""
 
@@ -306,6 +308,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "वार्तालप का स्थान परिवर्तन करें"
 
@@ -702,18 +705,21 @@ msgid "%s - New Messages"
 msgstr "%s - नए संदेश"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d नया संदेश"
 msgstr[1] "%d नए संदेश"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -724,6 +730,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr ""
 
@@ -811,6 +818,7 @@ msgstr ""
 msgid "_Attach"
 msgstr ""
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1318,6 +1326,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1381,3 +1390,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/hr.po b/po/hr.po
index b68c18b..6a001f1 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:48+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Croatian "
 "(http://www.transifex.com/projects/p/geary/language/hr/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: hr\n"
 
@@ -292,6 +292,7 @@ msgstr "Označi da nije S_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Obilježavanje razgovora"
 
@@ -300,6 +301,7 @@ msgid "Mark conversations"
 msgstr "Obilježavanje razgovora"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Dodavanje oznake razgovoru"
 
@@ -309,6 +311,7 @@ msgstr "Dodavanje oznaka razgovoru"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Premjesti razgovor"
 
@@ -746,6 +749,7 @@ msgid "%s - New Messages"
 msgstr "%s - Novih poruka"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova poruka"
@@ -753,6 +757,7 @@ msgstr[1] "%d novih poruka"
 msgstr[2] "%d novih poruka"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nova poruka sveukupno"
@@ -760,6 +765,7 @@ msgstr[1] "%s, %d nove poruke sveukupno"
 msgstr[2] "%s, %d novih poruka sveukupno"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -777,6 +783,7 @@ msgstr[2] ""
 "(%d ostalih novih poruka za %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Otvaranje"
 
@@ -864,6 +871,7 @@ msgstr "Odaberite datoteku"
 msgid "_Attach"
 msgstr "_Privitak"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1374,6 +1382,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1437,3 +1446,7 @@ msgstr "Pretraži svu poštu unutar računa po ključnim riječima (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksiranje %s računa"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/hu.po b/po/hu.po
index c81be06..f3af4b3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Úr Balázs <urbalazs gmail com>\n"
 "Language-Team: Hungarian <openscope at googlegroups dot com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: hu_HU\n"
 
@@ -291,6 +291,7 @@ msgstr "Megjelölés nem levél_szemétként"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Beszélgetés megjelölése"
 
@@ -299,6 +300,7 @@ msgid "Mark conversations"
 msgstr "Beszélgetések megjelölése"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Címke hozzáadása a beszélgetéshez"
 
@@ -308,6 +310,7 @@ msgstr "Címke hozzáadása a beszélgetésekhez"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Beszélgetés áthelyezése"
 
@@ -750,18 +753,21 @@ msgid "%s - New Messages"
 msgstr "%s - Új levelek"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d új levél"
 msgstr[1] "%d új levél"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, összesen %d új levél"
 msgstr[1] "%s, összesen %d új levél"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -776,6 +782,7 @@ msgstr[1] ""
 "(további %d új levél ehhez: %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Megnyitás"
 
@@ -876,6 +883,7 @@ msgstr "Válasszon egy fájlt"
 msgid "_Attach"
 msgstr "C_satolás"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "További címek a következőhöz: %s"
@@ -1393,6 +1401,7 @@ msgid "_From:"
 msgstr "_Feladó:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1456,3 +1465,7 @@ msgstr "A fiók minden levélének keresése kulcsszavakra (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "%s fiók indexelése"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index ace18ce..715a624 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Andika Triwidada <andika gmail com>\n"
 "Language-Team: Indonesian "
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: id\n"
 
@@ -295,6 +295,7 @@ msgstr "Tandai sebagai bukan S_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Tandai percakapan"
 
@@ -303,6 +304,7 @@ msgid "Mark conversations"
 msgstr "Tandai percakapan"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Tambahkan label ke percakapan"
 
@@ -312,6 +314,7 @@ msgstr "Tambahkan label ke percakapan"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Pindahkan percakapan"
 
@@ -748,16 +751,19 @@ msgid "%s - New Messages"
 msgstr "%s - Pesan Baru"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d pesan baru"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, total %d pesan baru"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -769,6 +775,7 @@ msgstr[0] ""
 "(%d pesan baru lain bagi %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Buka"
 
@@ -864,6 +871,7 @@ msgstr "Pilih berkas"
 msgid "_Attach"
 msgstr "L_ampiri"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1366,6 +1374,7 @@ msgid "_From:"
 msgstr "_Dari:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1427,3 +1436,7 @@ msgstr "Cari kata kunci pada semua surat dalam akun (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Mengindeks akun %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/it.po b/po/it.po
index 9becb81..3260359 100644
--- a/po/it.po
+++ b/po/it.po
@@ -19,15 +19,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:48+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Italiano <gnome-it-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: it\n"
 
@@ -302,6 +302,7 @@ msgstr "Segna come non i_ndesiderata"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Segna conversazione"
 
@@ -310,6 +311,7 @@ msgid "Mark conversations"
 msgstr "Segna conversazioni"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Aggiungi etichetta alla conversazione"
 
@@ -319,6 +321,7 @@ msgstr "Aggiungi etichetta alle conversazioni"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Sposta conversazione"
 
@@ -761,18 +764,21 @@ msgid "%s - New Messages"
 msgstr "%s - Nuovi messaggi"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nuovo messaggio"
 msgstr[1] "%d nuovi messaggi"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nuovo messaggio in totale"
 msgstr[1] "%s, %d nuovi messaggi in totale"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -787,6 +793,7 @@ msgstr[1] ""
 "(%d altri nuovi messaggi per %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Apri"
 
@@ -886,6 +893,7 @@ msgstr "Scegli un file"
 msgid "_Attach"
 msgstr "_Allega"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Indirizzi aggiuntivi per %s"
@@ -1398,6 +1406,7 @@ msgid "_From:"
 msgstr "_Da:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1461,3 +1470,7 @@ msgstr "Cerca le parole chiave in tutta la posta dell'account (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indicizzazione dell'account %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/ja.po b/po/ja.po
index d2ba7c1..4bfde5a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Japanese (Japan) "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: ja_JP\n"
 
@@ -290,6 +290,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "スレッドをマーク"
 
@@ -298,6 +299,7 @@ msgid "Mark conversations"
 msgstr "スレッドをマーク"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "スレッドにラベルを付ける"
 
@@ -307,6 +309,7 @@ msgstr "スレッドにラベルを付ける"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "スレッドを移動"
 
@@ -707,17 +710,20 @@ msgid "%s - New Messages"
 msgstr "%s - 新着メッセージ"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 件の新着メッセージ"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -728,6 +734,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "開く"
 
@@ -815,6 +822,7 @@ msgstr "ファイルを選択"
 msgid "_Attach"
 msgstr "添付(_A)"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1321,6 +1329,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1384,3 +1393,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/kk.po b/po/kk.po
index 899b4c8..e826dfb 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -9,15 +9,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:51+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:45+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Kazakh <kk_KZ googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: kk\n"
 
@@ -291,6 +291,7 @@ msgstr "С_пам емес етіп белгілеу"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Сөйлесуді белгілеу"
 
@@ -299,6 +300,7 @@ msgid "Mark conversations"
 msgstr "Сөйлесулерді белгілеу"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Сөйлесуге белгіні қосу"
 
@@ -308,6 +310,7 @@ msgstr "Сөйлесулерге белгіні қосу"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Сөйлесуді жылжыту"
 
@@ -749,16 +752,19 @@ msgid "%s - New Messages"
 msgstr "%s - жаңа хаттар"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d жаңа хат"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d жалпы жаңа хат"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -770,6 +776,7 @@ msgstr[0] ""
 "(%d басқа жаңа хат, %s үшін)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Ашу"
 
@@ -865,6 +872,7 @@ msgstr "Файлды таңдау"
 msgid "_Attach"
 msgstr "Салынымды қ_осып жіберу"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "%s үшін қосымша адрестер"
@@ -1368,6 +1376,7 @@ msgid "_From:"
 msgstr "_Кімнен:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1429,3 +1438,7 @@ msgstr "Тіркелгінің барлық хаттарынан кілтсөз
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "%s тіркелгісін индекстеу"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/km.po b/po/km.po
index d1d36f9..c12fa04 100644
--- a/po/km.po
+++ b/po/km.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Khmer (Cambodia) "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: km_KH\n"
 
@@ -289,6 +289,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr ""
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr ""
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr ""
 
@@ -306,6 +308,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr ""
 
@@ -713,17 +716,20 @@ msgid "%s - New Messages"
 msgstr ""
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d សារ​ថ្មី"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -734,6 +740,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "បើក"
 
@@ -821,6 +828,7 @@ msgstr "សូម​ជ្រើស​រើស​ឯកសារ​មួយ"
 msgid "_Attach"
 msgstr "_ភ្ជាប់"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1328,6 +1336,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1391,3 +1400,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/lt.po b/po/lt.po
index f869032..9dbcb23 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:50+0000\n"
 "Last-Translator: aurisc4 <aurisc4 gmail com>\n"
 "Language-Team: Lietuvių <gnome-lt lists akl lt>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: lt\n"
 
@@ -296,6 +296,7 @@ msgstr "Žymėti kaip ne š_lamštą"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Žymėti pokalbį"
 
@@ -304,6 +305,7 @@ msgid "Mark conversations"
 msgstr "Žymėti pokalbius"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Pridėti žymą pokalbiui"
 
@@ -313,6 +315,7 @@ msgstr "Pridėti žymas pokalbiams"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Perkelti pokalbį"
 
@@ -750,6 +753,7 @@ msgid "%s - New Messages"
 msgstr "%s - Nauji laiškai"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d naujas laiškas"
@@ -757,6 +761,7 @@ msgstr[1] "%d nauji laiškai"
 msgstr[2] "%d naujų laiškų"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, iš viso %d naujas laiškas"
@@ -764,6 +769,7 @@ msgstr[1] "%s, iš viso %d nauji laiškai"
 msgstr[2] "%s, iš viso %d naujų laiškų"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -781,6 +787,7 @@ msgstr[2] ""
 "(%d naujų laiškų %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Atverti"
 
@@ -876,6 +883,7 @@ msgstr "Pasirinkite failą"
 msgid "_Attach"
 msgstr "_Prisegti"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Papildomi %s adresai"
@@ -1395,6 +1403,7 @@ msgid "_From:"
 msgstr "_Nuo:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1460,3 +1469,7 @@ msgstr "Ieškoti visame naudotojo pašte pagal žodžius (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksuojama %s paskyra"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/ms.po b/po/ms.po
index 9bd3d0a..353f5bc 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:51+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:53+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Malay (Malaysia) "
 "(http://www.transifex.com/projects/p/geary/language/ms_MY/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: ms_MY\n"
 
@@ -289,6 +289,7 @@ msgstr "Tanda sebagai bukan S_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Tanda perbualan"
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr "Tanda perbualan"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Tambal label ke perbualan"
 
@@ -306,6 +308,7 @@ msgstr "Tambah label ke perbualan"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Alih perbualan"
 
@@ -742,16 +745,19 @@ msgid "%s - New Messages"
 msgstr "%s - Mesej Baru"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mesej baru"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s,%d sejumlah mesej baru"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -763,6 +769,7 @@ msgstr[0] ""
 "(%d lain-lain mesej baru untuk %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Buka"
 
@@ -850,6 +857,7 @@ msgstr "Pilih satu fail"
 msgid "_Attach"
 msgstr "L_ampir"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1354,6 +1362,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1417,3 +1426,7 @@ msgstr "Gelintar semua mel dalam akaun untuk kata kunci (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Mengindeks %s akaun"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 491e070..8caddd6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:49+0000\n"
 "Last-Translator: Stas Solovey <whats_up tut by>\n"
 "Language-Team: https://l10n.gnome.org/teams/no/\n";
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: nb\n"
 
@@ -294,6 +294,7 @@ msgstr "Marker som ikke sø_ppelpost"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marker samtalen"
 
@@ -302,6 +303,7 @@ msgid "Mark conversations"
 msgstr "Marker samtaler"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Sett merkelapp på samtalen"
 
@@ -311,6 +313,7 @@ msgstr "Sett merkelapp på samtaler"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Flytt samtalen"
 
@@ -750,18 +753,21 @@ msgid "%s - New Messages"
 msgstr "%s - Nye Meldinger"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d ny melding"
 msgstr[1] "%d nye meldinger"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d ny melding totalt"
 msgstr[1] "%s, %d nye meldinger totalt"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -776,6 +782,7 @@ msgstr[1] ""
 "(%d andre nye meldinger for %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Åpne"
 
@@ -871,6 +878,7 @@ msgstr "Velg en fil"
 msgid "_Attach"
 msgstr "_Legg ved"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Flere adresser for %s"
@@ -1380,6 +1388,7 @@ msgid "_From:"
 msgstr "_Fra:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1443,3 +1452,7 @@ msgstr "Søk i all e-post på kontoen for nøkkelord (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indekserer %s konto"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/nl.po b/po/nl.po
index d56b5f1..3b3b323 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -18,15 +18,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:54+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Dutch <vertaling vrijschrift org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: nl_NL\n"
 
@@ -308,6 +308,7 @@ msgstr "S_pammarkering opheffen"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Conversatie markeren"
 
@@ -316,6 +317,7 @@ msgid "Mark conversations"
 msgstr "Conversaties markeren"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Label aan conversatie toevoegen"
 
@@ -325,6 +327,7 @@ msgstr "Label aan conversaties toevoegen"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Conversatie verplaatsen"
 
@@ -770,18 +773,21 @@ msgid "%s - New Messages"
 msgstr "%s - Nieuwe berichten"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nieuw bericht"
 msgstr[1] "%d nieuwe berichten"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, totaal %d nieuw bericht"
 msgstr[1] "%s, totaal %d nieuwe berichten"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -796,6 +802,7 @@ msgstr[1] ""
 "(%d andere nieuwe berichten voor %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Openen"
 
@@ -883,6 +890,7 @@ msgstr "Een bestand kiezen"
 msgid "_Attach"
 msgstr "_Toevoegen"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1402,6 +1410,7 @@ msgid "_From:"
 msgstr "_Van:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 #| msgid "%s (%s)"
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1468,3 +1477,7 @@ msgstr "Trefwoorden zoeken in alle berichten van account (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Bezig met indexeren van %s-account"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 04a4919..2054847 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Piotr Drąg <piotrdrag gmail com>\n"
 "Language-Team: Polish <gnomepl aviary pl>\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "X-Poedit-Country: Poland\n"
 "Language: pl\n"
@@ -306,6 +306,7 @@ msgstr "Odznacz jako _niechciana"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Oznacz wątek"
 
@@ -314,6 +315,7 @@ msgid "Mark conversations"
 msgstr "Oznacz wątek"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Nadaj etykietę wątkowi"
 
@@ -323,6 +325,7 @@ msgstr "Nadaj etykietę wątkom"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Przenieś wątek"
 
@@ -771,6 +774,7 @@ msgid "%s - New Messages"
 msgstr "%s — nowe wiadomości"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nowa wiadomość"
@@ -778,6 +782,7 @@ msgstr[1] "%d nowe wiadomości"
 msgstr[2] "%d nowych wiadomości"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, łącznie %d nowa wiadomość"
@@ -785,6 +790,7 @@ msgstr[1] "%s, łącznie %d nowe wiadomości"
 msgstr[2] "%s, łącznie %d nowych wiadomości"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -802,6 +808,7 @@ msgstr[2] ""
 "(%d innych nowych wiadomości dla %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Otwórz"
 
@@ -898,6 +905,7 @@ msgstr "Wybór pliku"
 msgid "_Attach"
 msgstr "_Załącz"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Dodatkowe adresy dla %s"
@@ -1416,6 +1424,7 @@ msgid "_From:"
 msgstr "_Od:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1482,3 +1491,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksowanie konta %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 79b5bfb..c88e72f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Pedro Albuquerque <palbuquerque73 gmail com>\n"
 "Language-Team: Português <palbuquerque73 gmail com>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: pt\n"
 
@@ -309,6 +309,7 @@ msgstr "Marcar como _Solicitado"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marcar conversa"
 
@@ -317,6 +318,7 @@ msgid "Mark conversations"
 msgstr "Marcar conversas"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Adicionar etiqueta à conversa"
 
@@ -326,6 +328,7 @@ msgstr "Adicionar etiqueta às conversas"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Mover conversa"
 
@@ -776,18 +779,21 @@ msgid "%s - New Messages"
 msgstr "%s - novas mensagens"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova mensagem"
 msgstr[1] "%d novas mensagens"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nova mensagem"
 msgstr[1] "%s, %d novas mensagens"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -802,6 +808,7 @@ msgstr[1] ""
 "(%d outras novas mensagens para %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Abrir"
 
@@ -901,6 +908,7 @@ msgstr "Escolha um ficheiro"
 msgid "_Attach"
 msgstr "_Anexar"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Endereços adicionais para %s"
@@ -1422,6 +1430,7 @@ msgid "_From:"
 msgstr "_De:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 #| msgid "%s (%s)"
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1488,3 +1497,7 @@ msgstr "Procurar palavras-chave em todo o correio da conta (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "A indexar a conta %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1dce6fb..3d9caed 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,15 +21,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:50+0000\n"
-"Last-Translator: elementary Apps team <Unknown>\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-25 01:36+0000\n"
+"Last-Translator: Cleiton Floss <cleitonfloss gmail com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: pt_BR\n"
 
@@ -53,7 +53,7 @@ msgstr "Lixeira | Lixo"
 
 #: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
 msgid "Archive | Archives"
-msgstr ""
+msgstr "Arquivo | Arquivos"
 
 #: ../src/engine/api/geary-special-folder-type.vala:24
 msgid "Inbox"
@@ -252,7 +252,7 @@ msgstr "Cliente de e-mail"
 
 #: ../src/client/application/geary-application.vala:19
 msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr ""
+msgstr "Diretos autorais 2011-2015 Fundação Yorba"
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
@@ -260,7 +260,7 @@ msgstr "Visite o website da Yorba"
 
 #: ../src/client/application/geary-controller.vala:61
 msgid "Delete conversation"
-msgstr ""
+msgstr "Apagar conversa"
 
 #: ../src/client/application/geary-controller.vala:62
 msgid "Delete conversation (Shift+Delete)"
@@ -272,11 +272,11 @@ msgstr "Excluir as conversas (Shift+Delete)"
 
 #: ../src/client/application/geary-controller.vala:67
 msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr ""
+msgstr "Mover conversa para a lixeira (Apagar, Backspace)"
 
 #: ../src/client/application/geary-controller.vala:68
 msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr ""
+msgstr "Mover conversas para a lixeira (Apagar, Backspace)"
 
 #: ../src/client/application/geary-controller.vala:72
 msgid "_Archive"
@@ -300,6 +300,7 @@ msgstr "Marcar como não S_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marcar conversação"
 
@@ -308,6 +309,7 @@ msgid "Mark conversations"
 msgstr "Marcar conversas"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Adicionar marcador à conversa"
 
@@ -317,6 +319,7 @@ msgstr "Adicionar marcador às conversas"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Mover conversa"
 
@@ -412,19 +415,19 @@ msgstr "Encaminhar (Ctrl+L, F)"
 
 #: ../src/client/application/geary-controller.vala:491
 msgid "Empty"
-msgstr ""
+msgstr "Vazio"
 
 #: ../src/client/application/geary-controller.vala:492
 msgid "Empty Spam or Trash folders"
-msgstr ""
+msgstr "esvaziar pasta de spam ou lixeira"
 
 #: ../src/client/application/geary-controller.vala:496
 msgid "Empty _Spam…"
-msgstr ""
+msgstr "Esvaziar _spam"
 
 #: ../src/client/application/geary-controller.vala:500
 msgid "Empty _Trash…"
-msgstr ""
+msgstr "Esvaziar _lixeira"
 
 #: ../src/client/application/geary-controller.vala:533
 msgid "Toggle search bar"
@@ -597,12 +600,14 @@ msgstr ""
 "Enrico Nicoletto <liverig gmail com>.\n"
 "\n"
 "Launchpad Contributions:\n"
+"  Cleiton Floss https://launchpad.net/~cleitonfloss\n";
+"  Leonardo Lemos https://launchpad.net/~leonardolemos\n";
 "  Rafael Ferreira https://launchpad.net/~rafael-f-f1-s\n";
 "  elementary Apps team https://launchpad.net/~elementary-apps";
 
 #: ../src/client/application/geary-controller.vala:1976
 msgid "Undo move (Ctrl+Z)"
-msgstr ""
+msgstr "Desfazer mudança (Ctrlz+Z)"
 
 #: ../src/client/application/geary-controller.vala:1986
 msgid "Are you sure you want to open \"%s\"?"
@@ -640,23 +645,23 @@ msgstr "Fechar mensagens de rascunhos abertas?"
 
 #: ../src/client/application/geary-controller.vala:2439
 msgid "Empty all email from your %s folder?"
-msgstr ""
+msgstr "Apagar todos os emails de sua pasta %s?"
 
 #: ../src/client/application/geary-controller.vala:2440
 msgid "This removes the email from Geary and your email server."
-msgstr ""
+msgstr "Isso irá remover o email do Geary e de seu servidor de email."
 
 #: ../src/client/application/geary-controller.vala:2441
 msgid "This cannot be undone."
-msgstr ""
+msgstr "Isto não pode ser desfeito."
 
 #: ../src/client/application/geary-controller.vala:2442
 msgid "Empty %s"
-msgstr ""
+msgstr "Esvaziar %s"
 
 #: ../src/client/application/geary-controller.vala:2459
 msgid "Error emptying %s"
-msgstr ""
+msgstr "Erro ao esvaziar %s"
 
 #: ../src/client/application/geary-controller.vala:2489
 msgid "Do you want to permanently delete this message?"
@@ -670,15 +675,15 @@ msgstr "Excluir"
 
 #: ../src/client/application/geary-controller.vala:2522
 msgid "Undo archive (Ctrl+Z)"
-msgstr ""
+msgstr "Desfazer arquivamento (Ctrl+Z)"
 
 #: ../src/client/application/geary-controller.vala:2537
 msgid "Undo trash (Ctrl+Z)"
-msgstr ""
+msgstr "Desfazer lixeira (Ctrl+Z)"
 
 #: ../src/client/application/geary-controller.vala:2590
 msgid "Undo (Ctrl+Z)"
-msgstr ""
+msgstr "Desfazer (Ctrlz+Z)"
 
 #: ../src/client/application/geary-args.vala:10
 msgid "Start Geary with hidden main window"
@@ -758,18 +763,21 @@ msgid "%s - New Messages"
 msgstr "%s - Novas Mensagens"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova mensagem"
 msgstr[1] "%d novas mensagens"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nova mensagem no total"
 msgstr[1] "%s, %d novas mensagens no total"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -784,6 +792,7 @@ msgstr[1] ""
 "(%d outras novas mensagens para %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Abrir"
 
@@ -881,9 +890,10 @@ msgstr "Escolha um arquivo"
 msgid "_Attach"
 msgstr "_Anexo"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
-msgstr ""
+msgstr "Endereços adicionais para %s"
 
 #: ../src/client/accounts/account-dialog.vala:21
 msgid "Accounts"
@@ -936,11 +946,11 @@ msgstr "Tudo"
 
 #: ../src/client/accounts/add-edit-page.vala:280
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #: ../src/client/accounts/add-edit-page.vala:282
 msgid "Preview"
-msgstr ""
+msgstr "Pré-visualizar"
 
 #: ../src/client/accounts/add-edit-page.vala:723
 msgid "Remem_ber passwords"
@@ -1391,6 +1401,7 @@ msgid "_From:"
 msgstr "_De:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1454,3 +1465,7 @@ msgstr "Pesquisar todos os e-mails na conta por palavras-chave (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexando a conta %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr "Menu"
diff --git a/po/ro.po b/po/ro.po
index c3b6802..5a78fc1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Stas Solovey <whats_up tut by>\n"
 "Language-Team: Gnome Romanian Translation Team\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
 "Language: ro\n"
@@ -297,6 +297,7 @@ msgstr "Marchează ca non-s_pam"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Marchează conversația"
 
@@ -305,6 +306,7 @@ msgid "Mark conversations"
 msgstr "Marchează conversațiile"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Adaugă etichetă conversației"
 
@@ -314,6 +316,7 @@ msgstr "Adaugă etichetă conversațiilor"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Mută conversația"
 
@@ -756,6 +759,7 @@ msgid "%s - New Messages"
 msgstr "%s - Mesaje noi"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d mesaj nou"
@@ -763,6 +767,7 @@ msgstr[1] "%d mesaje noi"
 msgstr[2] "%d de mesaje noi"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d mesaj nou în total"
@@ -770,6 +775,7 @@ msgstr[1] "%s, %d mesaje noi în total"
 msgstr[2] "%s, %d de mesaje noi în total"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -787,6 +793,7 @@ msgstr[2] ""
 "(%d alte mesaje noi pentru %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Deschide"
 
@@ -884,6 +891,7 @@ msgstr "Alegeți un fișier"
 msgid "_Attach"
 msgstr "_Atașează"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1403,6 +1411,7 @@ msgid "_From:"
 msgstr "_De la:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 #| msgid "%s (%s)"
 msgid "%s (%d)"
 msgstr "%s (%d)"
@@ -1469,3 +1478,7 @@ msgstr "Caută cuvintele cheie în toate emailurile din cont (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Se indexează contul %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 2cb10e1..b77c70f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -17,16 +17,16 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:50+0000\n"
-"Last-Translator: Stas Solovey <whats_up tut by>\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 22:37+0000\n"
+"Last-Translator: Yuly Nesterov <crow rikka io>\n"
 "Language-Team: Русский <gnome-cyr gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: ru\n"
 
@@ -299,6 +299,7 @@ msgstr "Отметить как _не Спам"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Отметить беседу"
 
@@ -307,6 +308,7 @@ msgid "Mark conversations"
 msgstr "Отметить беседы"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Добавить метку беседе"
 
@@ -316,6 +318,7 @@ msgstr "Добавить метку беседам"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Переместить беседу"
 
@@ -756,6 +759,7 @@ msgid "%s - New Messages"
 msgstr "Новые сообщения — %s"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d новое сообщение"
@@ -763,6 +767,7 @@ msgstr[1] "%d новых сообщения"
 msgstr[2] "%d новых сообщений"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, всего %d новое сообщение"
@@ -770,6 +775,7 @@ msgstr[1] "%s, всего %d новых сообщения"
 msgstr[2] "%s, всего %d новых сообщений"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -787,6 +793,7 @@ msgstr[2] ""
 "(%d других сообщений для %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Открыть"
 
@@ -882,6 +889,7 @@ msgstr "Выберите файл"
 msgid "_Attach"
 msgstr "_Прикрепить"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Дополнительные адреса для %s"
@@ -1399,6 +1407,7 @@ msgid "_From:"
 msgstr "_От:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1464,3 +1473,7 @@ msgstr "Поиск по всей почте учётной записи по к
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Индексируется учётная запись %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr "Меню"
diff --git a/po/sk.po b/po/sk.po
index 4740499..5945c4d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Dusan Kazik <prescott66 gmail com>\n"
 "Language-Team: Slovak "
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: sk\n"
 
@@ -292,6 +292,7 @@ msgstr "Označiť ako _vyžiadanú poštu"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Označí rozhovor"
 
@@ -300,6 +301,7 @@ msgid "Mark conversations"
 msgstr "Označí rozhovory"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Pridá menovku rozhovoru"
 
@@ -309,6 +311,7 @@ msgstr "Pridá menovku rozhovorom"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Presunie rozhovor"
 
@@ -752,6 +755,7 @@ msgid "%s - New Messages"
 msgstr "%s - Nové správy"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nových správ"
@@ -759,6 +763,7 @@ msgstr[1] "%d nová správa"
 msgstr[2] "%d nové správy"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, celkom %d nových správ"
@@ -766,6 +771,7 @@ msgstr[1] "%s, celkom %d nová správa"
 msgstr[2] "%s, celkom %d nové správy"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -783,6 +789,7 @@ msgstr[2] ""
 "(%d iné nové správy na účte %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Otvoriť"
 
@@ -879,6 +886,7 @@ msgstr "Zvoľte súbor"
 msgid "_Attach"
 msgstr "_Priložiť"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Dodatočné adresy pre %s"
@@ -1401,6 +1409,7 @@ msgid "_From:"
 msgstr "Od:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1466,3 +1475,7 @@ msgstr "Cyhľadá kľúčové slová vo všetkých správach poštového účtu
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexuje sa účet %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/sl.po b/po/sl.po
index e223055..416e961 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:50+0000\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
 "n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: sl_SI\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -292,6 +292,7 @@ msgstr "Označi kot _želeno pošto"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Označi pogovor"
 
@@ -300,6 +301,7 @@ msgid "Mark conversations"
 msgstr "Označi pogovore"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Dodaj oznako pogovoru"
 
@@ -309,6 +311,7 @@ msgstr "Dodaj oznako pogovorom"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Premakni pogovor"
 
@@ -715,6 +718,7 @@ msgid "%s - New Messages"
 msgstr "%s - Nova sporočila"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d novo sporočilo"
@@ -723,12 +727,14 @@ msgstr[2] "%d nova sporočila"
 msgstr[3] "%d novih sporočil"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -739,6 +745,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Odpri"
 
@@ -826,6 +833,7 @@ msgstr "Izberite datoteko"
 msgid "_Attach"
 msgstr "_Pripni"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1342,6 +1350,7 @@ msgid "_From:"
 msgstr "_Od:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1405,3 +1414,7 @@ msgstr "Preišči vso pošto v računu za ključne besede (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indeksiranje računa %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/sq.po b/po/sq.po
new file mode 100644
index 0000000..4243c6b
--- /dev/null
+++ b/po/sq.po
@@ -0,0 +1,1392 @@
+# Albanian translation for pantheon-mail
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the pantheon-mail package.
+# FIRST AUTHOR <EMAIL ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pantheon-mail\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL ADDRESS>\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 18:51+0000\n"
+"Last-Translator: Indrit Bashkimi <indrit bashkimi gmail com>\n"
+"Language-Team: Albanian <sq li org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:39+0000\n"
+"X-Generator: Launchpad (build 17850)\n"
+
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:575
+msgid "Drafts | Draft"
+msgstr ""
+
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:580
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
+
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:585
+msgid ""
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
+msgstr ""
+
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:590
+msgid "Trash | Rubbish | Rubbish Bin"
+msgstr ""
+
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:595
+msgid "Archive | Archives"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:51
+#: ../src/client/folder-list/folder-list-search-branch.vala:38
+#: ../src/client/components/search-bar.vala:10
+msgid "Search"
+msgstr "Kërko"
+
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
+msgstr ""
+
+#: ../src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr ""
+
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr "IMAP"
+
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr "SMTP"
+
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
+
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
+
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
+msgstr "Outlook.com"
+
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr ""
+
+#. / Can be typed in the search box like attachment:file.txt to find
+#. / messages with attachments with a particular name.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:710
+msgid "attachment"
+msgstr ""
+
+#. / Can be typed in the search box like bcc:johndoe example com to find
+#. / messages bcc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:714
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "bcc"
+msgstr ""
+
+#. / Can be typed in the search box like body:word to find the word only
+#. / if it occurs in the body of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:718
+msgid "body"
+msgstr ""
+
+#. / Can be typed in the search box like cc:johndoe example com to find
+#. / messages cc'd to a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:722
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "cc"
+msgstr ""
+
+#. / Can be typed in the search box like from:johndoe example com to
+#. / find messages from a particular sender.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:726
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "from"
+msgstr "nga"
+
+#. / Can be typed in the search box like subject:word to find the word
+#. / only if it occurs in the subject of a message.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:730
+msgid "subject"
+msgstr ""
+
+#. / Can be typed in the search box like to:johndoe example com to find
+#. / messages received by a particular person.  The translated
+#. / string must match the string in Geary's help documentation.
+#: ../src/engine/imap-db/imap-db-account.vala:734
+#: ../src/engine/imap-db/imap-db-account.vala:738
+msgid "to"
+msgstr ""
+
+#: ../src/engine/imap-db/imap-db-account.vala:754
+msgid "me"
+msgstr ""
+
+#: ../src/engine/rfc822/rfc822-message.vala:781
+#: ../src/client/util/util-email.vala:30
+msgid "(no subject)"
+msgstr ""
+
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/engine/rfc822/rfc822-utils.vala:215
+msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgstr ""
+
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:221
+msgid "On %1$s, %2$s wrote:"
+msgstr ""
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: ../src/engine/rfc822/rfc822-utils.vala:228
+msgid "%s wrote:"
+msgstr ""
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: ../src/engine/rfc822/rfc822-utils.vala:234
+msgid "On %s:"
+msgstr ""
+
+#: ../src/engine/rfc822/rfc822-utils.vala:263
+msgid "---------- Forwarded message ----------"
+msgstr ""
+
+#: ../src/engine/rfc822/rfc822-utils.vala:267
+msgid "From: %s\n"
+msgstr ""
+
+#: ../src/engine/rfc822/rfc822-utils.vala:268
+msgid "Subject: %s\n"
+msgstr ""
+
+#: ../src/engine/rfc822/rfc822-utils.vala:269
+msgid "Date: %s\n"
+msgstr "Data: %s\n"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:272
+msgid "To: %s\n"
+msgstr ""
+
+#: ../src/engine/rfc822/rfc822-utils.vala:275
+msgid "Cc: %s\n"
+msgstr ""
+
+#. / Placeholder filename for attachments with no filename.
+#: ../src/engine/rfc822/rfc822-utils.vala:378
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2227
+msgid "none"
+msgstr ""
+
+#: ../src/client/application/geary-application.vala:18
+msgid "Mail Client"
+msgstr ""
+
+#: ../src/client/application/geary-application.vala:19
+msgid "Copyright 2011-2015 Yorba Foundation"
+msgstr ""
+
+#: ../src/client/application/geary-application.vala:21
+msgid "Visit the Yorba web site"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:61
+msgid "Delete conversation"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:62
+msgid "Delete conversation (Shift+Delete)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:63
+msgid "Delete conversations (Shift+Delete)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:67
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:68
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:72
+msgid "_Archive"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:73
+msgid "Archive conversation (A)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:74
+msgid "Archive conversations (A)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark as S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:78
+msgid "Mark as not S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
+msgid "Mark conversation"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Mark conversations"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
+msgid "Add label to conversation"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:83
+msgid "Add label to conversations"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:84
+#: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
+msgid "Move conversation"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:85
+msgid "Move conversations"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:372
+msgid "A_ccounts"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:377
+#: ../src/client/components/stock.vala:27
+msgid "_Preferences"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:381
+#: ../src/client/components/stock.vala:25
+msgid "_Help"
+msgstr "_Ndihmë"
+
+#: ../src/client/application/geary-controller.vala:385
+#: ../src/client/components/stock.vala:21
+msgid "_About"
+msgstr "_Rreth"
+
+#: ../src/client/application/geary-controller.vala:389
+#: ../src/client/components/stock.vala:29
+msgid "_Quit"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:394
+msgid "_Mark as..."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:400
+msgid "Mark as _Read"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:406
+msgid "Mark as _Unread"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:412
+msgid "_Star"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:417
+msgid "U_nstar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:427
+msgid "Add label"
+msgstr "Shto etiketë"
+
+#: ../src/client/application/geary-controller.vala:428
+msgid "_Label"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:432
+msgid "_Move"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:436
+msgid "Compose new message (Ctrl+N, N)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:440
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1857
+msgid "_Reply"
+msgstr "_Përgjigju"
+
+#: ../src/client/application/geary-controller.vala:441
+msgid "Reply (Ctrl+R, R)"
+msgstr "Përgjigju (Ctrl+R, R)"
+
+#: ../src/client/application/geary-controller.vala:445
+msgid "R_eply All"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:446
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:451
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1867
+msgid "_Forward"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:452
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:491
+msgid "Empty"
+msgstr "Bosh"
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Empty Spam or Trash folders"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:500
+msgid "Empty _Trash…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:533
+msgid "Toggle search bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:746
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:983
+msgid "Your settings are insecure"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:984
+msgid ""
+"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
+"username and password could be read by another person on the network.  Are "
+"you sure you want to do this?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:985
+msgid "Co_ntinue"
+msgstr ""
+
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1063
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1064
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1068
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1069
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1138
+msgid "Labels"
+msgstr "Etiketat"
+
+#: ../src/client/application/geary-controller.vala:1150
+msgid "Unable to open the database for %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1151
+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 ""
+
+#: ../src/client/application/geary-controller.vala:1153
+msgid "_Rebuild"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1153
+msgid "E_xit"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1162
+msgid "Unable to rebuild database for \"%s\""
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1163
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1185
+#: ../src/client/application/geary-controller.vala:1195
+#: ../src/client/application/geary-controller.vala:1206
+msgid "Unable to open local mailbox for %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1186
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to a file permissions problem.\n"
+"\n"
+"Please check that you have read/write permissions for all files in this "
+"directory:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1196
+msgid ""
+"The version number of the local mail database is formatted for a newer "
+"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
+"work with this version of Geary.\n"
+"\n"
+"Please install the latest version of Geary and try again."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1207
+msgid ""
+"There was an error opening the local account. This is probably due to "
+"connectivity issues.\n"
+"\n"
+"Please check your network connection and restart Geary."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1715
+msgid "About %s"
+msgstr "Rreth %s"
+
+#. / Translators: add your name and email address to receive credit in the About dialog
+#. / For example: Yamada Taro <yamada taro example com>
+#: ../src/client/application/geary-controller.vala:1718
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Indrit Bashkimi https://launchpad.net/~indritbsh";
+
+#: ../src/client/application/geary-controller.vala:1976
+msgid "Undo move (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1986
+msgid "Are you sure you want to open \"%s\"?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1987
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1988
+msgid "Don't _ask me again"
+msgstr "Mos më _pyet më"
+
+#: ../src/client/application/geary-controller.vala:2006
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2008
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2011
+msgid "_Replace"
+msgstr "_Zëvendëso"
+
+#: ../src/client/application/geary-controller.vala:2309
+msgid "Close open draft messages?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2439
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2440
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2441
+msgid "This cannot be undone."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2442
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2459
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2489
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/application/geary-controller.vala:2491
+msgid "Delete"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2522
+msgid "Undo archive (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2537
+msgid "Undo trash (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2590
+msgid "Undo (Ctrl+Z)"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:11
+msgid "Output debugging information"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:12
+msgid "Log conversation monitoring"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:13
+msgid "Log network deserialization"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:14
+msgid "Log network activity"
+msgstr ""
+
+#. / The IMAP replay queue is how changes on the server are replicated on the client.
+#. / It could also be called the IMAP events queue.
+#: ../src/client/application/geary-args.vala:17
+msgid "Log IMAP replay queue"
+msgstr ""
+
+#. / Serialization is how commands and responses are converted into a stream of bytes for
+#. / network transmission
+#: ../src/client/application/geary-args.vala:20
+msgid "Log network serialization"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:21
+msgid "Log periodic activity"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:22
+msgid "Log database queries (generates lots of messages)"
+msgstr ""
+
+#. / "Normalization" can also be called "synchronization"
+#: ../src/client/application/geary-args.vala:24
+msgid "Log folder normalization"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:25
+msgid "Allow inspection of WebView"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:26
+msgid "Revoke all server certificates with TLS warnings"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:27
+msgid "Display program version"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:51
+msgid "Use %s to open a new composer window"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:52
+msgid "Please report comments, suggestions and bugs to:"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:59
+msgid "Failed to parse command line options: %s\n"
+msgstr ""
+
+#: ../src/client/application/geary-args.vala:70
+msgid "Unrecognized command line option \"%s\"\n"
+msgstr ""
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+msgid "%s - New Messages"
+msgstr ""
+
+#: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
+msgid "Open"
+msgstr "Hap"
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+msgid "Untrusted Connection: %s"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting \"Trust This Server\" or \"Always Trust This Server\" may cause "
+"your username and password to be transmitted insecurely."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary not to access this "
+"server."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting \"Don't Trust This Server\" will cause Geary to stop accessing "
+"this account."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server's certificate is not signed by a known authority"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server's identity does not match the identity in the certificate"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server's certificate has expired"
+msgstr "Certifikata e serverit ka skaduar"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server's certificate has not been activated"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server's certificate has been revoked and is now invalid"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server's certificate is considered insecure"
+msgstr "Certifikata e serverit konsiderohet e pasigurt"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server's certificate"
+msgstr ""
+
+#: ../src/client/dialogs/password-dialog.vala:16
+msgid "Geary requires your email password to continue"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:18
+msgid "Choose a file"
+msgstr "Zgjidh një skedar"
+
+#: ../src/client/dialogs/attachment-dialog.vala:23
+msgid "_Attach"
+msgstr ""
+
+#. /clear widgets
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
+msgid "Additional addresses for %s"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr ""
+
+#. / Placeholder text indicating that the user should type their first name and last name
+#: ../src/client/accounts/add-edit-page.vala:10
+msgid "First Last"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Welcome to Geary."
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:233
+msgid "Enter your account information to get started."
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:253
+msgid "2 weeks back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:254
+msgid "1 month back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "3 months back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:256
+msgid "6 months back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:257
+msgid "1 year back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:258
+msgid "2 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "4 years back"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:261
+msgid "Everything"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:280
+msgid "Edit"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:282
+msgid "Preview"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:723
+msgid "Remem_ber passwords"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:730
+msgid "Remem_ber password"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:764
+msgid "Unable to validate:\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:766
+msgid "        &#8226; Invalid account nickname.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:769
+msgid "        &#8226; Email address already added to Geary.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:773
+msgid "        &#8226; IMAP connection error.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:776
+msgid "        &#8226; IMAP username or password incorrect.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:779
+msgid "        &#8226; SMTP connection error.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:782
+msgid "        &#8226; SMTP username or password incorrect.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:786
+msgid "        &#8226; Connection error.\n"
+msgstr ""
+
+#: ../src/client/accounts/add-edit-page.vala:790
+msgid "        &#8226; Username or password incorrect.\n"
+msgstr ""
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+msgid "_Save"
+msgstr "_Ruaj"
+
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "_Shto"
+
+#. / Datetime format for 12-hour time, i.e. 8:31 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:68
+msgid "%l:%M %P"
+msgstr ""
+
+#. / Datetime format for 24-hour time, i.e. 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:71
+msgid "%H:%M"
+msgstr ""
+
+#. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:74
+msgctxt "Default clock format"
+msgid "%l:%M %P"
+msgstr ""
+
+#. / Date format for dates within the current year, i.e. Nov 8
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:78
+msgid "%b %-e"
+msgstr ""
+
+#. / Date format for dates within a different year, i.e. 02/04/10
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:83
+#, no-c-format
+msgid "%x"
+msgstr ""
+
+#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:88
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr ""
+
+#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:91
+msgid "%B %-e, %Y %-H:%M"
+msgstr ""
+
+#. / Verbose datetime format for the locale default (full month, day and time)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:94
+msgctxt "Default full date"
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr ""
+
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr "Tani"
+
+#: ../src/client/util/util-date.vala:167
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:171
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr "Dje"
+
+#. / Date format that shows the weekday (Monday, Tuesday, ...)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:183
+msgid "%A"
+msgstr ""
+
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr ""
+
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
+
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
+
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
+
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
+
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d të palexuar"
+msgstr[1] "%d të palexuar"
+
+#. / 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
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr ""
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: ../src/client/components/search-bar.vala:129
+msgid "Search %s account"
+msgstr ""
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:413
+msgid "No conversations selected."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:415
+msgid "%u conversation selected."
+msgid_plural "%u conversations selected."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:444
+msgid "No search results found."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:446
+msgid "No conversations in folder."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "This message contains remote images."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:708
+msgid "Show Images"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:709
+msgid "Always Show From Sender"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:733
+msgid "Edit Draft"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:809
+msgid "From:"
+msgstr "Nga:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:812
+msgid "To:"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:815
+msgid "Cc:"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:818
+msgid "Bcc:"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:821
+msgid "Subject:"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:824
+msgid "Date:"
+msgstr "Data:"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1139
+msgid "%u read message"
+msgid_plural "%u read messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1271
+msgid "This message was sent successfully, but could not be saved to %s."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1297
+msgid "_Copy"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1305
+msgid "Copy _Email Address"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1310
+msgid "Copy _Link"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1318
+msgid "Select _Message"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1324
+#: ../src/client/components/stock.vala:32
+msgid "Select _All"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1330
+msgid "_Inspect"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1556
+msgid "This link appears to go to"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1557
+msgid "but actually goes to"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1612
+msgid " (Invalid?)"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1718
+msgid "_Save Image As..."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1822
+msgid "_Save As..."
+msgstr "_Ruaj si..."
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1827
+msgid "Save All A_ttachments..."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1847
+msgid "Save A_ttachment..."
+msgid_plural "Save All A_ttachments..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1862
+msgid "Reply to _All"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1879
+msgid "_Mark as Read"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1883
+msgid "_Mark as Unread"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1889
+msgid "Mark Unread From _Here"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:1904
+msgid "_View Source"
+msgstr "_Shfaq burimin"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:2362
+msgid "Failed to open default text editor."
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-web-view.vala:322
+msgid "%s - Conversation Inspector"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:73
+msgid "Saved"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:74
+msgid "Saving"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:75
+msgid "Error saving"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:76
+msgid "Press Backspace to delete quote"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:77
+msgid "New Message"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:138
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|en"
+"closing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1102
+#: ../src/client/composer/composer-widget.vala:1106
+msgid "Do you want to discard this message?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1262
+msgid "Send message with an empty subject and body?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1264
+msgid "Send message with an empty subject?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1266
+msgid "Send message with an empty body?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1268
+msgid "Send message without an attachment?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1530
+msgid "Cannot add attachment"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1541
+msgid "\"%s\" could not be found."
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1548
+msgid "\"%s\" is a folder."
+msgstr "\"%s\" është një dosje."
+
+#: ../src/client/composer/composer-widget.vala:1555
+msgid "\"%s\" is an empty file."
+msgstr "\"%s\" është një skedar bosh."
+
+#: ../src/client/composer/composer-widget.vala:1569
+msgid "\"%s\" could not be opened for reading."
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1576
+msgid "\"%s\" already attached for delivery."
+msgstr ""
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: ../src/client/composer/composer-widget.vala:1585
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/client/composer/composer-widget.vala:1645
+msgid "To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+msgid "Bcc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1654
+msgid "Reply-To: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1887
+msgid "Select Color"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2322
+msgid "%1$s via %2$s"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:2364
+msgid "_From:"
+msgstr "_Nga:"
+
+#: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending..."
+msgstr "Duke dërguar..."
+
+#: ../src/client/components/conversation-find-bar.vala:214
+msgid "%i match"
+msgid_plural "%i matches"
+msgstr[0] "%i përputhje"
+msgstr[1] "%i përputhje"
+
+#: ../src/client/components/conversation-find-bar.vala:216
+msgid "%i match (wrapped)"
+msgid_plural "%i matches (wrapped)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/client/components/conversation-find-bar.vala:218
+msgid "not found"
+msgstr ""
+
+#: ../src/client/components/stock.vala:18
+msgid "_OK"
+msgstr "_OK"
+
+#: ../src/client/components/stock.vala:19
+msgid "_Cancel"
+msgstr "_Anulo"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr "_Mbyll"
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr ""
+
+#: ../src/client/components/stock.vala:26
+msgid "_Open"
+msgstr "_Hap"
+
+#: ../src/client/components/stock.vala:28
+msgid "_Print..."
+msgstr ""
+
+#: ../src/client/components/stock.vala:30
+msgid "_Remove"
+msgstr ""
+
+#: ../src/client/components/stock.vala:33
+msgid "_Keep"
+msgstr ""
+
+#: ../src/client/components/search-bar.vala:25
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr ""
+
+#: ../src/client/components/search-bar.vala:118
+msgid "Indexing %s account"
+msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 33481d9..70fc961 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Miloš Popović <gpopac gmail com>\n"
 "Language-Team: српски <gnome-sr googlegroups org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
 "Language: sr\n"
@@ -301,6 +301,7 @@ msgstr "Означи да није _непожељно"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Означи разговор"
 
@@ -309,6 +310,7 @@ msgid "Mark conversations"
 msgstr "Означи разговоре"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Додај натпис разговору"
 
@@ -318,6 +320,7 @@ msgstr "Додај натпис разговорима"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Премести разговор"
 
@@ -765,6 +768,7 @@ msgid "%s - New Messages"
 msgstr "%s — Нове поруке"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d нова порука"
@@ -772,6 +776,7 @@ msgstr[1] "%d нове поруке"
 msgstr[2] "%d нових порука"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, укупно %d нова порука"
@@ -779,6 +784,7 @@ msgstr[1] "%s, укупно %d нове поруке"
 msgstr[2] "%s, укупно %d нових порука"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -796,6 +802,7 @@ msgstr[2] ""
 "(%d других нових порука за %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Отвори"
 
@@ -890,6 +897,7 @@ msgstr "Изаберите датотеку"
 msgid "_Attach"
 msgstr "_Приложи"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Додатне адресе за %s"
@@ -1409,6 +1417,7 @@ msgid "_From:"
 msgstr "_Шаље:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1474,3 +1483,7 @@ msgstr "Потражите кључне речи у свим порукама у
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Пописујем налог „%s“"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/sr latin po b/po/sr latin po
index 1f6910b..bec768d 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
 "Language: sr\n"
@@ -296,6 +296,7 @@ msgstr "Označi da nije _nepoželjno"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Označite razgovor"
 
@@ -304,6 +305,7 @@ msgid "Mark conversations"
 msgstr "Označite razgovore"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Dodajte natpis razgovoru"
 
@@ -313,6 +315,7 @@ msgstr "Dodajte natpis razgovorima"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Premestite razgovor"
 
@@ -754,6 +757,7 @@ msgid "%s - New Messages"
 msgstr "%s — Nove poruke"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nova poruka"
@@ -761,6 +765,7 @@ msgstr[1] "%d nove poruke"
 msgstr[2] "%d novih poruka"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, ukupno %d nova poruka"
@@ -768,6 +773,7 @@ msgstr[1] "%s, ukupno %d nove poruke"
 msgstr[2] "%s, ukupno %d novih poruka"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -785,6 +791,7 @@ msgstr[2] ""
 "(%d drugih novih poruka za %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Otvori"
 
@@ -880,6 +887,7 @@ msgstr "Izaberite datoteku"
 msgid "_Attach"
 msgstr "_Priloži"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1397,6 +1405,7 @@ msgid "_From:"
 msgstr "_Šalje:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1462,3 +1471,7 @@ msgstr "Potražite ključne reči u svim porukama u nalogu (Ktrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Popisujem nalog „%s“"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 83bdb2d..ed1a584 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,15 +18,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:51+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:45+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Svenska <tp-sv listor tp-sv se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: sv\n"
 
@@ -300,6 +300,7 @@ msgstr "Markera som icke skrä_ppost"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Markera konversation"
 
@@ -308,6 +309,7 @@ msgid "Mark conversations"
 msgstr "Markera konversationer"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Lägg till en etikett till konversationen"
 
@@ -317,6 +319,7 @@ msgstr "Lägg till etiketter till konversationerna"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Flytta konversationen"
 
@@ -761,18 +764,21 @@ msgid "%s - New Messages"
 msgstr "%s - Nya meddelanden"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d nytt meddelande"
 msgstr[1] "%d nya meddelanden"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d nytt meddelande totalt"
 msgstr[1] "%s, %d nya meddelanden totalt"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -787,6 +793,7 @@ msgstr[1] ""
 "(%d andra nya meddelanden för %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Öppna"
 
@@ -883,6 +890,7 @@ msgstr "Välj en fil"
 msgid "_Attach"
 msgstr "_Bifoga"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "Ytterligare adresser för %s"
@@ -1392,6 +1400,7 @@ msgid "_From:"
 msgstr "_Från:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1455,3 +1464,7 @@ msgstr "Sök i all e-post i alla konton efter nyckelord (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Indexerar %s konto"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/te.po b/po/te.po
index 392090f..af14b7c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:51+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Telugu "
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: te\n"
 
@@ -289,6 +289,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr ""
 
@@ -297,6 +298,7 @@ msgid "Mark conversations"
 msgstr ""
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr ""
 
@@ -306,6 +308,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr ""
 
@@ -704,18 +707,21 @@ msgid "%s - New Messages"
 msgstr ""
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -726,6 +732,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "తెరువు"
 
@@ -813,6 +820,7 @@ msgstr "దస్త్రాన్ని ఎంచుకోండి"
 msgid "_Attach"
 msgstr "జోడించు (_A)"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1320,6 +1328,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1383,3 +1392,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 3112565..35741bd 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -18,15 +18,15 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:50+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:49+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: Türkçe <gnome-turk gnome org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: tr\n"
 "X-POOTLE-MTIME: 1423290848.000000\n"
@@ -306,6 +306,7 @@ msgstr "İstenen olarak İşaretle"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Konuşmayı işaretle"
 
@@ -314,6 +315,7 @@ msgid "Mark conversations"
 msgstr "Konuşmaları işaretle"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Konuşmayı etiketle"
 
@@ -323,6 +325,7 @@ msgstr "Konuşmaya etiket ekle"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Daha fazla konuşma"
 
@@ -765,16 +768,19 @@ msgid "%s - New Messages"
 msgstr "%s - Yeni İleti"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d yeni mesaj"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d toplam yeni ileti"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -786,6 +792,7 @@ msgstr[0] ""
 "(%d yeni diğer ileti %s için)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Aç"
 
@@ -882,6 +889,7 @@ msgstr "Bir dosya seçin"
 msgid "_Attach"
 msgstr "_Ekle"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1384,6 +1392,7 @@ msgid "_From:"
 msgstr "_Gönderen:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1445,3 +1454,7 @@ msgstr "Anahtar kelimeler için hesaptaki bütün postaları ara (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "%s hesabı indeksleniyor"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 8b26805..fed8340 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:50+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:50+0000\n"
 "Last-Translator: elementary Apps team <Unknown>\n"
 "Language-Team: linux.org.ua\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "X-Project-Style: gnome\n"
 "Language: uk\n"
@@ -296,6 +296,7 @@ msgstr "Зазначити не як _спам"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "Зазначити розмову"
 
@@ -304,6 +305,7 @@ msgid "Mark conversations"
 msgstr "Зазначити розмови"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "Додати мітку до розмови"
 
@@ -313,6 +315,7 @@ msgstr "Додати мітку до розмов"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "Перенести розмову"
 
@@ -753,6 +756,7 @@ msgid "%s - New Messages"
 msgstr "%s — нові листи"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d новий лист"
@@ -760,6 +764,7 @@ msgstr[1] "%d нових листа"
 msgstr[2] "%d нових листів"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, %d новий лист загалом"
@@ -767,6 +772,7 @@ msgstr[1] "%s, %d нових листа загалом"
 msgstr[2] "%s, %d нових листів загалом"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -784,6 +790,7 @@ msgstr[2] ""
 "(%d інших нових листів для %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Відкрити"
 
@@ -881,6 +888,7 @@ msgstr "Виберіть файл"
 msgid "_Attach"
 msgstr "_Долучити"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1396,6 +1404,7 @@ msgid "_From:"
 msgstr "_Від:"
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1461,3 +1470,7 @@ msgstr "Шукати всю пошту в обліковому запису за
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "Індексування облікового запису %s"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 398e957..76380fb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:52+0000\n"
 "Last-Translator: Jim Nelson <jim yorba org>\n"
 "Language-Team: Vietnamese "
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: vi\n"
 
@@ -290,6 +290,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr ""
 
@@ -298,6 +299,7 @@ msgid "Mark conversations"
 msgstr ""
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr ""
 
@@ -307,6 +309,7 @@ msgstr ""
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr ""
 
@@ -707,17 +710,20 @@ msgid "%s - New Messages"
 msgstr ""
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d tin nhắn mới"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -728,6 +734,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "Mở"
 
@@ -815,6 +822,7 @@ msgstr "Chọn một tập tin"
 msgid "_Attach"
 msgstr ""
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1322,6 +1330,7 @@ msgid "_From:"
 msgstr ""
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1385,3 +1394,7 @@ msgstr ""
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr ""
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a13373c..bea7e01 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,8 +16,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
-"PO-Revision-Date: 2015-11-23 11:52+0000\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
+"PO-Revision-Date: 2015-11-24 15:53+0000\n"
 "Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
 "Language-Team: Chinese (China) "
 "(http://www.transifex.com/projects/p/geary/language/zh_CN/)\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: zh_CN\n"
 
@@ -307,6 +307,7 @@ msgstr "取消标记为垃圾邮件(_P)"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "增加标签"
 
@@ -315,6 +316,7 @@ msgid "Mark conversations"
 msgstr "为"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "增加标签到会话"
 
@@ -324,6 +326,7 @@ msgstr "增加标签到已选会话"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "移动会话"
 
@@ -750,16 +753,19 @@ msgid "%s - New Messages"
 msgstr "%s -新邮件"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 封新邮件"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, 共 %d 封新邮件"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -771,6 +777,7 @@ msgstr[0] ""
 "(另有 %d 条新邮件给 %s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "打开"
 
@@ -858,6 +865,7 @@ msgstr "选择文件"
 msgid "_Attach"
 msgstr "附件(_A)"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr ""
@@ -1365,6 +1373,7 @@ msgid "_From:"
 msgstr "发件人(_F)："
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr ""
 
@@ -1428,3 +1437,7 @@ msgstr "在此帐号的所有邮件中搜索关键字 (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "正在索引 %s 帐号"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fc11848..6694d13 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: "
 "http://bugzilla.gnome.org/enter_bug.cgi?product=geary&keywords=I18N+L10N&comp";
 "onent=general\n"
-"POT-Creation-Date: 2015-11-20 14:02-0600\n"
+"POT-Creation-Date: 2015-11-24 09:47-0800\n"
 "PO-Revision-Date: 2015-11-23 11:50+0000\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Taiwan) "
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2015-11-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2015-11-25 05:40+0000\n"
 "X-Generator: Launchpad (build 17850)\n"
 "Language: zh_TW\n"
 
@@ -294,6 +294,7 @@ msgstr "標記為非垃圾郵件(_P)"
 
 #: ../src/client/application/geary-controller.vala:80
 #: ../src/client/application/geary-controller.vala:392
+#: ../src/client/components/main-toolbar.vala:109
 msgid "Mark conversation"
 msgstr "標記對話"
 
@@ -302,6 +303,7 @@ msgid "Mark conversations"
 msgstr "標記對話"
 
 #: ../src/client/application/geary-controller.vala:82
+#: ../src/client/components/main-toolbar.vala:114
 msgid "Add label to conversation"
 msgstr "貼加標籤到對話"
 
@@ -311,6 +313,7 @@ msgstr "貼加標籤到對話"
 
 #: ../src/client/application/geary-controller.vala:84
 #: ../src/client/application/geary-controller.vala:431
+#: ../src/client/components/main-toolbar.vala:119
 msgid "Move conversation"
 msgstr "更多對話"
 
@@ -730,16 +733,19 @@ msgid "%s - New Messages"
 msgstr "%s - 新訊息"
 
 #: ../src/client/notification/libnotify.vala:72
+#: ../src/client/notification/libnotify.vala:71
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 封新訊息"
 
 #: ../src/client/notification/libnotify.vala:75
+#: ../src/client/notification/libnotify.vala:74
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s，總計 %d 封新訊息"
 
 #: ../src/client/notification/libnotify.vala:107
+#: ../src/client/notification/libnotify.vala:105
 msgid ""
 "%s\n"
 "(%d other new message for %s)"
@@ -751,6 +757,7 @@ msgstr[0] ""
 "(%d 封其他新訊息，%s)"
 
 #: ../src/client/notification/libnotify.vala:160
+#: ../src/client/notification/libnotify.vala:158
 msgid "Open"
 msgstr "開啟"
 
@@ -838,6 +845,7 @@ msgstr "選擇一個檔案"
 msgid "_Attach"
 msgstr "附加(_A)"
 
+#. /clear widgets
 #: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:124
 msgid "Additional addresses for %s"
 msgstr "%s 的其他位址"
@@ -1339,6 +1347,7 @@ msgid "_From:"
 msgstr "寄件者(_F)："
 
 #: ../src/client/components/main-window.vala:388
+#: ../src/client/components/main-window.vala:351
 msgid "%s (%d)"
 msgstr "%s (%d)"
 
@@ -1400,3 +1409,7 @@ msgstr "以關鍵字搜尋帳號中的所有郵件 (Ctrl+S)"
 #: ../src/client/components/search-bar.vala:118
 msgid "Indexing %s account"
 msgstr "正為 %s 帳號製作索引"
+
+#: ../src/client/components/main-toolbar.vala:144
+msgid "Menu"
+msgstr ""