diff --git a/po/ja.po b/po/ja.po
index 0bc5a891..69181a6b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2019-09-15 23:26+0000\n"
+"POT-Creation-Date: 2020-02-16 20:26+0000\n"
 "PO-Revision-Date: 2019-09-20 23:30+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese (Japan) (https://l10n.gnome.org/module/geary/)\n"
@@ -35,6 +35,7 @@ msgstr "Geary でファイルを送信"
 #: desktop/org.gnome.Geary.appdata.xml.in.in:12
 #: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
+#: src/client/application/application-main-window.vala:555
 msgid "Geary"
 msgstr "Geary"
 
@@ -47,7 +48,7 @@ msgstr "メール"
 #: desktop/geary-autostart.desktop.in.in:5
 #: desktop/org.gnome.Geary.appdata.xml.in.in:16
 #: desktop/org.gnome.Geary.desktop.in.in:5
-#: src/client/application/geary-application.vala:30
+#: src/client/application/application-client.vala:32
 msgid "Send and receive email"
 msgstr "メールの送信と受信"
 
@@ -128,6 +129,10 @@ msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;メール;Eメール;E-メ
 msgid "Compose Message"
 msgstr "メッセージを作成"
 
+#: desktop/org.gnome.Geary.desktop.in.in:26
+msgid "New Window"
+msgstr ""
+
 #: desktop/org.gnome.Geary.gschema.xml:8
 msgid "Maximize window"
 msgstr "ウィンドウの最大化"
@@ -188,119 +193,146 @@ msgid "True if the folder list Paned is in the horizontal orientation."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:50
-msgid "Position of message list pane"
+msgid "Show/hide formatting toolbar"
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:51
-msgid "Position of the message list Paned grabber."
+msgid "True if the formatting toolbar in the composer is shown."
 msgstr ""
 
 #: desktop/org.gnome.Geary.gschema.xml:56
+msgid "Position of message list pane"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:57
+msgid "Position of the message list Paned grabber."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:62
 msgid "Autoselect next message"
 msgstr "次のメッセージを自動的に選択する"
 
-#: desktop/org.gnome.Geary.gschema.xml:57
+#: desktop/org.gnome.Geary.gschema.xml:63
 msgid "True if we should autoselect the next available conversation."
 msgstr "次の利用可能なスレッドを自動的に選択する場合は true にしてください。"
 
-#: desktop/org.gnome.Geary.gschema.xml:62
+#: desktop/org.gnome.Geary.gschema.xml:68
 msgid "Display message previews"
 msgstr "メッセージのプレビューを表示する"
 
-#: desktop/org.gnome.Geary.gschema.xml:63
+#: desktop/org.gnome.Geary.gschema.xml:69
 msgid "True if we should display a short preview of each message."
 msgstr "各メッセージの短いプレビューを表示する場合は true にしてください。"
 
-#: desktop/org.gnome.Geary.gschema.xml:68
+#: desktop/org.gnome.Geary.gschema.xml:74
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgid "Use single key shortcuts"
+msgstr "シングルキーショートカット"
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"Enables shortcuts for email actions that do not require pressing <Ctrl> to "
+"emulate those used by Gmail."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Languages that shall be used in the spell checker"
 msgstr "スペルチェックする言語"
 
-#: desktop/org.gnome.Geary.gschema.xml:69
+#: desktop/org.gnome.Geary.gschema.xml:83
 msgid ""
 "A list of POSIX locales, with the empty list disabling spell checking and "
 "the null list using desktop languages by default."
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:76
+#: desktop/org.gnome.Geary.gschema.xml:90
 msgid "Languages that are displayed in the spell checker popover"
 msgstr "スペルチェッカーのポップオーバーメニューに表示する言語"
 
-#: desktop/org.gnome.Geary.gschema.xml:77
+#: desktop/org.gnome.Geary.gschema.xml:91
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr "スペルチェッカーのポップオーバーメニューに常に表示する言語の一覧です。"
 
-#: desktop/org.gnome.Geary.gschema.xml:82
-msgid "Enable notification sounds"
-msgstr "通知音を有効にする"
-
-#: desktop/org.gnome.Geary.gschema.xml:83
-msgid "True to play sounds for notifications and sending."
-msgstr "true にすると通知時と送信時に音を鳴らします。"
-
-#: desktop/org.gnome.Geary.gschema.xml:88
-msgid "Show notifications for new mail"
-msgstr "新着メールの通知を表示する"
-
-#: desktop/org.gnome.Geary.gschema.xml:89
-msgid "True to show notification bubbles."
-msgstr "true にするとポップアップ通知を表示します。"
-
-#: desktop/org.gnome.Geary.gschema.xml:94
+#: desktop/org.gnome.Geary.gschema.xml:96
 msgid "Notify of new mail at startup"
 msgstr "起動時に新着メールを通知する"
 
-#: desktop/org.gnome.Geary.gschema.xml:95
+#: desktop/org.gnome.Geary.gschema.xml:97
 msgid "True to notify of new mail at startup."
 msgstr "true にすると起動時に新着メールを通知します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:100
+#: desktop/org.gnome.Geary.gschema.xml:102
 msgid "Ask when opening an attachment"
 msgstr "添付ファイルを開くときに確認する"
 
-#: desktop/org.gnome.Geary.gschema.xml:101
+#: desktop/org.gnome.Geary.gschema.xml:103
 msgid "True to ask when opening an attachment."
 msgstr "true にすると添付ファイルを開くときに確認します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:106
+#: desktop/org.gnome.Geary.gschema.xml:108
 msgid "Whether to compose emails in HTML"
 msgstr "HTML メールを作成するかどうか"
 
-#: desktop/org.gnome.Geary.gschema.xml:107
+#: desktop/org.gnome.Geary.gschema.xml:109
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "true にすると HTML メール、false にするとテキストメールを作成します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:112
+#: desktop/org.gnome.Geary.gschema.xml:114
 msgid "Advisory strategy for full-text searching"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:113
+#: desktop/org.gnome.Geary.gschema.xml:115
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr "許容できる値は“exact”、“conservative”、“aggressive”、“horizon”です。"
 
-#: desktop/org.gnome.Geary.gschema.xml:118
+#: desktop/org.gnome.Geary.gschema.xml:120
 msgid "Zoom of conversation viewer"
 msgstr "スレッドビューアーのズーム"
 
-#: desktop/org.gnome.Geary.gschema.xml:119
+#: desktop/org.gnome.Geary.gschema.xml:121
 msgid "The zoom to apply on the conservation view."
 msgstr "指定した倍率でスレッドビューを拡大または縮小します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:124
+#: desktop/org.gnome.Geary.gschema.xml:126
 msgid "Size of detached composer window"
 msgstr "分離した作成ウィンドウのサイズ"
 
-#: desktop/org.gnome.Geary.gschema.xml:125
+#: desktop/org.gnome.Geary.gschema.xml:127
 msgid "The last recorded size of the detached composer window."
 msgstr "最後に記録した、分離した作成ウィンドウのサイズです。"
 
-#: desktop/org.gnome.Geary.gschema.xml:130
+#: desktop/org.gnome.Geary.gschema.xml:132
+#, fuzzy
+#| msgid "Error sending email"
+msgid "Undo sending email delay"
+msgstr "メール送信時にエラーが発生しました"
+
+#: desktop/org.gnome.Geary.gschema.xml:133
+msgid ""
+"The number of seconds to wait before sending an email. Set to zero or less "
+"to disable."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:139
+msgid "Brief notification display time"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:140
+msgid ""
+"The length of time in seconds for which brief notifications should be "
+"displayed."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:146
 msgid "Whether we migrated the old settings"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:131
+#: desktop/org.gnome.Geary.gschema.xml:147
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -308,24 +340,24 @@ msgstr ""
 #. Translators: In-app notification label, when
 #. the app had a problem pinning an otherwise
 #. untrusted TLS certificate
-#: src/client/accounts/accounts-editor.vala:204
+#: src/client/accounts/accounts-editor.vala:210
 msgid "Failed to store certificate"
 msgstr "証明書の保存に失敗しました"
 
 #. Translators: Label for adding an email account
 #. account for a generic IMAP service provider.
-#: src/client/accounts/accounts-editor-add-pane.vala:109
+#: src/client/accounts/accounts-editor-add-pane.vala:108
 msgid "All others"
 msgstr ""
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-add-pane.vala:195
 #: src/client/accounts/accounts-editor-servers-pane.vala:316
 msgid "Check your receiving login and password"
 msgstr "受信のログイン名とパスワードを確認してください"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:211
+#: src/client/accounts/accounts-editor-add-pane.vala:210
 #: src/client/accounts/accounts-editor-servers-pane.vala:329
 msgid "Check your receiving server details"
 msgstr "受信サーバーの詳細を確認してください"
@@ -335,51 +367,51 @@ msgstr "受信サーバーの詳細を確認してください"
 #. succeeded, so the user probably needs to
 #. specify custom creds here
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-add-pane.vala:232
 #: src/client/accounts/accounts-editor-servers-pane.vala:350
 msgid "Check your sending login and password"
 msgstr "送信のログイン名とパスワードを確認してください"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:247
+#: src/client/accounts/accounts-editor-add-pane.vala:246
 #: src/client/accounts/accounts-editor-servers-pane.vala:363
 msgid "Check your sending server details"
 msgstr "送信サーバーの詳細を確認してください"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:262
+#: src/client/accounts/accounts-editor-add-pane.vala:261
 msgid "Check your email address and password"
 msgstr "メールアドレスとパスワードを確認してください"
 
 #. Translators: In-app notification label
-#: src/client/accounts/accounts-editor-add-pane.vala:273
+#: src/client/accounts/accounts-editor-add-pane.vala:272
 msgid "Could not connect, check your network"
 msgstr "接続できなかったため、ネットワークを確認してください"
 
 #. Translators: In-app notification label for a
 #. generic error creating an account
-#: src/client/accounts/accounts-editor-add-pane.vala:286
+#: src/client/accounts/accounts-editor-add-pane.vala:285
 msgid "An unexpected problem occurred"
 msgstr "予想外の問題が発生しました"
 
 #. Translators: In-app notification label, the
 #. string substitution is a more detailed reason.
-#: src/client/accounts/accounts-editor-add-pane.vala:304
+#: src/client/accounts/accounts-editor-add-pane.vala:303
 #, c-format
 msgid "Account not created: %s"
 msgstr "アカウントを作成しません: %s"
 
 #. Translators: Label for the person's actual name when adding
 #. an account
-#: src/client/accounts/accounts-editor-add-pane.vala:551
+#: src/client/accounts/accounts-editor-add-pane.vala:558
 msgid "Your name"
 msgstr "名前"
 
 #. Translators: Label used for the address part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:568
-#: src/client/accounts/accounts-editor-edit-pane.vala:501
+#: src/client/accounts/accounts-editor-add-pane.vala:575
+#: src/client/accounts/accounts-editor-edit-pane.vala:513
 msgid "Email address"
 msgstr "メールアドレス"
 
@@ -388,8 +420,8 @@ msgstr "メールアドレス"
 #. Translators: This is used as a placeholder for the
 #. address part of an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:571
-#: src/client/accounts/accounts-editor-edit-pane.vala:469
+#: src/client/accounts/accounts-editor-add-pane.vala:579
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
 msgid "person@example.com"
 msgstr "person@example.com"
 
@@ -397,15 +429,15 @@ msgstr "person@example.com"
 #. when adding an account
 #. Translators: Label for the user's login name for an
 #. IMAP, SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:585
-#: src/client/accounts/accounts-editor-servers-pane.vala:880
+#: src/client/accounts/accounts-editor-add-pane.vala:593
+#: src/client/accounts/accounts-editor-servers-pane.vala:884
 msgid "Login name"
 msgstr "ログイン名"
 
 #. Translators: Label for the user's password for an IMAP,
 #. SMTP, etc service
-#: src/client/accounts/accounts-editor-add-pane.vala:599
-#: src/client/accounts/accounts-editor-servers-pane.vala:999
+#: src/client/accounts/accounts-editor-add-pane.vala:607
+#: src/client/accounts/accounts-editor-servers-pane.vala:1006
 #: ui/password-dialog.glade:108
 msgid "Password"
 msgstr "パスワード"
@@ -414,14 +446,14 @@ msgstr "パスワード"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's IMAP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:621
-#: src/client/accounts/accounts-editor-servers-pane.vala:727
+#: src/client/accounts/accounts-editor-add-pane.vala:629
+#: src/client/accounts/accounts-editor-servers-pane.vala:728
 msgid "IMAP server"
 msgstr "IMAP サーバー"
 
 #. Translators: Placeholder for the IMAP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:624
+#: src/client/accounts/accounts-editor-add-pane.vala:632
 msgid "imap.example.com"
 msgstr "imap.example.com"
 
@@ -429,20 +461,20 @@ msgstr "imap.example.com"
 #. adding an account.
 #. Translators: This label describes the host name or IP
 #. address and port used by an account's SMTP service.
-#: src/client/accounts/accounts-editor-add-pane.vala:630
-#: src/client/accounts/accounts-editor-servers-pane.vala:733
+#: src/client/accounts/accounts-editor-add-pane.vala:638
+#: src/client/accounts/accounts-editor-servers-pane.vala:734
 msgid "SMTP server"
 msgstr "SMTP サーバー"
 
 #. Translators: Placeholder for the SMTP server hostname
 #. when adding an account.
-#: src/client/accounts/accounts-editor-add-pane.vala:633
+#: src/client/accounts/accounts-editor-add-pane.vala:641
 msgid "smtp.example.com"
 msgstr "smtp.example.com"
 
 #. Translators: Label in the account editor for the user's
 #. custom name for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:278
+#: src/client/accounts/accounts-editor-edit-pane.vala:277
 #: ui/accounts_editor_remove_pane.ui:123
 msgid "Account name"
 msgstr "アカウント名"
@@ -451,46 +483,46 @@ msgstr "アカウント名"
 #. the name of an account. The string
 #. substitution is the old name of the
 #. account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:312
+#: src/client/accounts/accounts-editor-edit-pane.vala:318
 #, c-format
 msgid "Change account name back to “%s”"
 msgstr "変更したアカウント名を“%s”に戻す"
 
 #. Translators: Tooltip for adding a new email sender/from
 #. address's address to an account
-#: src/client/accounts/accounts-editor-edit-pane.vala:336
+#: src/client/accounts/accounts-editor-edit-pane.vala:342
 msgid "Add a new sender email address"
 msgstr "新規送信者メールアドレスを追加"
 
 #. Translators: Label used to indicate the user has
 #. provided no display name for one of their sender
 #. email addresses in their account settings.
-#: src/client/accounts/accounts-editor-edit-pane.vala:417
+#: src/client/accounts/accounts-editor-edit-pane.vala:423
 msgid "Name not set"
 msgstr "名前を設定していません"
 
 #. Translators: This is used as a placeholder for the
 #. display name for an email address when editing a user's
 #. sender address preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:456
+#: src/client/accounts/accounts-editor-edit-pane.vala:464
 msgid "Sender Name"
 msgstr "送信者名"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:479
+#: src/client/accounts/accounts-editor-edit-pane.vala:491
 msgid "Remove"
 msgstr "削除"
 
 #. Translators: Label used for the display name part of an
 #. email address when editing a user's sender address
 #. preferences for an account.
-#: src/client/accounts/accounts-editor-edit-pane.vala:494
+#: src/client/accounts/accounts-editor-edit-pane.vala:506
 msgid "Sender name"
 msgstr "送信者名"
 
 #. Translators: Label used as the undo tooltip after adding an
 #. new sender email address to an account. The string
 #. substitution is the email address added.
-#: src/client/accounts/accounts-editor-edit-pane.vala:561
+#: src/client/accounts/accounts-editor-edit-pane.vala:573
 #, c-format
 msgid "Remove “%s”"
 msgstr "“%s”を削除"
@@ -498,7 +530,7 @@ msgstr "“%s”を削除"
 #. Translators: Label used as the undo tooltip after editing a
 #. sender address for an account. The string substitution is
 #. the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#: src/client/accounts/accounts-editor-edit-pane.vala:613
 #, c-format
 msgid "Undo changes to “%s”"
 msgstr "変更を“%s”に戻す"
@@ -506,7 +538,7 @@ msgstr "変更を“%s”に戻す"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:688
+#: src/client/accounts/accounts-editor-edit-pane.vala:700
 #, c-format
 msgid "Add “%s” back"
 msgstr "“%s”を元に戻す"
@@ -514,14 +546,14 @@ msgstr "“%s”を元に戻す"
 #. Translators: Label used as the undo tooltip after removing
 #. a sender address from an account. The string substitution
 #. is the email address edited.
-#: src/client/accounts/accounts-editor-edit-pane.vala:730
+#: src/client/accounts/accounts-editor-edit-pane.vala:742
 msgid "Undo signature changes"
 msgstr "署名の変更を元に戻す"
 
 #. Translators: This label describes the account
 #. preference for the length of time (weeks, months or
 #. years) that past email should be downloaded.
-#: src/client/accounts/accounts-editor-edit-pane.vala:778
+#: src/client/accounts/accounts-editor-edit-pane.vala:790
 msgid "Download mail"
 msgstr "メールのダウンロード"
 
@@ -530,98 +562,99 @@ msgstr "メールのダウンロード"
 #. should be downloaded for an account. The
 #. string substitution is the duration,
 #. e.g. "1 month back".
-#: src/client/accounts/accounts-editor-edit-pane.vala:810
+#: src/client/accounts/accounts-editor-edit-pane.vala:822
 #, c-format
 msgid "Change download period back to: %s"
 msgstr "変更したダウンロード期間を次に戻す: %s"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:831
+#: src/client/accounts/accounts-editor-edit-pane.vala:843
 msgid "Everything"
 msgstr "すべて"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:835
+#: src/client/accounts/accounts-editor-edit-pane.vala:847
 msgid "2 weeks back"
 msgstr "2週間前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:839
+#: src/client/accounts/accounts-editor-edit-pane.vala:851
 msgid "1 month back"
 msgstr "1ヶ月前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:843
+#: src/client/accounts/accounts-editor-edit-pane.vala:855
 msgid "3 months back"
 msgstr "3ヶ月前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:847
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
 msgid "6 months back"
 msgstr "6ヶ月前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:851
+#: src/client/accounts/accounts-editor-edit-pane.vala:863
 msgid "1 year back"
 msgstr "1年前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:855
+#: src/client/accounts/accounts-editor-edit-pane.vala:867
 msgid "2 years back"
 msgstr "2年前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#: src/client/accounts/accounts-editor-edit-pane.vala:871
 msgid "4 years back"
 msgstr "4年前"
 
-#: src/client/accounts/accounts-editor-edit-pane.vala:865
+#: src/client/accounts/accounts-editor-edit-pane.vala:877
 #, c-format
 msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "%d日前"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:247
-#: src/client/application/application-controller.vala:2392
+#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/application/application-main-window.vala:2053
 msgid "Undo"
 msgstr "元に戻す"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:255
+#: src/client/accounts/accounts-editor-list-pane.vala:264
+#: src/client/application/application-main-window.vala:2036
 msgid "Redo"
 msgstr "やり直す"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:349
-#: src/client/accounts/accounts-editor-list-pane.vala:437
+#: src/client/accounts/accounts-editor-list-pane.vala:358
+#: src/client/accounts/accounts-editor-list-pane.vala:446
 #: src/client/accounts/accounts-editor-row.vala:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:353
-#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-list-pane.vala:362
+#: src/client/accounts/accounts-editor-list-pane.vala:450
 #: src/client/accounts/accounts-editor-row.vala:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:357
-#: src/client/accounts/accounts-editor-list-pane.vala:445
+#: src/client/accounts/accounts-editor-list-pane.vala:366
+#: src/client/accounts/accounts-editor-list-pane.vala:454
 #: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:375
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 msgid "This account has been disabled"
 msgstr "このアカウントは無効になっています"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but because of some error are not able to be
 #. used.
-#: src/client/accounts/accounts-editor-list-pane.vala:384
+#: src/client/accounts/accounts-editor-list-pane.vala:393
 msgid "This account has encountered a problem and is unavailable"
 msgstr "このアカウントは問題が発生したため利用できません"
 
 #. Translators: Label for adding a generic email account
-#: src/client/accounts/accounts-editor-list-pane.vala:434
+#: src/client/accounts/accounts-editor-list-pane.vala:443
 msgid "Other email providers"
 msgstr "他のメールプロバイダー"
 
 #. Translators: Notification shown after removing an
 #. account. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:551
+#: src/client/accounts/accounts-editor-list-pane.vala:560
 #, c-format
 msgid "Account “%s” removed"
 msgstr "アカウント“%s”を削除しました"
@@ -629,7 +662,7 @@ msgstr "アカウント“%s”を削除しました"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:558
+#: src/client/accounts/accounts-editor-list-pane.vala:567
 #, c-format
 msgid "Account “%s” restored"
 msgstr "アカウント“%s”を復元しました"
@@ -656,8 +689,8 @@ msgstr "接続のセキュリティ"
 #. Translators: Label used when no auth scheme is used
 #. by an account's IMAP or SMTP service.
 #: src/client/accounts/accounts-editor-row.vala:479
-#: src/client/accounts/accounts-editor-servers-pane.vala:752
-#: src/client/accounts/accounts-editor-servers-pane.vala:964
+#: src/client/accounts/accounts-editor-servers-pane.vala:755
+#: src/client/accounts/accounts-editor-servers-pane.vala:970
 #: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "なし"
@@ -674,7 +707,8 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
+#: src/client/accounts/accounts-editor-row.vala:534
+#: ui/application-main-window.ui:346
 msgid "Login"
 msgstr "ログイン"
 
@@ -734,45 +768,330 @@ msgstr "送信メールをサーバーに保存"
 #. Translators: Label used when an account's IMAP or
 #. SMTP service uses OAuth2. The string replacement is
 #. the service's login name.
-#: src/client/accounts/accounts-editor-servers-pane.vala:950
+#: src/client/accounts/accounts-editor-servers-pane.vala:956
 #, c-format
 msgid "%s using OAuth2"
 msgstr "%s は OAuth2 を使用しています"
 
-#: src/client/accounts/accounts-editor-servers-pane.vala:960
+#: src/client/accounts/accounts-editor-servers-pane.vala:966
 msgid "Use receiving server login"
 msgstr "受信サーバーの情報を使う"
 
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/application-controller.vala:59
+#: src/client/application/application-attachment-manager.vala:21
 msgid "Untitled"
 msgstr "無題"
 
+#. / Translators: Dialog primary label when prompting to
+#. / overwrite a file. The string substitution is the file'sx
+#. / name.
+#: src/client/application/application-attachment-manager.vala:222
+#, c-format
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "“%s”はすでに存在します。置き換えますか?"
+
+#. / Translators: Dialog secondary label when prompting to
+#. / overwrite a file. The string substitution is the parent
+#. / folder's name.
+#: src/client/application/application-attachment-manager.vala:229
+#, c-format
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr "ファイルはすでに“%s”に存在します。置き換えると内容を上書きします。"
+
+#: src/client/application/application-attachment-manager.vala:236
+msgid "_Replace"
+msgstr "置換(_R)"
+
+#: src/client/application/application-client.vala:33
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
+#: src/client/application/application-client.vala:34
+msgid "Copyright 2016-2019 Geary Development Team."
+msgstr "Copyright 2016-2019 Geary Development Team."
+
+#: src/client/application/application-client.vala:36
+msgid "Visit the Geary web site"
+msgstr "Geary のウェブサイト"
+
+#. / Command line option
+#: src/client/application/application-client.vala:94
+msgid "Print debug logging"
+msgstr "デバッグログを表示する"
+
+#. / Command line option
+#: src/client/application/application-client.vala:97
+msgid "Start with the main window hidden (deprecated)"
+msgstr "メインウィンドウを隠して起動する (非推奨)"
+
+#. / Command line option
+#: src/client/application/application-client.vala:100
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr ""
+
+#. / Command line option
+#: src/client/application/application-client.vala:103
+msgid "Log conversation monitoring"
+msgstr "スレッドのモニタリングを記録する"
+
+#. / Command line option
+#: src/client/application/application-client.vala:106
+msgid "Log IMAP network deserialization"
+msgstr "IMAP ネットワークのデシリアライズを記録する"
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/application-client.vala:110
+msgid "Log folder normalization"
+msgstr "フォルダーの同期を記録する"
+
+#. / Command line option
+#: src/client/application/application-client.vala:113
+msgid "Log network activity"
+msgstr "ネットワークのアクティビティを記録する"
+
+#. / Command line option
+#: src/client/application/application-client.vala:116
+msgid "Log periodic activity"
+msgstr "定期的なアクティビティを記録する"
+
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/application-client.vala:121
+msgid "Log IMAP replay queue"
+msgstr "IMAP のイベントキューを記録する"
+
+#. / Command line option. Serialization is how commands and
+#. / responses are converted into a stream of bytes for
+#. / network transmission
+#: src/client/application/application-client.vala:126
+msgid "Log IMAP network serialization"
+msgstr "IMAP ネットワークのストリームを記録する"
+
+#. / Command line option
+#: src/client/application/application-client.vala:129
+msgid "Log database queries (generates lots of messages)"
+msgstr "データベースのクエリを記録する (多くのメッセージを生成します)"
+
+#. / Command line option
+#: src/client/application/application-client.vala:132
+msgid "Perform a graceful quit"
+msgstr "正常に終了する"
+
+#: src/client/application/application-client.vala:134
+#, fuzzy
+#| msgid "Use %s to open a new composer window"
+msgid "Open a new window"
+msgstr "%s を使って新規作成ウィンドウを開くことができます"
+
+#. / Command line option
+#: src/client/application/application-client.vala:137
+#, fuzzy
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "TLS 警告のあるサーバー証明書をすべて失効させる"
+
+#. / Command line option
+#: src/client/application/application-client.vala:140
+msgid "Display program version"
+msgstr "プログラムのバージョンを表示する"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:264
+msgid "Geary version"
+msgstr "Geary のバージョン"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:266
+msgid "Geary revision"
+msgstr "Geary のリビジョン"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:268
+msgid "GTK version"
+msgstr "GTK のバージョン"
+
+#. / Applciation runtime information label
+#: src/client/application/application-client.vala:275
+msgid "GLib version"
+msgstr "GLib のバージョン"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:282
+msgid "WebKitGTK version"
+msgstr "WebKitGTK のバージョン"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:289
+msgid "Desktop environment"
+msgstr "デスクトップ環境"
+
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/application-client.vala:291
+#: src/client/components/components-attachment-pane.vala:91
+msgid "Unknown"
+msgstr "不明"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:321
+msgid "Distribution name"
+msgstr "ディストリビューション名"
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:326
+msgid "Distribution release"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/application-client.vala:334
+msgid "Installation prefix"
+msgstr ""
+
+#: src/client/application/application-client.vala:587
+#, c-format
+msgid "About %s"
+msgstr "%s について"
+
+#. Translators: add your name and email address to receive
+#. credit in the About dialog For example: Yamada Taro
+#. <yamada.taro@example.com>
+#: src/client/application/application-client.vala:591
+msgid "translator-credits"
+msgstr ""
+"masami chikahiro <cmasa.z321@gmail.com>\n"
+"Minato Kanzaki <pikadcolon@gmail.com>\n"
+"pikatenor <pikatenor@gmail.com>\n"
+"sicklylife <translation@sicklylife.jp>\n"
+"UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/application-client.vala:937
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr "`--hidden` オプションは非推奨です。将来的に削除されます。"
+
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/application-client.vala:970
+#, c-format
+msgid "Unrecognised program argument: “%s”"
+msgstr "不明な引数です: “%s”"
+
 #. / Notification title.
-#: src/client/application/application-controller.vala:551
+#: src/client/application/application-controller.vala:458
 #, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "%s のメール送信時に問題が発生しました"
 
 #. / Notification body
-#: src/client/application/application-controller.vala:555
+#: src/client/application/application-controller.vala:462
 msgid "Email will not be sent until re-connected"
 msgstr "再接続するまでメールを送信しません"
 
-#: src/client/application/application-controller.vala:906
-msgid "Labels"
-msgstr "ラベル"
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:568
+#, fuzzy
+#| msgid "Conversation Shortcuts"
+msgid "Conversation marked"
+msgid_plural "Conversations marked"
+msgstr[0] "スレッドのショートカット"
 
-#. give the user two options: reset the Account local store, or exit Geary.  A third
-#. could be done to leave the Account in an unopened state, but we don't currently
-#. have provisions for that.
-#: src/client/application/application-controller.vala:919
+#. / Translators: Label for in-app notification
+#: src/client/application/application-controller.vala:574
+#, fuzzy
+#| msgid "No conversations found"
+msgid "Conversation un-marked"
+msgid_plural "Conversations un-marked"
+msgstr[0] "スレッドが見つかりません"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:600
+#: src/client/application/application-controller.vala:684
+#, fuzzy, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation moved to %s"
+msgid_plural "Conversations moved to %s"
+msgstr[0] "スレッドのショートカット"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the source folder.
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:608
+#: src/client/application/application-controller.vala:630
+#, fuzzy, c-format
+#| msgid "Conversation Shortcuts"
+msgid "Conversation restored to %s"
+msgid_plural "Conversations restored to %s"
+msgstr[0] "スレッドのショートカット"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:651
+#, fuzzy
+#| msgid "Conversation Shortcuts"
+msgid "Conversation archived"
+msgid_plural "Conversations archived"
+msgstr[0] "スレッドのショートカット"
+
+#. / Translators: Label for in-app notification. String
+#. / substitution is the name of the destination folder.
+#: src/client/application/application-controller.vala:707
+#, fuzzy, c-format
+#| msgid "Message not saved"
+msgid "Message restored to %s"
+msgid_plural "Messages restored to %s"
+msgstr[0] "メッセージが保存されませんでした"
+
+#. / Translators: Label for in-app notification.
+#: src/client/application/application-controller.vala:728
+#, fuzzy
+#| msgid "Message not saved"
+msgid "Message archived"
+msgid_plural "Messages archived"
+msgstr[0] "メッセージが保存されませんでした"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:763
+#, fuzzy, c-format
+#| msgid "Message not saved"
+msgid "Message moved to %s"
+msgid_plural "Messages moved to %s"
+msgstr[0] "メッセージが保存されませんでした"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:791
+#, fuzzy, c-format
+#| msgid "No conversations selected"
+msgid "Conversation labelled as %s"
+msgid_plural "Conversations labelled as %s"
+msgstr[0] "スレッドを選択していません"
+
+#. / Translators: Label for in-app
+#. / notification. String substitution is the name
+#. / of the destination folder.
+#: src/client/application/application-controller.vala:799
+#, c-format
+msgid "Conversation un-labelled as %s"
+msgid_plural "Conversations un-labelled as %s"
+msgstr[0] ""
+
+#: src/client/application/application-controller.vala:1222
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "%s のデータベースを開けません"
 
-#: src/client/application/application-controller.vala:920
+#: src/client/application/application-controller.vala:1223
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -796,20 +1115,20 @@ msgstr ""
 "データベースを再構築すると、すべてのローカルメールと添付ファイルが破棄されま"
 "す。<b>サーバー上のメールは影響を受けません。</b>"
 
-#: src/client/application/application-controller.vala:922
+#: src/client/application/application-controller.vala:1225
 msgid "_Rebuild"
 msgstr "再構築(_R)"
 
-#: src/client/application/application-controller.vala:922
+#: src/client/application/application-controller.vala:1225
 msgid "E_xit"
 msgstr "終了(_X)"
 
-#: src/client/application/application-controller.vala:931
+#: src/client/application/application-controller.vala:1235
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "“%s”のデータベースを再構築できません"
 
-#: src/client/application/application-controller.vala:932
+#: src/client/application/application-controller.vala:1236
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -820,17 +1139,111 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/application-controller.vala:1726
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:1559
 #, c-format
-msgid "Moved %d message to %s"
-msgid_plural "Moved %d messages to %s"
-msgstr[0] "%d 件のメッセージを %s に移動しました"
+msgid "Email sent to %s"
+msgstr ""
 
-#: src/client/application/application-controller.vala:1736
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2642
+#, c-format
+msgid "Email to %s queued for delivery"
+msgstr ""
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2706
+#, c-format
+msgid "Email to %s saved"
+msgstr ""
+
+#. / Translators: A label for an in-app notification.
+#: src/client/application/application-controller.vala:2721
+#: src/client/application/application-controller.vala:2779
+msgid "Composer could not be restored"
+msgstr ""
+
+#. / Translators: The label for an in-app notification. The
+#. / string substitution is a list of recipients of the email.
+#: src/client/application/application-controller.vala:2764
+#, c-format
+msgid "Email to %s discarded"
+msgstr ""
+
+#. / Translators: Main window title, first string
+#. / substitution being the currently selected folder name,
+#. / the second being the selected account name.
+#: src/client/application/application-main-window.vala:560
+#, c-format
+msgid "%s — %s"
+msgstr ""
+
+#: src/client/application/application-main-window.vala:967
+msgid "Labels"
+msgstr "ラベル"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1306
+#, fuzzy
+#| msgid "Do you want to permanently delete this message?"
+#| msgid_plural "Do you want to permanently delete these messages?"
+msgid "Do you want to permanently delete this conversation?"
+msgid_plural "Do you want to permanently delete these conversations?"
+msgstr[0] "このメッセージを完全に削除しますか?"
+
+#: src/client/application/application-main-window.vala:1311
+#: src/client/application/application-main-window.vala:1326
+msgid "Delete"
+msgstr "削除"
+
+#. / Translators: Primary text for a confirmation dialog
+#: src/client/application/application-main-window.vala:1321
+msgid "Do you want to permanently delete this message?"
+msgid_plural "Do you want to permanently delete these messages?"
+msgstr[0] "このメッセージを完全に削除しますか?"
+
+#: src/client/application/application-main-window.vala:1334
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr "%s フォルダーのすべてのメールを空にしますか?"
+
+#: src/client/application/application-main-window.vala:1337
+msgid "This removes the email from Geary and your email server."
+msgstr "メールを Geary とメールサーバーから削除します。"
+
+#: src/client/application/application-main-window.vala:1338
+msgid "This cannot be undone."
+msgstr "これは元に戻すことができません。"
+
+#: src/client/application/application-main-window.vala:1339
+#, c-format
+msgid "Empty %s"
+msgstr "%s を空にする"
+
+#: src/client/application/application-main-window.vala:1669
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#: src/client/components/components-attachment-pane.vala:107
+#: src/client/composer/composer-widget.vala:1834
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: src/client/components/components-attachment-pane.vala:379
 msgid "Are you sure you want to open these attachments?"
 msgstr "これらの添付ファイルを開いてもよろしいですか?"
 
-#: src/client/application/application-controller.vala:1737
+#: src/client/components/components-attachment-pane.vala:380
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -838,352 +1251,161 @@ msgstr ""
 "添付ファイルはシステムにダメージを与える可能性があります。送信元が信頼できる"
 "場合のみ開くようにしてください。"
 
-#: src/client/application/application-controller.vala:1738
+#: src/client/components/components-attachment-pane.vala:381
 msgid "Don’t _ask me again"
 msgstr "次回から表示しない(_A)"
 
-#. Translators: Dialog primary label when prompting to
-#. overwrite a file. The string substitution is the file'sx
-#. name.
-#: src/client/application/application-controller.vala:1861
-#, c-format
-msgid "A file named “%s” already exists.  Do you want to replace it?"
-msgstr "“%s”はすでに存在します。置き換えますか?"
-
-#. Translators: Dialog secondary label when prompting to
-#. overwrite a file. The string substitution is the parent
-#. folder's name.
-#: src/client/application/application-controller.vala:1868
-#, c-format
-msgid ""
-"The file already exists in “%s”.  Replacing it will overwrite its contents."
-msgstr "ファイルはすでに“%s”に存在します。置き換えると内容を上書きします。"
-
-#: src/client/application/application-controller.vala:1872
-msgid "_Replace"
-msgstr "置換(_R)"
-
-#: src/client/application/application-controller.vala:2232
-#, c-format
-msgid "Empty all email from your %s folder?"
-msgstr "%s フォルダーのすべてのメールを空にしますか?"
-
-#: src/client/application/application-controller.vala:2233
-msgid "This removes the email from Geary and your email server."
-msgstr "メールを Geary とメールサーバーから削除します。"
-
-#: src/client/application/application-controller.vala:2234
-msgid "This cannot be undone."
-msgstr "これは元に戻すことができません。"
-
-#: src/client/application/application-controller.vala:2235
-#, c-format
-msgid "Empty %s"
-msgstr "%s を空にする"
-
-#: src/client/application/application-controller.vala:2252
-#, c-format
-msgid "Error emptying %s"
-msgstr "%s を空にするときにエラーが発生しました"
-
-#: src/client/application/application-controller.vala:2283
-msgid "Do you want to permanently delete this message?"
-msgid_plural "Do you want to permanently delete these messages?"
-msgstr[0] "このメッセージを完全に削除しますか?"
-
-#: src/client/application/application-controller.vala:2285
-msgid "Delete"
-msgstr "削除"
-
-#: src/client/application/application-controller.vala:2299
-#, c-format
-msgid "Trashed %d message"
-msgid_plural "Trashed %d messages"
-msgstr[0] "%d 件のメッセージをごみ箱に移動しました"
-
-#: src/client/application/application-controller.vala:2346
-#, c-format
-msgid "Archived %d message"
-msgid_plural "Archived %d messages"
-msgstr[0] "%d 件のメッセージをアーカイブに移動しました"
-
-#. Translators: The label for an in-app notification. The
-#. string substitution is a list of recipients of the email.
-#: src/client/application/application-controller.vala:2474
-#, c-format
-msgid "Successfully sent mail to %s."
-msgstr "%s にメールを送信しました。"
-
-#: src/client/application/application-controller.vala:2552
-msgid "Failed to open default text editor."
-msgstr "デフォルトのテキストエディターの起動に失敗しました。"
-
-#: src/client/application/geary-application.vala:31
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: src/client/application/geary-application.vala:32
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 Geary Development Team."
-
-#: src/client/application/geary-application.vala:34
-msgid "Visit the Geary web site"
-msgstr "Geary のウェブサイト"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:109
-msgid "Print debug logging"
-msgstr "デバッグログを表示する"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:112
-msgid "Start with the main window hidden (deprecated)"
-msgstr "メインウィンドウを隠して起動する (非推奨)"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:115
-msgid "Enable WebKitGTK Inspector in web views"
-msgstr ""
-
-#. / Command line option
-#: src/client/application/geary-application.vala:118
-msgid "Log conversation monitoring"
-msgstr "スレッドのモニタリングを記録する"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:121
-msgid "Log IMAP network deserialization"
-msgstr "IMAP ネットワークのデシリアライズを記録する"
-
-#. / Command line option. "Normalization" can also be called
-#. / "synchronization".
-#: src/client/application/geary-application.vala:125
-msgid "Log folder normalization"
-msgstr "フォルダーの同期を記録する"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:128
-msgid "Log network activity"
-msgstr "ネットワークのアクティビティを記録する"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:131
-msgid "Log periodic activity"
-msgstr "定期的なアクティビティを記録する"
-
-#. / Command line option. The IMAP replay queue is how changes
-#. / on the server are replicated on the client.  It could
-#. / also be called the IMAP events queue.
-#: src/client/application/geary-application.vala:136
-msgid "Log IMAP replay queue"
-msgstr "IMAP のイベントキューを記録する"
-
-#. / Command line option. Serialization is how commands and
-#. / responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-application.vala:141
-msgid "Log IMAP network serialization"
-msgstr "IMAP ネットワークのストリームを記録する"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:144
-msgid "Log database queries (generates lots of messages)"
-msgstr "データベースのクエリを記録する (多くのメッセージを生成します)"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:147
-msgid "Perform a graceful quit"
-msgstr "正常に終了する"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:150
-#, fuzzy
-#| msgid "Revoke all server certificates with TLS warnings"
-msgid "Revoke all pinned TLS server certificates"
-msgstr "TLS 警告のあるサーバー証明書をすべて失効させる"
-
-#. / Command line option
-#: src/client/application/geary-application.vala:153
-msgid "Display program version"
-msgstr "プログラムのバージョンを表示する"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:280
-msgid "Geary version"
-msgstr "Geary のバージョン"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:282
-msgid "Geary revision"
-msgstr "Geary のリビジョン"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:284
-msgid "GTK version"
-msgstr "GTK のバージョン"
-
-#. / Applciation runtime information label
-#: src/client/application/geary-application.vala:291
-msgid "GLib version"
-msgstr "GLib のバージョン"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:298
-msgid "WebKitGTK version"
-msgstr "WebKitGTK のバージョン"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:305
-msgid "Desktop environment"
-msgstr "デスクトップ環境"
-
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/application/geary-application.vala:307
-#: src/client/conversation-viewer/conversation-email.vala:159
-msgid "Unknown"
-msgstr "不明"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:337
-msgid "Distribution name"
-msgstr "ディストリビューション名"
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:342
-msgid "Distribution release"
-msgstr ""
-
-#. / Application runtime information label
-#: src/client/application/geary-application.vala:350
-msgid "Installation prefix"
-msgstr ""
-
-#: src/client/application/geary-application.vala:510
-#, c-format
-msgid "About %s"
-msgstr "%s について"
-
-#. Translators: add your name and email address to receive
-#. credit in the About dialog For example: Yamada Taro
-#. <yamada.taro@example.com>
-#: src/client/application/geary-application.vala:514
-msgid "translator-credits"
-msgstr ""
-"masami chikahiro <cmasa.z321@gmail.com>\n"
-"Minato Kanzaki <pikadcolon@gmail.com>\n"
-"pikatenor <pikatenor@gmail.com>\n"
-"sicklylife <translation@sicklylife.jp>\n"
-"UTUMI Hirosi <utuhiro78@yahoo.co.jp>"
-
-#. / Warning printed to the console when a deprecated
-#. / command line option is used.
-#: src/client/application/geary-application.vala:798
-msgid "The `--hidden` option is deprecated and will be removed in the future."
-msgstr "`--hidden` オプションは非推奨です。将来的に削除されます。"
-
-#. / Command line warning, string substitution
-#. / is the given argument
-#: src/client/application/geary-application.vala:830
-#, c-format
-msgid "Unrecognised program argument: “%s”"
-msgstr "不明な引数です: “%s”"
-
-#: src/client/components/components-inspector.vala:68
+#: src/client/components/components-inspector.vala:72
 msgid "Inspector"
 msgstr ""
 
 #. / Translators: Title for Inspector logs pane
 #. / Translators: Title for problem report dialog logs pane
-#: src/client/components/components-inspector.vala:77
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:91
+#: src/client/components/components-inspector.vala:87
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:102
 msgid "Logs"
 msgstr "ログ"
 
 #. / Translators: Title for Inspector system system information pane
 #. / Translators: Title for problem report system information
 #. / pane
-#: src/client/components/components-inspector.vala:81
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:94
+#: src/client/components/components-inspector.vala:91
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:105
 msgid "System"
 msgstr "システム"
 
 #. Button label for saving problem report information
-#: src/client/components/components-inspector.vala:198
-#: src/client/components/components-inspector.vala:201
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:210
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:213
+#: src/client/components/components-inspector.vala:208
+#: src/client/components/components-inspector.vala:211
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:221
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:224
 #: ui/problem-details-dialog.ui:42
 msgid "Save As"
 msgstr "名前を付けて保存"
 
-#: src/client/components/components-inspector.vala:202
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
+#: src/client/components/components-inspector.vala:212
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:225
 #: ui/accounts_editor_servers_pane.ui:17
 msgid "Cancel"
 msgstr "キャンセル"
 
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:43
+msgid "_Automatically select next message"
+msgstr "自動的に次のメッセージを選択する(_A)"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:53
+msgid "_Display conversation preview"
+msgstr "スレッドプレビューを表示する(_D)"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:63
+msgid "Use _three pane view"
+msgstr "3ペインビューを使う(_T)"
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:73
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Single-key shortcuts"
+msgid "Use _single key email shortcuts"
+msgstr "シングルキーショートカット"
+
+#: src/client/components/components-preferences-window.vala:75
+msgid ""
+"Enable keyboard shortcuts for email actions that do not require pressing "
+"<Ctrl>"
+msgstr ""
+
+#. / Translators: Preferences label
+#: src/client/components/components-preferences-window.vala:86
+msgid "_Watch for new mail when closed"
+msgstr "閉じても新着メールを監視する(_W)"
+
+#. / Translators: Preferences tooltip
+#: src/client/components/components-preferences-window.vala:90
+msgid "Geary will keep running after all windows are closed"
+msgstr "すべてのウィンドウを閉じても Geary の実行を続けます"
+
+#. / Translators: Search entry placeholder text
+#: src/client/components/components-search-bar.vala:12
+#: src/client/folder-list/folder-list-search-branch.vala:53
+#: src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "検索"
+
+#. / Translators: Search entry tooltip
+#: src/client/components/components-search-bar.vala:32
+#, fuzzy
+#| msgid "Search all mail in account for keywords (Ctrl+S)"
+msgid "Search all mail in account for keywords"
+msgstr "アカウント内のすべてのメールをキーワードで検索(Ctrl+S)"
+
+#. / Translators: Search entry placeholder, string
+#. / replacement is the name of an account
+#: src/client/components/components-search-bar.vala:81
+#: src/client/folder-list/folder-list-search-branch.vala:54
+#, c-format
+msgid "Search %s account"
+msgstr "アカウント %s を検索"
+
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
-#: src/client/components/components-validator.vala:378
+#: src/client/components/components-validator.vala:390
 msgid "An email address is required"
 msgstr "メールアドレスは必須です"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but the address is invalid.
-#: src/client/components/components-validator.vala:382
+#: src/client/components/components-validator.vala:394
 msgid "Not a valid email address"
 msgstr "有効なメールアドレスではありません"
 
 #. Translators: Tooltip used when an entry requires a valid,
 #. resolvable server name to be entered, but one is not
 #. provided.
-#: src/client/components/components-validator.vala:428
+#: src/client/components/components-validator.vala:440
 msgid "A server name is required"
 msgstr "サーバー名は必須です"
 
 #. Translators: Tooltip used when an entry requires a valid
 #. server name to be entered, but it was unable to be
 #. looked-up in the DNS.
-#: src/client/components/components-validator.vala:433
+#: src/client/components/components-validator.vala:445
 msgid "Could not look up server name"
 msgstr "サーバー名が見つかりませんでした"
 
-#: src/client/components/main-toolbar.vala:139
+#: src/client/components/main-toolbar.vala:116
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "スレッドをマーク"
 
-#: src/client/components/main-toolbar.vala:144
+#: src/client/components/main-toolbar.vala:121
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "スレッドにラベル付け"
 
-#: src/client/components/main-toolbar.vala:149
+#: src/client/components/main-toolbar.vala:126
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "スレッドを移動"
 
-#: src/client/components/main-toolbar.vala:154
+#: src/client/components/main-toolbar.vala:131
 msgid "Archive conversation"
 msgid_plural "Archive conversations"
 msgstr[0] "スレッドをアーカイブに移動"
 
-#: src/client/components/main-toolbar.vala:163
+#: src/client/components/main-toolbar.vala:142
 msgid "Move conversation to Trash"
 msgid_plural "Move conversations to Trash"
 msgstr[0] "スレッドをごみ箱に移動"
 
-#: src/client/components/main-toolbar.vala:171
+#: src/client/components/main-toolbar.vala:152
 msgid "Delete conversation"
 msgid_plural "Delete conversations"
 msgstr[0] "スレッドを削除"
 
-#: src/client/components/main-window.vala:738
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
 #. Translators: Info bar title for a generic account
 #. problem.
 #: src/client/components/main-window-info-bar.vala:44
@@ -1253,28 +1475,6 @@ msgstr "エラーについての技術的な詳細情報を表示"
 msgid "_Retry"
 msgstr "再試行(_R)"
 
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "検索"
-
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "アカウント内のすべてのメールをキーワードで検索(Ctrl+S)"
-
-#: src/client/components/search-bar.vala:83
-#, c-format
-msgid "Indexing %s account"
-msgstr ""
-
-#: src/client/components/search-bar.vala:110
-#: src/client/folder-list/folder-list-search-branch.vala:39
-#, c-format
-msgid "Search %s account"
-msgstr "アカウント %s を検索"
-
 #. / 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…"
@@ -1315,15 +1515,15 @@ msgstr "閉じる(_C)"
 msgid "_Discard"
 msgstr "破棄(_D)"
 
-#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:56
+#: src/client/components/stock.vala:25 ui/main-toolbar-menus.ui:52
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
+#: src/client/components/stock.vala:26 ui/components-attachment-pane-menus.ui:7
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:46
+#: src/client/components/stock.vala:27 ui/main-toolbar-menus.ui:42
 msgid "_Preferences"
 msgstr "設定(_P)"
 
@@ -1340,7 +1540,8 @@ msgstr "終了(_Q)"
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+#: src/client/components/stock.vala:31
+#: ui/components-attachment-pane-menus.ui:11
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -1348,39 +1549,45 @@ msgstr "保存(_S)"
 msgid "_Keep"
 msgstr "保持(_K)"
 
-#: src/client/composer/composer-link-popover.vala:149
+#: src/client/composer/composer-link-popover.vala:139
 msgid "Link URL is not correctly formatted, e.g. http://example.com"
 msgstr "リンク URL の書式が間違っています (例: http://example.com)"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid link URL"
 msgstr "無効なリンク URL"
 
-#: src/client/composer/composer-link-popover.vala:156
+#: src/client/composer/composer-link-popover.vala:146
 msgid "Invalid email address"
 msgstr "無効なメールアドレス"
 
-#: src/client/composer/composer-widget.vala:156
+#. / Translators: Title for an empty composer window
+#: src/client/composer/composer-widget.vala:30
+msgid "New Message"
+msgstr "新規メッセージ"
+
+#: src/client/composer/composer-widget.vala:217
 msgid "Saved"
 msgstr "保存済み"
 
-#: src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:218
 msgid "Saving"
 msgstr "保存中"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:219
 msgid "Error saving"
 msgstr "保存エラー"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:220
 msgid "Press Backspace to delete quote"
 msgstr "Backspace を押すと引用を削除できます"
 
 #. Translators: This is list of keywords, separated by pipe ("|")
 #. characters, that suggest an attachment; since this is full-word
-#. checking, include all variants of each word.  No spaces are
-#. allowed.
-#: src/client/composer/composer-widget.vala:168
+#. checking, include all variants of each word. No spaces are
+#. allowed. The words will be converted to lower case based on
+#. locale and English versions included automatically.
+#: src/client/composer/composer-widget.vala:236
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1389,100 +1596,90 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1181
+#: src/client/composer/composer-widget.vala:843
 msgid "Do you want to keep or discard this draft message?"
 msgstr "この下書きメッセージを保持または破棄しますか?"
 
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. only Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1211
+#: src/client/composer/composer-widget.vala:869
 msgid "Do you want to discard this draft message?"
 msgstr "この下書きメッセージを破棄しますか?"
 
-#: src/client/composer/composer-widget.vala:1330
+#: src/client/composer/composer-widget.vala:1503
 msgid "Send message with an empty subject and body?"
 msgstr "メッセージを件名と本文なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1332
+#: src/client/composer/composer-widget.vala:1505
 msgid "Send message with an empty subject?"
 msgstr "メッセージを件名なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1334
+#: src/client/composer/composer-widget.vala:1507
 msgid "Send message with an empty body?"
 msgstr "メッセージを本文なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1338
+#: src/client/composer/composer-widget.vala:1516
 msgid "Send message without an attachment?"
 msgstr "メッセージを添付ファイルなしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1652
+#: src/client/composer/composer-widget.vala:1820
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s”はすでに添付されています。"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#. Translators: The first argument will be a
-#. description of the document type, the second will
-#. be a human-friendly size string. For example:
-#. Document (100.9MB)
-#: src/client/composer/composer-widget.vala:1660
-#: src/client/conversation-viewer/conversation-email.vala:173
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: src/client/composer/composer-widget.vala:1697
-#, c-format
-msgid "“%s” could not be found."
-msgstr "“%s”が見つかりませんでした。"
-
-#: src/client/composer/composer-widget.vala:1703
-#, c-format
-msgid "“%s” is a folder."
-msgstr "“%s”はフォルダーです。"
-
-#: src/client/composer/composer-widget.vala:1709
+#: src/client/composer/composer-widget.vala:1856
+#: src/client/composer/composer-widget.vala:1906
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s”は空ファイルです。"
 
-#: src/client/composer/composer-widget.vala:1722
+#: src/client/composer/composer-widget.vala:1894
+#, c-format
+msgid "“%s” could not be found."
+msgstr "“%s”が見つかりませんでした。"
+
+#: src/client/composer/composer-widget.vala:1900
+#, c-format
+msgid "“%s” is a folder."
+msgstr "“%s”はフォルダーです。"
+
+#: src/client/composer/composer-widget.vala:1919
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s”を読み取り用に開けませんでした。"
 
-#: src/client/composer/composer-widget.vala:1730
+#: src/client/composer/composer-widget.vala:1927
 msgid "Cannot add attachment"
 msgstr "添付できません"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1787
-#: src/client/conversation-viewer/conversation-email.vala:976
-#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
+#: src/client/composer/composer-widget.vala:1984
+#: src/client/conversation-viewer/conversation-email.vala:559
+#: src/client/util/util-email.vala:235 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "宛先:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1793
-#: src/client/conversation-viewer/conversation-email.vala:981
-#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
+#: src/client/composer/composer-widget.vala:1990
+#: src/client/conversation-viewer/conversation-email.vala:564
+#: src/client/util/util-email.vala:240 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1799
-#: src/client/conversation-viewer/conversation-email.vala:986
+#: src/client/composer/composer-widget.vala:1996
+#: src/client/conversation-viewer/conversation-email.vala:569
 #: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1805
+#: src/client/composer/composer-widget.vala:2002
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: src/client/composer/composer-widget.vala:1945
+#: src/client/composer/composer-widget.vala:2254
 msgid "Select Color"
 msgstr "色を選択"
 
@@ -1491,41 +1688,37 @@ msgstr "色を選択"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2137
+#: src/client/composer/composer-widget.vala:2439
 #, c-format
 msgid "%1$s via %2$s"
 msgstr "%1$s (%2$s を通して使用)"
 
 #. Composer label (with mnemonic underscore) for the account selector
 #. when choosing what address to send a message from.
-#: src/client/composer/composer-widget.vala:2192
+#: src/client/composer/composer-widget.vala:2495
 msgid "_From:"
 msgstr "差出人(_F):"
 
 #. Translators: This is the name of the file chooser filter
 #. when inserting an image in the composer.
-#: src/client/composer/composer-widget.vala:2472
+#: src/client/composer/composer-widget.vala:2800
 msgid "Images"
 msgstr "画像"
 
-#: src/client/composer/composer-window.vala:14
-msgid "New Message"
-msgstr "新規メッセージ"
-
-#: src/client/composer/spell-check-popover.vala:108
+#: src/client/composer/spell-check-popover.vala:125
 msgid "Remove this language from the preferred list"
 msgstr "この言語を優先リストから削除"
 
-#: src/client/composer/spell-check-popover.vala:112
+#: src/client/composer/spell-check-popover.vala:129
 msgid "Add this language to the preferred list"
 msgstr "この言語を優先リストに追加"
 
-#: src/client/composer/spell-check-popover.vala:199
+#: src/client/composer/spell-check-popover.vala:225
 msgid "Search for more languages"
 msgstr "言語を検索"
 
 #. / Translators: Context menu item
-#: src/client/conversation-list/conversation-list-view.vala:337
+#: src/client/conversation-list/conversation-list-view.vala:335
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
 msgstr[0] "スレッドをごみ箱に移動(_T)"
@@ -1536,38 +1729,38 @@ msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
 msgstr[0] "スレッドを削除(_D)"
 
-#: src/client/conversation-list/conversation-list-view.vala:356
+#: src/client/conversation-list/conversation-list-view.vala:360
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "既読としてマーク(_R)"
 
-#: src/client/conversation-list/conversation-list-view.vala:359
+#: src/client/conversation-list/conversation-list-view.vala:368
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: src/client/conversation-list/conversation-list-view.vala:362
+#: src/client/conversation-list/conversation-list-view.vala:376
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "星を外す(_N)"
 
-#: src/client/conversation-list/conversation-list-view.vala:364
+#: src/client/conversation-list/conversation-list-view.vala:383
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "星を付ける(_S)"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:367
+#: src/client/conversation-list/conversation-list-view.vala:392
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "返信(_R)"
 
-#: src/client/conversation-list/conversation-list-view.vala:368
+#: src/client/conversation-list/conversation-list-view.vala:398
 msgid "R_eply All"
 msgstr "全員に返信(_E)"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:369
+#: src/client/conversation-list/conversation-list-view.vala:404
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "転送(_F)"
@@ -1577,24 +1770,24 @@ msgid "Me"
 msgstr "自分"
 
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:971
-#: src/client/util/util-email.vala:207
+#: src/client/conversation-viewer/conversation-email.vala:554
+#: src/client/util/util-email.vala:226
 msgid "From:"
 msgstr "差出人:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:991
-#: src/client/util/util-email.vala:212
+#: src/client/conversation-viewer/conversation-email.vala:574
+#: src/client/util/util-email.vala:231
 msgid "Date:"
 msgstr "日時:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:1001
-#: src/client/util/util-email.vala:210
+#: src/client/conversation-viewer/conversation-email.vala:584
+#: src/client/util/util-email.vala:229
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/client/conversation-viewer/conversation-message.vala:129
+#: src/client/conversation-viewer/conversation-message.vala:128
 msgid "This email address may have been forged"
 msgstr "これは偽装メールアドレスである可能性があります"
 
@@ -1602,44 +1795,44 @@ msgstr "これは偽装メールアドレスである可能性があります"
 #. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:447
+#: src/client/conversation-viewer/conversation-message.vala:438
 msgid "No sender"
 msgstr "送信者なし"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:840
+#: src/client/conversation-viewer/conversation-message.vala:830
 msgid ", "
 msgstr ", "
 
 #. Translators: This string is used as the HTML IMG ALT
 #. attribute value when displaying an inline image in an email
 #. that did not specify a file name. E.g. <IMG ALT="Image" ...
-#: src/client/conversation-viewer/conversation-message.vala:960
+#: src/client/conversation-viewer/conversation-message.vala:950
 msgid "Image"
 msgstr "画像"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:82
+#: src/client/conversation-viewer/conversation-viewer.vala:83
 msgid "No conversations selected"
 msgstr "スレッドを選択していません"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:86
+#: src/client/conversation-viewer/conversation-viewer.vala:87
 msgid "Selecting a conversation from the list will display it here"
 msgstr "リストからスレッドを選択すると、ここに表示します"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:95
+#: src/client/conversation-viewer/conversation-viewer.vala:96
 msgid "Multiple conversations selected"
 msgstr "複数のスレッドを選択しています"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:99
+#: src/client/conversation-viewer/conversation-viewer.vala:100
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "選択したすべてのスレッドにアクションを適用します"
 
@@ -1647,20 +1840,20 @@ msgstr "選択したすべてのスレッドにアクションを適用します
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:108
-#: src/client/conversation-viewer/conversation-viewer.vala:121
+#: src/client/conversation-viewer/conversation-viewer.vala:109
+#: src/client/conversation-viewer/conversation-viewer.vala:122
 msgid "No conversations found"
 msgstr "スレッドが見つかりません"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:112
+#: src/client/conversation-viewer/conversation-viewer.vala:113
 msgid "This folder does not contain any conversations"
 msgstr "このフォルダーにはスレッドがありません"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:125
+#: src/client/conversation-viewer/conversation-viewer.vala:126
 msgid "Your search returned no results, try refining your search terms"
 msgstr "検索結果がないため条件を変えて再検索してください"
 
@@ -1749,7 +1942,7 @@ msgstr "サーバーの証明書を処理中にエラーが発生しました"
 #. / Translators: Title for problem report dialog error
 #. / information pane
 #. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
-#: src/client/dialogs/dialogs-problem-details-dialog.vala:89
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:100
 #: ui/problem-details-dialog.ui:12
 msgid "Details"
 msgstr "詳細"
@@ -1787,20 +1980,15 @@ msgstr "%s, %s"
 msgid "Inboxes"
 msgstr "受信トレイ"
 
-#: src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:59
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d 件の結果"
 
-#: src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s — New Messages"
-msgstr "%s — 新着メッセージ"
-
 #. / Notification body text for new email when no other
 #. / new messages are already awaiting.
-#: src/client/notification/notification-desktop.vala:90
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:68
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
@@ -1809,13 +1997,13 @@ msgstr[0] "%d 件の新着メッセージ"
 #. / Notification body text for new email when
 #. / other new messages have already been notified
 #. / about
-#: src/client/notification/notification-desktop.vala:98
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:83
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, 合計 %d 件の新着メッセージ"
 
-#: src/client/notification/notification-desktop.vala:130
+#: src/client/plugin/desktop-notifications/desktop-notifications.vala:118
 #, c-format
 msgid ""
 "%s\n"
@@ -1827,6 +2015,11 @@ msgstr[0] ""
 "%s\n"
 "(他に %d 件の新着メッセージ %s)"
 
+#: src/client/plugin/messaging-menu/messaging-menu.vala:90
+#, c-format
+msgid "%s — New Messages"
+msgstr "%s — 新着メッセージ"
+
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:69
@@ -1911,23 +2104,24 @@ msgstr "%Y/%m/%d, %H:%M"
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%Y/%m/%d, %H:%M"
 
-#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:948
+#: src/client/util/util-email.vala:38
+#: src/engine/rfc822/rfc822-message.vala:1000
 msgid "(no subject)"
 msgstr "(件名なし)"
 
-#. Translators: This is shown for displaying a list of
-#. email recipients that happens to be empty,
-#. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:116
+#. / Translators: This is shown for displaying a list of email
+#. / recipients that happens to be empty, i.e. contains no
+#. / email addresses.
+#: src/client/util/util-email.vala:134
 msgid "(No recipients)"
 msgstr "(受信者なし)"
 
-#. Translators: This is used for displaying a short list of
-#. email recipients lists with two or more addresses. The
-#. first (string) substitution is address of the first, the
-#. second substitution is the number of n - 1 remaining
-#. recipients.
-#: src/client/util/util-email.vala:130
+#. / Translators: This is used for displaying a short
+#. / list of email recipients lists with two or more
+#. / addresses. The first (string) substitution is
+#. / address of the first, the second substitution is
+#. / the number of n - 1 remaining recipients.
+#: src/client/util/util-email.vala:146
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
@@ -1936,26 +2130,26 @@ msgstr[0] "%s とその他 %d 人"
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: src/client/util/util-email.vala:160
+#: src/client/util/util-email.vala:179
 #, c-format
 msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
 #. / The quoted header for a message being replied to (in case the date is not known).
 #. / %s will be replaced by the original sender.
-#: src/client/util/util-email.vala:167
+#: src/client/util/util-email.vala:186
 #, c-format
 msgid "%s wrote:"
 msgstr ""
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: src/client/util/util-email.vala:173
+#: src/client/util/util-email.vala:192
 #, c-format
 msgid "On %s:"
 msgstr ""
 
-#: src/client/util/util-email.vala:202
+#: src/client/util/util-email.vala:221
 msgid "---------- Forwarded message ----------"
 msgstr ""
 
@@ -2036,7 +2230,7 @@ msgstr "アーカイブ"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:73
+#: src/engine/imap-db/imap-db-search-query.vala:130
 msgctxt "Search operator"
 msgid "attachment"
 msgstr ""
@@ -2049,7 +2243,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:82
+#: src/engine/imap-db/imap-db-search-query.vala:139
 msgctxt "Search operator"
 msgid "bcc"
 msgstr ""
@@ -2061,7 +2255,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:90
+#: src/engine/imap-db/imap-db-search-query.vala:147
 msgctxt "Search operator"
 msgid "body"
 msgstr ""
@@ -2074,7 +2268,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:99
+#: src/engine/imap-db/imap-db-search-query.vala:156
 msgctxt "Search operator"
 msgid "cc"
 msgstr ""
@@ -2087,7 +2281,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:108
+#: src/engine/imap-db/imap-db-search-query.vala:165
 msgctxt "Search operator"
 msgid "from"
 msgstr ""
@@ -2099,7 +2293,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:116
+#: src/engine/imap-db/imap-db-search-query.vala:173
 msgctxt "Search operator"
 msgid "is"
 msgstr ""
@@ -2111,7 +2305,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:124
+#: src/engine/imap-db/imap-db-search-query.vala:181
 msgctxt "Search operator"
 msgid "subject"
 msgstr ""
@@ -2124,7 +2318,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:133
+#: src/engine/imap-db/imap-db-search-query.vala:190
 msgctxt "Search operator"
 msgid "to"
 msgstr ""
@@ -2137,7 +2331,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:154
+#: src/engine/imap-db/imap-db-search-query.vala:211
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr ""
@@ -2149,7 +2343,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:166
+#: src/engine/imap-db/imap-db-search-query.vala:223
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr ""
@@ -2161,7 +2355,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:178
+#: src/engine/imap-db/imap-db-search-query.vala:235
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr ""
@@ -2174,7 +2368,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:189
+#: src/engine/imap-db/imap-db-search-query.vala:246
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr ""
@@ -2186,7 +2380,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/search/imap-db-search-query.vala:199
+#: src/engine/imap-db/imap-db-search-query.vala:256
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr ""
@@ -2195,7 +2389,7 @@ msgstr ""
 #. Draft mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:953
+#: src/engine/imap-engine/imap-engine-generic-account.vala:882
 msgid "Drafts | Draft"
 msgstr "下書き"
 
@@ -2203,13 +2397,13 @@ msgstr "下書き"
 #. Sent mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:962
+#: src/engine/imap-engine/imap-engine-generic-account.vala:891
 msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
 msgstr "送信済み | 送信 | 送信メール | 送信済みメール | 送信済メール"
 
 #. The localised name(s) of the Sent folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:967
+#: src/engine/imap-engine/imap-engine-generic-account.vala:896
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "送信したアイテム"
@@ -2218,7 +2412,7 @@ msgstr "送信したアイテム"
 #. Spam mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:977
+#: src/engine/imap-engine/imap-engine-generic-account.vala:906
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2228,13 +2422,13 @@ msgstr "迷惑メール | スパム | スパムメール | ごみ | ゴミ"
 #. Trash mailbox. Separate names using a vertical bar and
 #. put the most common localized name to the front for the
 #. default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:987
+#: src/engine/imap-engine/imap-engine-generic-account.vala:916
 msgid "Trash | Rubbish | Rubbish Bin"
 msgstr "ごみ箱 | ゴミ箱"
 
 #. The localised name(s) of the Trash folder name as used
 #. by MS Outlook/Exchange.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:992
+#: src/engine/imap-engine/imap-engine-generic-account.vala:921
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "削除したアイテム"
@@ -2243,10 +2437,20 @@ msgstr "削除したアイテム"
 #. Archive mailbox. Separate names using a vertical bar
 #. and put the most common localized name to the front for
 #. the default. English names do not need to be included.
-#: src/engine/imap-engine/imap-engine-generic-account.vala:1002
+#: src/engine/imap-engine/imap-engine-generic-account.vala:931
 msgid "Archive | Archives"
 msgstr "アーカイブ"
 
+#: src/engine/rfc822/rfc822-message.vala:458
+#, c-format
+msgid "Could not determine mime type for “%s”."
+msgstr ""
+
+#: src/engine/rfc822/rfc822-message.vala:469
+#, c-format
+msgid "Could not determine content type for mime type “%s” on “%s”."
+msgstr ""
+
 #: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "アカウントを追加"
@@ -2331,6 +2535,78 @@ msgstr "アカウントを削除"
 msgid "Apply"
 msgstr "適用"
 
+#. Infobar title when one or more accounts are offline
+#: ui/application-main-window.ui:185
+msgid "Working offline"
+msgstr "オフラインで作業中です"
+
+#. Label and tooltip for offline infobar
+#: ui/application-main-window.ui:199
+msgid ""
+"Your computer does not appear to be connected to the Internet.\n"
+"You will not be able to send or receive email until it is re-connected."
+msgstr ""
+"コンピューターがインターネットに接続していません。\n"
+"再接続するまでメールの送受信はできません。"
+
+#. Label and tooltip for offline infobar
+#: ui/application-main-window.ui:202
+msgid "You will not be able to send or receive email until re-connected."
+msgstr "再接続するまでメールの送受信はできません。"
+
+#. Button label for retrying TLS cert validation
+#: ui/application-main-window.ui:249
+msgid "Check"
+msgstr "確認"
+
+#. Button tooltip for retrying TLS cert validation
+#: ui/application-main-window.ui:253
+msgid "Check the security details for the connection"
+msgstr "接続のセキュリティに関する詳細を確認"
+
+#. Infobar title when one or more accounts have a TLS cert validation error
+#: ui/application-main-window.ui:282
+msgid "Security problem"
+msgstr "セキュリティの問題"
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-main-window.ui:296
+msgid ""
+"An account has reported an untrusted server.\n"
+"Please check the server configuration and try again."
+msgstr ""
+"信頼できないサーバーです。\n"
+"サーバー設定を確認して再試行してください。"
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/application-main-window.ui:299
+msgid "An account has reported an untrusted server."
+msgstr "信頼できないサーバーです。"
+
+#. Button tooltip for retrying when a login error has occurred
+#: ui/application-main-window.ui:350
+msgid "Retry login, you will be prompted for your password"
+msgstr "ログインの再試行にはパスワードが必要です"
+
+#. Infobar title when one or more accounts have a login error
+#: ui/application-main-window.ui:379
+msgid "Login problem"
+msgstr "ログインの問題"
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-main-window.ui:393
+msgid ""
+"An account has reported an incorrect login or password.\n"
+"Please check your login name and try again."
+msgstr ""
+"ログイン情報かパスワードが間違っています。\n"
+"ログイン名を確認して再試行してください。"
+
+#. Label and tooltip for authentication problem infobar
+#: ui/application-main-window.ui:396
+msgid "An account has reported an incorrect login or password."
+msgstr "ログイン情報かパスワードが間違っています。"
+
 #: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "信頼できない接続"
@@ -2347,216 +2623,318 @@ msgstr "このサーバーを信頼する(_T)"
 msgid "_Don’t Trust This Server"
 msgstr "このサーバーを信頼しない(_D)"
 
-#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
-msgid "Detach (Ctrl+D)"
-msgstr "分離(Ctrl+D)"
+#: ui/composer-headerbar.ui:23 ui/composer-headerbar.ui:107
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Detach composer window"
+msgid "Detach the composer from the window"
+msgstr "作成ウィンドウを分離する"
 
-#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
-msgid "Attach File (Ctrl+T)"
-msgstr "ファイルを添付(Ctrl+T)"
-
-#: ui/composer-headerbar.ui:107
-msgid "Include Original Attachments"
-msgstr "元の添付ファイルを含める"
-
-#: ui/composer-headerbar.ui:202
+#: ui/composer-headerbar.ui:135
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: ui/composer-headerbar.ui:207
-msgid "Send (Ctrl+Enter)"
-msgstr "送信(Ctrl+Enter)"
-
-#: ui/composer-headerbar.ui:230
+#: ui/composer-headerbar.ui:162
 msgid "Discard and Close"
 msgstr "破棄して閉じる"
 
-#: ui/composer-headerbar.ui:254
+#: ui/composer-headerbar.ui:186
 msgid "Save and Close"
 msgstr "保存して閉じる"
 
 #. Note that this button and the Update button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:41
+#: ui/composer-link-popover.ui:42
 msgid "Insert the new link with this URL"
 msgstr "この URL の新規リンクを挿入"
 
-#: ui/composer-link-popover.ui:52
+#: ui/composer-link-popover.ui:43
+#, fuzzy
+#| msgid "_Add"
+msgid "Add"
+msgstr "追加(_A)"
+
+#: ui/composer-link-popover.ui:47
 msgid "Link URL"
 msgstr "リンクの URL"
 
 #. Note that this button and the Insert button will never be shown at the same time to the user.
-#: ui/composer-link-popover.ui:66
+#: ui/composer-link-popover.ui:61
 msgid "Update this link’s URL"
 msgstr "このリンクの URL を更新"
 
-#: ui/composer-link-popover.ui:86
+#: ui/composer-link-popover.ui:62
+#, fuzzy
+#| msgid "_Update"
+msgid "Update"
+msgstr "更新(_U)"
+
+#: ui/composer-link-popover.ui:75
 msgid "Delete this link"
 msgstr "このリンクを削除"
 
-#: ui/composer-link-popover.ui:106
-msgid "Open this link"
-msgstr "このリンクを開く"
-
-#: ui/composer-menus.ui:7
-msgid "S_ans Serif"
-msgstr "Sans Serif(_A)"
-
-#: ui/composer-menus.ui:12
-msgid "S_erif"
-msgstr "Serif(_E)"
-
-#: ui/composer-menus.ui:17
-msgid "_Fixed Width"
-msgstr "等幅(_F)"
-
-#: ui/composer-menus.ui:24
-msgid "_Small"
-msgstr "小(_S)"
-
-#: ui/composer-menus.ui:29
-msgid "_Medium"
-msgstr "中(_M)"
-
-#: ui/composer-menus.ui:34
-msgid "Lar_ge"
-msgstr "大(_G)"
-
-#: ui/composer-menus.ui:41
-msgid "C_olor"
-msgstr "色(_O)"
-
-#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
-msgid "_Rich Text"
-msgstr "リッチテキスト(_R)"
-
-#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
-msgid "Show Extended Fields"
-msgstr "拡張フィールドを表示"
-
-#: ui/composer-menus.ui:78
+#: ui/composer-menus.ui:8
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: ui/composer-menus.ui:82
+#: ui/composer-menus.ui:12
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
+#: ui/composer-menus.ui:18 ui/composer-menus.ui:36
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/composer-menus.ui:22 ui/composer-menus.ui:40
 #: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
+#: ui/composer-menus.ui:26 ui/composer-menus.ui:44
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: ui/composer-menus.ui:100
+#: ui/composer-menus.ui:30
 msgctxt "Clipboard paste as plain text"
 msgid "Paste _Without Formatting"
 msgstr "書式なしで貼り付け(_W)"
 
-#: ui/composer-menus.ui:120
+#: ui/composer-menus.ui:50
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
+#: ui/composer-menus.ui:57 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "検証(_I)…"
 
-#. Address(es) e-mail is to be sent to
-#: ui/composer-widget.ui:56
-msgid "_To"
-msgstr "宛先(_T)"
-
-#: ui/composer-widget.ui:75
-msgid "_Cc"
-msgstr "Cc(_C)"
-
-#: ui/composer-widget.ui:130
-msgid "_Subject"
-msgstr "件名(_S)"
-
-#: ui/composer-widget.ui:149
-msgid "_Bcc"
-msgstr "Bcc(_B)"
-
-#: ui/composer-widget.ui:179
-msgid "_Reply-To"
-msgstr "Reply-To(_R)"
-
 #. Geary account mail will be sent from
-#: ui/composer-widget.ui:208
+#: ui/composer-widget.ui:60
 msgid "From"
 msgstr "差出人"
 
-#: ui/composer-widget.ui:293
+#. Address(es) e-mail is to be sent to
+#: ui/composer-widget.ui:130
+msgid "_To"
+msgstr "宛先(_T)"
+
+#: ui/composer-widget.ui:158
+msgid "Show Cc, Bcc, and Reply-To fields"
+msgstr ""
+
+#: ui/composer-widget.ui:219
+msgid "_Cc"
+msgstr "Cc(_C)"
+
+#: ui/composer-widget.ui:267
+msgid "_Bcc"
+msgstr "Bcc(_B)"
+
+#: ui/composer-widget.ui:315
+msgid "_Reply-To"
+msgstr "Reply-To(_R)"
+
+#: ui/composer-widget.ui:372
+msgid "_Subject"
+msgstr "件名(_S)"
+
+#: ui/composer-widget.ui:445
 msgid "Drop files here"
 msgstr "ここにファイルをドロップしてください"
 
-#: ui/composer-widget.ui:309
+#: ui/composer-widget.ui:461
 msgid "To add them as attachments"
 msgstr "添付ファイルとして追加します"
 
-#: ui/composer-widget.ui:353
-msgid "Undo last edit (Ctrl+Z)"
-msgstr "元に戻す(Ctrl+Z)"
+#: ui/composer-widget.ui:602
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Bold text"
+msgid "Bold text"
+msgstr "テキストを太字にする"
 
-#: ui/composer-widget.ui:377
-msgid "Redo last edit  (Ctrl+Shift+Z)"
-msgstr "やり直す(Ctrl+Shift+Z)"
+#: ui/composer-widget.ui:626
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Italicize text"
+msgid "Italic text"
+msgstr "テキストを斜体にする"
 
-#: ui/composer-widget.ui:415
-msgid "Bold (Ctrl+B)"
-msgstr "太字(Ctrl+B)"
+#: ui/composer-widget.ui:650
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Underline text"
+msgid "Underline text"
+msgstr "テキストに下線を引く"
 
-#: ui/composer-widget.ui:439
-msgid "Italic (Ctrl+I)"
-msgstr "斜体(Ctrl+I)"
-
-#: ui/composer-widget.ui:463
-msgid "Underline (Ctrl+U)"
-msgstr "下線(Ctrl+U)"
-
-#: ui/composer-widget.ui:487
-msgid "Strikethrough (Ctrl+K)"
-msgstr "取り消し線(Ctrl+K)"
-
-#: ui/composer-widget.ui:525
-msgid "Insert unordered list"
-msgstr "番号無しリストを挿入"
-
-#: ui/composer-widget.ui:549
-msgid "Insert ordered list"
-msgstr "番号付きリストを挿入"
-
-#: ui/composer-widget.ui:587
-msgid "Quote text  (Ctrl+])"
-msgstr "引用(Ctrl+])"
-
-#: ui/composer-widget.ui:611
-msgid "Unquote text  (Ctrl+[)"
-msgstr "引用解除(Ctrl+[)"
-
-#: ui/composer-widget.ui:649
-msgid "Insert or update selection link (Ctrl+L)"
-msgstr "選択部分にリンクを挿入/更新(Ctrl+L)"
-
-#: ui/composer-widget.ui:673
-msgid "Insert an image (Ctrl+G)"
-msgstr "画像を挿入(Ctrl+G)"
+#: ui/composer-widget.ui:674
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Strike text"
+msgid "Strikethrough text"
+msgstr "テキストに取り消し線を引く"
 
 #: ui/composer-widget.ui:707
-msgid "Remove selection formatting (Ctrl+Space)"
-msgstr "選択部分の書式を削除(Ctrl+Space)"
+#, fuzzy
+#| msgid "Insert unordered list"
+msgid "Insert bulleted list"
+msgstr "番号無しリストを挿入"
 
 #: ui/composer-widget.ui:731
+#, fuzzy
+#| msgid "Insert unordered list"
+msgid "Insert numbered list"
+msgstr "番号無しリストを挿入"
+
+#: ui/composer-widget.ui:764
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Indent or quote text"
+msgstr "テキストの引用を解除する"
+
+#: ui/composer-widget.ui:788
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Unquote text"
+msgid "Un-indent or unquote text"
+msgstr "テキストの引用を解除する"
+
+#: ui/composer-widget.ui:817
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Remove formatting"
+msgid "Remove text formatting"
+msgstr "書式を削除する"
+
+#: ui/composer-widget.ui:836
+msgid "Change font type"
+msgstr ""
+
+#: ui/composer-widget.ui:851
+msgid "Sans Serif"
+msgstr "ゴシック体"
+
+#: ui/composer-widget.ui:862
+msgid "Serif"
+msgstr "明朝体"
+
+#: ui/composer-widget.ui:873
+#, fuzzy
+#| msgid "_Fixed Width"
+msgid "Fixed Width"
+msgstr "等幅(_F)"
+
+#: ui/composer-widget.ui:899
+msgid "Change font color"
+msgstr ""
+
+#: ui/composer-widget.ui:914
+msgid "Change font size"
+msgstr ""
+
+#: ui/composer-widget.ui:949
+#, fuzzy
+#| msgid "Insert or update selection link (Ctrl+L)"
+msgid "Insert or update text link"
+msgstr "選択部分にリンクを挿入/更新(Ctrl+L)"
+
+#: ui/composer-widget.ui:973
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Insert an image"
+msgid "Insert an image"
+msgstr "画像を挿入する"
+
+#: ui/composer-widget.ui:1015
+#, fuzzy
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Undo last edit"
+msgstr "元に戻す(Ctrl+Z)"
+
+#: ui/composer-widget.ui:1039
+#, fuzzy
+#| msgid "Undo last edit (Ctrl+Z)"
+msgid "Redo last edit"
+msgstr "元に戻す(Ctrl+Z)"
+
+#: ui/composer-widget.ui:1068 ui/composer-widget.ui:1093
+#, fuzzy
+#| msgid "Choose a file"
+msgid "Attach a file"
+msgstr "ファイルを選択"
+
+#: ui/composer-widget.ui:1117
+#, fuzzy
+#| msgid "Include Original Attachments"
+msgid "Add original attachments"
+msgstr "元の添付ファイルを含める"
+
+#: ui/composer-widget.ui:1162
+#, fuzzy
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
+msgid "More options"
+msgstr "スレッドを移動"
+
+#: ui/composer-widget.ui:1182
+msgid "Show formatting toolbar"
+msgstr ""
+
+#: ui/composer-widget.ui:1200
 msgid "Select spell checking languages"
 msgstr "スペルチェックする言語を選択"
 
+#: ui/composer-widget.ui:1263
+msgid "S_ans Serif"
+msgstr "Sans Serif(_A)"
+
+#: ui/composer-widget.ui:1268
+msgid "S_erif"
+msgstr "Serif(_E)"
+
+#: ui/composer-widget.ui:1273
+msgid "_Fixed Width"
+msgstr "等幅(_F)"
+
+#: ui/composer-widget.ui:1283
+msgid "_Small"
+msgstr "小(_S)"
+
+#: ui/composer-widget.ui:1288
+msgid "_Medium"
+msgstr "中(_M)"
+
+#: ui/composer-widget.ui:1293
+msgid "Lar_ge"
+msgstr "大(_G)"
+
+#: ui/composer-widget.ui:1303
+msgid "_Rich Text"
+msgstr "リッチテキスト(_R)"
+
+#: ui/composer-widget.ui:1308
+#, fuzzy
+#| msgid "_Rich Text"
+msgid "_Plain Text"
+msgstr "リッチテキスト(_R)"
+
+#: ui/components-attachment-pane.ui:29 ui/components-attachment-pane.ui:47
+msgid "Select all attachments"
+msgstr "すべての添付ファイルを選択"
+
+#: ui/components-attachment-pane.ui:66
+msgid "Save selected attachments"
+msgstr "選択した添付ファイルを保存"
+
+#: ui/components-attachment-pane.ui:85
+msgid "Open selected attachments"
+msgstr "選択した添付ファイルを開く"
+
+#: ui/components-attachment-pane-menus.ui:17
+#, fuzzy
+#| msgid "_Save All"
+msgid "Save _All"
+msgstr "すべて保存(_S)"
+
 #: ui/components-inspector-error-view.ui:33
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
@@ -2573,14 +2951,6 @@ msgstr ""
 msgid "Details:"
 msgstr "詳細:"
 
-#: ui/components-inspector-log-view.ui:13
-msgid "Inspector opened"
-msgstr ""
-
-#: ui/components-inspector-log-view.ui:65
-msgid "column"
-msgstr ""
-
 #. Tooltip for inspector button
 #: ui/components-inspector.ui:20
 msgid "Toggle appending new log entries"
@@ -2662,39 +3032,23 @@ msgstr "このメッセージに星を付ける"
 msgid "Mark this message as not starred"
 msgstr "このメッセージの星を外す"
 
-#: ui/conversation-email.ui:95
-msgid "Display the message menu"
-msgstr "メッセージメニューを表示"
-
-#: ui/conversation-email.ui:161
-msgid "Open selected attachments"
-msgstr "選択した添付ファイルを開く"
-
-#: ui/conversation-email.ui:178
-msgid "Save selected attachments"
-msgstr "選択した添付ファイルを保存"
-
-#: ui/conversation-email.ui:195
-msgid "Select all attachments"
-msgstr "すべての添付ファイルを選択"
-
-#: ui/conversation-email.ui:240
+#: ui/conversation-email.ui:124
 msgid "Edit Draft"
 msgstr "下書きを編集"
 
-#: ui/conversation-email.ui:267
+#: ui/conversation-email.ui:151
 msgid "Draft message"
 msgstr "下書きメッセージ"
 
-#: ui/conversation-email.ui:283
+#: ui/conversation-email.ui:167
 msgid "This message has not yet been sent."
 msgstr "このメッセージはまだ送信していません。"
 
-#: ui/conversation-email.ui:329
+#: ui/conversation-email.ui:213
 msgid "Message not saved"
 msgstr "メッセージが保存されませんでした"
 
-#: ui/conversation-email.ui:345
+#: ui/conversation-email.ui:229
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "このメッセージを送信しましたが、お使いのアカウントに保存されませんでした。"
@@ -2736,9 +3090,26 @@ msgstr "メッセージを削除(_D)…"
 msgid "_View Source"
 msgstr "ソースを表示(_V)"
 
-#: ui/conversation-email-menus.ui:87
-msgid "_Save All"
-msgstr "すべて保存(_S)"
+#: ui/conversation-message-link-popover.ui:54
+msgid "But actually goes to:"
+msgstr "実際の行き先:"
+
+#: ui/conversation-message-link-popover.ui:84
+msgid "The link appears to go to:"
+msgstr "リンクの表示上の行き先:"
+
+#: ui/conversation-message-link-popover.ui:96
+msgid "Deceptive link found"
+msgstr "虚偽リンクが見つかりました"
+
+#: ui/conversation-message-link-popover.ui:111
+msgid "The email sender may be leading you to the wrong web site."
+msgstr ""
+"このメールの送信者は不適切なウェブサイトに誘導している可能性があります。"
+
+#: ui/conversation-message-link-popover.ui:124
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr "不明な場合は、続行する前に送信者に連絡して確認してください。"
 
 #: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
@@ -2804,27 +3175,6 @@ msgstr "リモート画像は表示しません"
 msgid "Only show remote images from senders you trust."
 msgstr "信頼できる送信者のリモート画像のみ表示するようにしてください。"
 
-#: ui/conversation-message.ui:692
-msgid "But actually goes to:"
-msgstr "実際の行き先:"
-
-#: ui/conversation-message.ui:723
-msgid "The link appears to go to:"
-msgstr "リンクの表示上の行き先:"
-
-#: ui/conversation-message.ui:735
-msgid "Deceptive link found"
-msgstr "虚偽リンクが見つかりました"
-
-#: ui/conversation-message.ui:750
-msgid "The email sender may be leading you to the wrong web site."
-msgstr ""
-"このメールの送信者は不適切なウェブサイトに誘導している可能性があります。"
-
-#: ui/conversation-message.ui:763
-msgid "If unsure, contact the sender and ask before continuing."
-msgstr "不明な場合は、続行する前に送信者に連絡して確認してください。"
-
 #: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "スレッド内を検索"
@@ -2861,7 +3211,7 @@ msgstr "ラベル"
 msgid "Conversation Shortcuts"
 msgstr "スレッドのショートカット"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:355
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "アクション"
@@ -2876,55 +3226,73 @@ msgctxt "shortcut window"
 msgid "Reply to sender"
 msgstr "送信者に返信する"
 
-#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:269
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "全員に返信する"
 
-#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:276
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "転送する"
 
-#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:283
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
 msgstr "既読マークを付ける/外す"
 
-#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:290
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
 msgstr "星を付ける/外す"
 
-#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:297
+#, fuzzy
+#| msgid "Archive conversation"
+#| msgid_plural "Archive conversations"
 msgctxt "shortcut window"
-msgid "Archive conversation"
-msgstr "スレッドをアーカイブに移動する"
+msgid "Archive conversations"
+msgstr "スレッドをアーカイブに移動"
 
-#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:304
+#, fuzzy
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
 msgctxt "shortcut window"
-msgid "Move conversation"
-msgstr "スレッドを移動する"
+msgid "Move conversations"
+msgstr "スレッドを移動"
 
-#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:311
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Label conversation"
 msgctxt "shortcut window"
-msgid "Label conversation"
+msgid "Label conversations"
 msgstr "スレッドにラベルを付ける"
 
 #: ui/gtk/help-overlay.ui:80
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Trash conversation"
 msgctxt "shortcut window"
-msgid "Trash conversation"
+msgid "Trash conversations"
 msgstr "スレッドをごみ箱に移動する"
 
-#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:318
+#, fuzzy
+#| msgid "Mark conversation"
+#| msgid_plural "Mark conversations"
 msgctxt "shortcut window"
-msgid "Move to Spam"
-msgstr "迷惑メールに移動する"
+msgid "Junk conversations"
+msgstr "スレッドをマーク"
 
-#: ui/gtk/help-overlay.ui:95
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:325
+#, fuzzy
+#| msgid "Delete conversation"
+#| msgid_plural "Delete conversations"
 msgctxt "shortcut window"
-msgid "Delete conversation"
-msgstr "スレッドを削除する"
+msgid "Delete conversations"
+msgstr "スレッドを削除"
 
 #: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
@@ -2976,7 +3344,7 @@ msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "拡大/縮小をリセットする"
 
-#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:375
 msgctxt "shortcut window"
 msgid "General"
 msgstr "全般"
@@ -2992,177 +3360,194 @@ msgid "Show keyboard shortcuts"
 msgstr "キーボードショートカットを表示する"
 
 #: ui/gtk/help-overlay.ui:206
+#, fuzzy
+#| msgid "Use %s to open a new composer window"
 msgctxt "shortcut window"
-msgid "Close current window"
-msgstr "現在のウィンドウを閉じる"
+msgid "Open a new window"
+msgstr "%s を使って新規作成ウィンドウを開くことができます"
 
 #: ui/gtk/help-overlay.ui:213
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Close current window"
+msgctxt "shortcut window"
+msgid "Close the current window"
+msgstr "現在のウィンドウを閉じる"
+
+#: ui/gtk/help-overlay.ui:220
 msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "アプリケーションを終了する"
 
-#: ui/gtk/help-overlay.ui:222
+#: ui/gtk/help-overlay.ui:229
 msgctxt "shortcut window"
 msgid "Keyboard navigation"
 msgstr "キーボードナビゲーション"
 
-#: ui/gtk/help-overlay.ui:226
-msgctxt "shortcut window"
-msgid "Focus the next pane"
-msgstr "フォーカスを次のペインに移動する"
-
 #: ui/gtk/help-overlay.ui:233
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Focus the previous pane"
 msgctxt "shortcut window"
-msgid "Focus the previous pane"
+msgid "Go to next/previous pane"
 msgstr "フォーカスを前のペインに移動する"
 
-#: ui/gtk/help-overlay.ui:240
+#: ui/gtk/help-overlay.ui:241
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Select the conversation up"
 msgctxt "shortcut window"
-msgid "Focus the conversation list"
-msgstr "スレッドリストにフォーカスを移動する"
-
-#: ui/gtk/help-overlay.ui:247
-msgctxt "shortcut window"
-msgid "Select the conversation down"
-msgstr "下のスレッドを選択する"
-
-#: ui/gtk/help-overlay.ui:254
-msgctxt "shortcut window"
-msgid "Select the conversation up"
+msgid "Select next/previous conversation"
 msgstr "上のスレッドを選択する"
 
-#: ui/gtk/help-overlay.ui:261
+#: ui/gtk/help-overlay.ui:248
 msgctxt "shortcut window"
 msgid "Focus next/previous message"
 msgstr "フォーカスを次/前のメッセージに移動する"
 
-#: ui/gtk/help-overlay.ui:271
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Single-key shortcuts"
 msgstr "シングルキーショートカット"
 
-#: ui/gtk/help-overlay.ui:275
+#: ui/gtk/help-overlay.ui:262
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "送信者に返信する "
 
-#: ui/gtk/help-overlay.ui:343
+#: ui/gtk/help-overlay.ui:332
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Find in current conversation"
+msgctxt "shortcut window"
+msgid "Find in current conversations"
+msgstr "現在のスレッド内を検索する"
+
+#: ui/gtk/help-overlay.ui:339
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Select the conversation up"
+msgctxt "shortcut window"
+msgid "Select next/previous conversations"
+msgstr "上のスレッドを選択する"
+
+#: ui/gtk/help-overlay.ui:351
 msgid "Composer Shortcuts"
 msgstr "作成画面のショートカット"
 
-#: ui/gtk/help-overlay.ui:351
+#: ui/gtk/help-overlay.ui:359
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "送信する"
 
-#: ui/gtk/help-overlay.ui:358
+#: ui/gtk/help-overlay.ui:366
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "添付ファイルを追加する"
 
-#: ui/gtk/help-overlay.ui:371
+#: ui/gtk/help-overlay.ui:379
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "作成ウィンドウを閉じる"
 
-#: ui/gtk/help-overlay.ui:378
+#: ui/gtk/help-overlay.ui:386
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "作成ウィンドウを分離する"
 
-#: ui/gtk/help-overlay.ui:385
+#: ui/gtk/help-overlay.ui:393
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "編集"
 
-#: ui/gtk/help-overlay.ui:390
+#: ui/gtk/help-overlay.ui:398
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
 msgstr "選択範囲をクリップボードに移動する"
 
-#: ui/gtk/help-overlay.ui:397
+#: ui/gtk/help-overlay.ui:405
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
 msgstr "選択範囲をクリップボードにコピーする"
 
-#: ui/gtk/help-overlay.ui:404
+#: ui/gtk/help-overlay.ui:412
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
 msgstr "クリップボードから貼り付ける"
 
-#: ui/gtk/help-overlay.ui:411
+#: ui/gtk/help-overlay.ui:419
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "テキストを引用する"
 
-#: ui/gtk/help-overlay.ui:418
+#: ui/gtk/help-overlay.ui:426
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "テキストの引用を解除する"
 
-#: ui/gtk/help-overlay.ui:427
+#: ui/gtk/help-overlay.ui:435
 msgctxt "shortcut window"
 msgid "Rich text editing"
 msgstr "リッチテキスト編集"
 
-#: ui/gtk/help-overlay.ui:431
+#: ui/gtk/help-overlay.ui:439
 msgctxt "shortcut window"
 msgid "Paste without formatting"
 msgstr "書式なしで貼り付ける"
 
-#: ui/gtk/help-overlay.ui:438
+#: ui/gtk/help-overlay.ui:446
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "テキストを太字にする"
 
-#: ui/gtk/help-overlay.ui:445
+#: ui/gtk/help-overlay.ui:453
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "テキストを斜体にする"
 
-#: ui/gtk/help-overlay.ui:452
+#: ui/gtk/help-overlay.ui:460
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "テキストに下線を引く"
 
-#: ui/gtk/help-overlay.ui:459
+#: ui/gtk/help-overlay.ui:467
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "テキストに取り消し線を引く"
 
-#: ui/gtk/help-overlay.ui:466
+#: ui/gtk/help-overlay.ui:474
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "書式を削除する"
 
-#: ui/gtk/help-overlay.ui:473
+#: ui/gtk/help-overlay.ui:481
 msgctxt "shortcut window"
 msgid "Insert an image"
 msgstr "画像を挿入する"
 
-#: ui/gtk/help-overlay.ui:480
+#: ui/gtk/help-overlay.ui:488
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "リンクを挿入する"
 
-#: ui/main-toolbar.ui:23
+#: ui/main-toolbar.ui:24
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "メッセージを作成"
 
-#: ui/main-toolbar.ui:61
+#: ui/main-toolbar.ui:62
 msgid "Toggle search bar"
 msgstr "アカウント内を検索"
 
-#: ui/main-toolbar.ui:113
+#: ui/main-toolbar.ui:114
 msgid "Reply"
 msgstr "返信"
 
-#: ui/main-toolbar.ui:136
+#: ui/main-toolbar.ui:137
 msgid "Reply All"
 msgstr "全員に返信"
 
-#: ui/main-toolbar.ui:159
+#: ui/main-toolbar.ui:160
 msgid "Forward"
 msgstr "転送"
 
@@ -3175,105 +3560,32 @@ msgid "_Archive"
 msgstr "アーカイブ(_A)"
 
 #: ui/main-toolbar-menus.ui:21
-msgid "Mark as S_pam"
-msgstr "迷惑メールとしてマーク(_P)"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Toggle spam"
+msgid "Toggle as S_pam"
+msgstr "迷惑メールに指定/解除する"
 
-#: ui/main-toolbar-menus.ui:25
-msgid "Mark as not S_pam"
-msgstr "迷惑メールマークを外す(_P)"
-
-#: ui/main-toolbar-menus.ui:32
+#: ui/main-toolbar-menus.ui:28
 msgid "Empty _Spam…"
 msgstr "迷惑メールを空にする(_S)…"
 
-#: ui/main-toolbar-menus.ui:36
+#: ui/main-toolbar-menus.ui:32
 msgid "Empty _Trash…"
 msgstr "ごみ箱を空にする(_T)…"
 
-#: ui/main-toolbar-menus.ui:42
+#: ui/main-toolbar-menus.ui:38
 msgid "_Accounts"
 msgstr "アカウント(_A)"
 
-#: ui/main-toolbar-menus.ui:50
+#: ui/main-toolbar-menus.ui:46
 msgid "_Keyboard Shortcuts"
 msgstr "キーボードショートカット(_K)"
 
-#: ui/main-toolbar-menus.ui:61
+#: ui/main-toolbar-menus.ui:57
 msgid "_About Geary"
 msgstr "Geary について(_A)"
 
-#. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:185
-msgid "Working offline"
-msgstr "オフラインで作業中です"
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:199
-msgid ""
-"Your computer does not appear to be connected to the Internet.\n"
-"You will not be able to send or receive email until it is re-connected."
-msgstr ""
-"コンピューターがインターネットに接続していません。\n"
-"再接続するまでメールの送受信はできません。"
-
-#. Label and tooltip for offline infobar
-#: ui/main-window.ui:202
-msgid "You will not be able to send or receive email until re-connected."
-msgstr "再接続するまでメールの送受信はできません。"
-
-#. Button label for retrying TLS cert validation
-#: ui/main-window.ui:249
-msgid "Check"
-msgstr "確認"
-
-#. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:253
-msgid "Check the security details for the connection"
-msgstr "接続のセキュリティに関する詳細を確認"
-
-#. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:282
-msgid "Security problem"
-msgstr "セキュリティの問題"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:296
-msgid ""
-"An account has reported an untrusted server.\n"
-"Please check the server configuration and try again."
-msgstr ""
-"信頼できないサーバーです。\n"
-"サーバー設定を確認して再試行してください。"
-
-#. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:299
-msgid "An account has reported an untrusted server."
-msgstr "信頼できないサーバーです。"
-
-#. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:350
-msgid "Retry login, you will be prompted for your password"
-msgstr "ログインの再試行にはパスワードが必要です"
-
-#. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:379
-msgid "Login problem"
-msgstr "ログインの問題"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:393
-msgid ""
-"An account has reported an incorrect login or password.\n"
-"Please check your login name and try again."
-msgstr ""
-"ログイン情報かパスワードが間違っています。\n"
-"ログイン名を確認して再試行してください。"
-
-#. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:396
-msgid "An account has reported an incorrect login or password."
-msgstr "ログイン情報かパスワードが間違っています。"
-
 #: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "SMTP 証明書"
@@ -3290,50 +3602,143 @@ msgstr "パスワードを記憶する(_R)"
 msgid "_Authenticate"
 msgstr "認証(_A)"
 
-#: ui/preferences-dialog.ui:38
-msgid "Reading"
-msgstr "表示画面"
-
-#: ui/preferences-dialog.ui:51
-msgid "_Automatically select next message"
-msgstr "自動的に次のメッセージを選択する(_A)"
-
-#: ui/preferences-dialog.ui:70
-msgid "_Display conversation preview"
-msgstr "スレッドプレビューを表示する(_D)"
-
-#: ui/preferences-dialog.ui:89
-msgid "Use _three pane view"
-msgstr "3ペインビューを使う(_T)"
-
-#: ui/preferences-dialog.ui:113
-msgid "Notifications"
-msgstr "通知"
-
-#: ui/preferences-dialog.ui:126
-msgid "_Play notification sounds"
-msgstr "通知音を鳴らす(_P)"
-
-#: ui/preferences-dialog.ui:145
-msgid "Show _notifications for new mail"
-msgstr "新着メールの通知を表示する(_N)"
-
-#: ui/preferences-dialog.ui:164
-msgid "_Watch for new mail when closed"
-msgstr "閉じても新着メールを監視する(_W)"
-
-#: ui/preferences-dialog.ui:168
-msgid "Geary will keep running after all windows are closed"
-msgstr "すべてのウィンドウを閉じても Geary の実行を続けます"
-
-#: ui/preferences-dialog.ui:195
-msgid "Preferences"
-msgstr "設定"
-
 #: ui/upgrade_dialog.glade:60
 msgid "Geary update in progress…"
 msgstr "Geary を更新しています…"
 
+#~ msgid "Enable notification sounds"
+#~ msgstr "通知音を有効にする"
+
+#~ msgid "True to play sounds for notifications and sending."
+#~ msgstr "true にすると通知時と送信時に音を鳴らします。"
+
+#~ msgid "Show notifications for new mail"
+#~ msgstr "新着メールの通知を表示する"
+
+#~ msgid "True to show notification bubbles."
+#~ msgstr "true にするとポップアップ通知を表示します。"
+
+#~ msgid "Moved %d message to %s"
+#~ msgid_plural "Moved %d messages to %s"
+#~ msgstr[0] "%d 件のメッセージを %s に移動しました"
+
+#~ msgid "Error emptying %s"
+#~ msgstr "%s を空にするときにエラーが発生しました"
+
+#~ msgid "Trashed %d message"
+#~ msgid_plural "Trashed %d messages"
+#~ msgstr[0] "%d 件のメッセージをごみ箱に移動しました"
+
+#~ msgid "Archived %d message"
+#~ msgid_plural "Archived %d messages"
+#~ msgstr[0] "%d 件のメッセージをアーカイブに移動しました"
+
+#~ msgid "Successfully sent mail to %s."
+#~ msgstr "%s にメールを送信しました。"
+
+#~ msgid "Failed to open default text editor."
+#~ msgstr "デフォルトのテキストエディターの起動に失敗しました。"
+
+#~ msgid "Detach (Ctrl+D)"
+#~ msgstr "分離(Ctrl+D)"
+
+#~ msgid "Attach File (Ctrl+T)"
+#~ msgstr "ファイルを添付(Ctrl+T)"
+
+#~ msgid "Send (Ctrl+Enter)"
+#~ msgstr "送信(Ctrl+Enter)"
+
+#~ msgid "Open this link"
+#~ msgstr "このリンクを開く"
+
+#~ msgid "C_olor"
+#~ msgstr "色(_O)"
+
+#~ msgid "Show Extended Fields"
+#~ msgstr "拡張フィールドを表示"
+
+#~ msgid "Redo last edit  (Ctrl+Shift+Z)"
+#~ msgstr "やり直す(Ctrl+Shift+Z)"
+
+#~ msgid "Bold (Ctrl+B)"
+#~ msgstr "太字(Ctrl+B)"
+
+#~ msgid "Italic (Ctrl+I)"
+#~ msgstr "斜体(Ctrl+I)"
+
+#~ msgid "Underline (Ctrl+U)"
+#~ msgstr "下線(Ctrl+U)"
+
+#~ msgid "Strikethrough (Ctrl+K)"
+#~ msgstr "取り消し線(Ctrl+K)"
+
+#~ msgid "Insert ordered list"
+#~ msgstr "番号付きリストを挿入"
+
+#~ msgid "Quote text  (Ctrl+])"
+#~ msgstr "引用(Ctrl+])"
+
+#~ msgid "Unquote text  (Ctrl+[)"
+#~ msgstr "引用解除(Ctrl+[)"
+
+#~ msgid "Insert an image (Ctrl+G)"
+#~ msgstr "画像を挿入(Ctrl+G)"
+
+#~ msgid "Remove selection formatting (Ctrl+Space)"
+#~ msgstr "選択部分の書式を削除(Ctrl+Space)"
+
+#~ msgid "Display the message menu"
+#~ msgstr "メッセージメニューを表示"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive conversation"
+#~ msgstr "スレッドをアーカイブに移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move conversation"
+#~ msgstr "スレッドを移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move to Spam"
+#~ msgstr "迷惑メールに移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete conversation"
+#~ msgstr "スレッドを削除する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the next pane"
+#~ msgstr "フォーカスを次のペインに移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Focus the conversation list"
+#~ msgstr "スレッドリストにフォーカスを移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Select the conversation down"
+#~ msgstr "下のスレッドを選択する"
+
+#~ msgid "Mark as S_pam"
+#~ msgstr "迷惑メールとしてマーク(_P)"
+
+#~ msgid "Mark as not S_pam"
+#~ msgstr "迷惑メールマークを外す(_P)"
+
+#~ msgid "Reading"
+#~ msgstr "表示画面"
+
+#~ msgid "Notifications"
+#~ msgstr "通知"
+
+#~ msgid "_Play notification sounds"
+#~ msgstr "通知音を鳴らす(_P)"
+
+#~ msgid "Show _notifications for new mail"
+#~ msgstr "新着メールの通知を表示する(_N)"
+
+#~ msgid "Preferences"
+#~ msgstr "設定"
+
 #~ msgid "mail-send"
 #~ msgstr "mail-send"
 
@@ -3362,9 +3767,6 @@ msgstr "Geary を更新しています…"
 #~ msgid "Allow inspection of WebView"
 #~ msgstr "WebView での検証を有効にする"
 
-#~ msgid "Use %s to open a new composer window"
-#~ msgstr "%s を使って新規作成ウィンドウを開くことができます"
-
 #~ msgid "Please report comments, suggestions and bugs to:"
 #~ msgstr "コメント、提案、バグ報告はこちら:"
 
@@ -3517,10 +3919,6 @@ msgstr "Geary を更新しています…"
 #~ msgid "Archive"
 #~ msgstr "アーカイブに移動する"
 
-#~ msgctxt "shortcut window"
-#~ msgid "Toggle spam"
-#~ msgstr "迷惑メールに指定/解除する"
-
 #~ msgctxt "shortcut window"
 #~ msgid "Move the conversation"
 #~ msgstr "スレッドを移動する"
@@ -3805,9 +4203,6 @@ msgstr "Geary を更新しています…"
 #~ "一部のメールサービスでは、サーバーの設定に追加のアドレスが必要になります。"
 #~ "詳細についてはメールプロバイダーに問い合わせてください。"
 
-#~ msgid "_Update"
-#~ msgstr "更新(_U)"
-
 #~ msgid "E_mail address"
 #~ msgstr "メールアドレス(_M)"
 
@@ -3936,12 +4331,6 @@ msgstr "Geary を更新しています…"
 #~ msgid "SSL/TLS encryption:"
 #~ msgstr "SSL/TLS 暗号化:"
 
-#~ msgid "Sans Serif"
-#~ msgstr "ゴシック体"
-
-#~ msgid "Serif"
-#~ msgstr "明朝体"
-
 #~ msgid "Server:"
 #~ msgstr "サーバー:"