[geary] Update Japanese translation



commit bb27d0459104c90660e8cd9915af5baf0df15367
Author: Ryuta Fujii <translation sicklylife jp>
Date:   Sat Feb 2 13:14:20 2019 +0000

    Update Japanese translation

 po/ja.po | 3065 ++++++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 2008 insertions(+), 1057 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 783e9007..1c1ace72 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ 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-02-01 17:59+0000\n"
-"PO-Revision-Date: 2019-02-02 19:48+0000\n"
+"POT-Creation-Date: 2019-02-02 10:51+0000\n"
+"PO-Revision-Date: 2019-02-02 22:11+0000\n"
 "Last-Translator: UTUMI Hirosi <utuhiro78 yahoo co jp>\n"
 "Language-Team: Japanese (Japan) (https://l10n.gnome.org/module/geary/)\n"
 "Language: ja\n"
@@ -22,251 +22,744 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: desktop/geary-attach.contract.desktop.in:3
+msgid "Send by email"
+msgstr "メールで送信"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: desktop/geary-attach.contract.desktop.in:5
+msgid "mail-send"
+msgstr "mail-send"
+
+#: desktop/geary-attach.contract.desktop.in:6
+msgid "Send files using Geary"
+msgstr "Geary でファイルを送信"
+
 #. Translators: The application name
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:2
-#: ../desktop/org.gnome.Geary.desktop.in.h:1
-#: ../desktop/geary-autostart.desktop.in.h:1
+#: desktop/geary-autostart.desktop.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in:11
+#: desktop/org.gnome.Geary.desktop.in:3
+#: src/client/accounts/accounts-editor-servers-pane.vala:539
 msgid "Geary"
 msgstr "Geary"
 
-#. Translators: The development team's name
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:4
-msgid "Geary Development Team"
-msgstr "Geary 開発チーム"
+#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+msgid "Email"
+msgstr "メール"
 
 #. Translators: The application's summary / tagline
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
-#: ../desktop/org.gnome.Geary.desktop.in.h:4
-#: ../desktop/geary-autostart.desktop.in.h:4
-#: ../src/client/application/geary-application.vala:21
+#: desktop/geary-autostart.desktop.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in:15
+#: desktop/org.gnome.Geary.desktop.in:5
+#: src/client/application/geary-application.vala:22
 msgid "Send and receive email"
 msgstr "メールの送信と受信"
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: desktop/geary-autostart.desktop.in:7
+msgid "Email;E-mail;Mail;"
+msgstr "Email;E-mail;Mail;メール;Eメール;E-メール;"
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: desktop/geary-autostart.desktop.in:9 desktop/org.gnome.Geary.desktop.in:9
+msgid "org.gnome.Geary"
+msgstr "org.gnome.Geary"
+
+#. Translators: The development team's name
+#: desktop/org.gnome.Geary.appdata.xml.in:13
+msgid "Geary Development Team"
+msgstr "Geary 開発チーム"
+
+#: desktop/org.gnome.Geary.appdata.xml.in:17
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
 "modern interface."
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
+#: desktop/org.gnome.Geary.appdata.xml.in:22
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
+#: desktop/org.gnome.Geary.appdata.xml.in:26
 msgid "Geary’s features include:"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
+#: desktop/org.gnome.Geary.appdata.xml.in:28
 msgid "Quick email account setup"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
+#: desktop/org.gnome.Geary.appdata.xml.in:29
 msgid "Shows related messages together in conversations"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:12
+#: desktop/org.gnome.Geary.appdata.xml.in:30
 msgid "Fast, full text and keyword search"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:13
+#: desktop/org.gnome.Geary.appdata.xml.in:31
 msgid "Full-featured HTML and plain text message composer"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:14
+#: desktop/org.gnome.Geary.appdata.xml.in:32
 msgid "Desktop notification of new mail"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:15
+#: desktop/org.gnome.Geary.appdata.xml.in:33
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 
 #. Translators: A screenshot description.
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:17
+#: desktop/org.gnome.Geary.appdata.xml.in:47
 msgid "Geary displaying a conversation"
 msgstr ""
 
 #. Translators: A screenshot description.
-#: ../desktop/org.gnome.Geary.appdata.xml.in.h:19
+#: desktop/org.gnome.Geary.appdata.xml.in:52
 msgid "Geary showing the rich text composer"
 msgstr ""
 
-#: ../desktop/org.gnome.Geary.desktop.in.h:2
-#: ../desktop/geary-autostart.desktop.in.h:2
-msgid "Email"
-msgstr "メール"
-
-#: ../desktop/org.gnome.Geary.desktop.in.h:3
-msgid "Geary Email"
-msgstr "Geary メール"
-
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: ../desktop/org.gnome.Geary.desktop.in.h:6
+#: desktop/org.gnome.Geary.desktop.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;メール;Eメール;E-メール;"
 
-#: ../desktop/org.gnome.Geary.desktop.in.h:7 ../ui/gtk/menus.ui.h:1
+#: desktop/org.gnome.Geary.desktop.in:21 ui/gtk/menus.ui:7
 msgid "Compose Message"
 msgstr "メッセージを作成"
 
-#: ../desktop/geary-autostart.desktop.in.h:3
-msgid "Geary Mail"
-msgstr "Geary メール"
+#: desktop/org.gnome.Geary.gschema.xml:8
+msgid "Maximize window"
+msgstr ""
 
-#: ../desktop/geary-autostart.desktop.in.h:5
-msgid "Email;E-mail;Mail;"
-msgstr "Email;E-mail;Mail;メール;Eメール;E-メール;"
+#: desktop/org.gnome.Geary.gschema.xml:9
+msgid "True if the application window is maximized, false otherwise."
+msgstr ""
 
-#: ../desktop/geary-attach.contract.in.h:1
-msgid "Send by email"
-msgstr "メールで送信"
+#: desktop/org.gnome.Geary.gschema.xml:14
+msgid "Width of window"
+msgstr ""
 
-#: ../desktop/geary-attach.contract.in.h:2
-msgid "Send files using Geary"
-msgstr "Geary でファイルを送信"
+#: desktop/org.gnome.Geary.gschema.xml:15
+msgid "The last recorded width of the application window."
+msgstr ""
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:31
-#: ../ui/conversation-email-menus.ui.h:10
-msgid "_Save"
-msgstr "保存(_S)"
+#: desktop/org.gnome.Geary.gschema.xml:20
+msgid "Height of window"
+msgstr ""
 
-#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
-#: ../src/client/components/stock.vala:22
-msgid "_Add"
-msgstr "追加(_A)"
+#: desktop/org.gnome.Geary.gschema.xml:21
+msgid "The last recorded height of the application window."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:26
+msgid "Position of folder list pane"
+msgstr ""
 
-#. reset/clear widgets
-#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
+#: desktop/org.gnome.Geary.gschema.xml:27
+msgid "Position of the folder list Paned grabber."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:32
+msgid "Position of folder list pane when horizontal"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:33
+msgid ""
+"Position of the folder list Paned grabber in the horizontal orientation."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:38
+msgid "Position of folder list pane when vertical"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:39
+msgid "Position of the folder list Paned grabber in the vertical orientation."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:44
+msgid "Orientation of the folder list pane"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:45
+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"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:51
+msgid "Position of the message list Paned grabber."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:56
+msgid "Autoselect next message"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:57
+msgid "True if we should autoselect the next available conversation."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:62
+#, fuzzy
+#| msgid "_Display conversation preview"
+msgid "Display message previews"
+msgstr "スレッドプレビューを表示する(_D)"
+
+#: desktop/org.gnome.Geary.gschema.xml:63
+msgid "True if we should display a short preview of each message."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:68
+msgid "Languages that shall be used in the spell checker"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:69
+msgid "List of the languages to use in the spell checker."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:74
+msgid "Languages that are displayed in the spell checker popover"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:75
+msgid ""
+"List of languages that are always displayed in the popover of the spell "
+"checker."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:80
+#, fuzzy
+#| msgid "_Play notification sounds"
+msgid "Enable notification sounds"
+msgstr "通知音を鳴らす(_P)"
+
+#: desktop/org.gnome.Geary.gschema.xml:81
+msgid "True to play sounds for notifications and sending."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:86
+msgid "Show notifications for new mail"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:87
+msgid "True to show notification bubbles."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:92
+msgid "Notify of new mail at startup"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:93
+msgid "True to notify of new mail at startup."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:98
+msgid "Ask when opening an attachment"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:99
+msgid "True to ask when opening an attachment."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:104
+msgid "Whether to compose emails in HTML"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:105
+msgid "True to compose emails in HTML; false for plain text."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:110
+msgid "Advisory strategy for full-text searching"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:111
+msgid ""
+"Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:116
+msgid "Zoom of conversation viewer"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:117
+msgid "The zoom to apply on the conservation view."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:122
+msgid "Size of detached composer window"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:123
+msgid "The last recorded size of the detached composer window."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:128
+msgid "Base URL to look up contact avatars"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:129
+msgid ""
+"A Gravatar or Libravatar compatible URL, set to the empty string to disable."
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:134
+msgid "Whether we migrated the old settings"
+msgstr ""
+
+#: desktop/org.gnome.Geary.gschema.xml:135
+msgid ""
+"False to check for the old “org.yorba.geary”-schema and copy its values."
+msgstr ""
+
+#. Translators: In-app notification label, when
+#. the app had a problem pinning an otherwise
+#. untrusted TLS certificate
+#: src/client/accounts/accounts-editor.vala:203
+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
+msgid "All others"
+msgstr ""
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:196
+#: src/client/accounts/accounts-editor-servers-pane.vala:300
+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-servers-pane.vala:313
+msgid "Check your receiving server details"
+msgstr ""
+
+#. Translators: In-app notification label
+#. There was an SMTP auth error, but IMAP already
+#. succeeded, so the user probably needs to
+#. specify custom creds here
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:233
+#: src/client/accounts/accounts-editor-servers-pane.vala:334
+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-servers-pane.vala:347
+msgid "Check your sending server details"
+msgstr ""
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:262
+msgid "Check your email address and password"
+msgstr ""
+
+#. Translators: In-app notification label
+#: src/client/accounts/accounts-editor-add-pane.vala:273
+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
+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
+#, c-format
+msgid "Account not created: %s"
+msgstr ""
+
+#. Translators: Label for the person's actual name when adding
+#. an account
+#: src/client/accounts/accounts-editor-add-pane.vala:552
+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:569
+#: src/client/accounts/accounts-editor-edit-pane.vala:501
+msgid "Email address"
+msgstr "メールアドレス"
+
+#. Translators: Placeholder for the default sender address
+#. when adding an account
+#. Translators: This is used as a placeholder for the
+#. address part of an email address when editing a user's
+#. sender address preferences for an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:572
+#: src/client/accounts/accounts-editor-edit-pane.vala:469
+msgid "person example com"
+msgstr "person example com"
+
+#. Translators: Label for an IMAP/SMTP service login/user name
+#. when adding an account
+#. Translators: Label for the user's login name for an
+#. IMAP, SMTP, etc service
+#: src/client/accounts/accounts-editor-add-pane.vala:586
+#: src/client/accounts/accounts-editor-servers-pane.vala:809
+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:600
+#: src/client/accounts/accounts-editor-servers-pane.vala:928
+#: ui/password-dialog.glade:108
+msgid "Password"
+msgstr "パスワード"
+
+#. Translators: Label for the IMAP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's IMAP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:622
+#: src/client/accounts/accounts-editor-servers-pane.vala:656
+msgid "IMAP server"
+msgstr "IMAP サーバー"
+
+#. Translators: Placeholder for the IMAP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:625
+msgid "imap.example.com"
+msgstr "imap.example.com"
+
+#. Translators: Label for the SMTP server hostname when
+#. adding an account.
+#. Translators: This label describes the host name or IP
+#. address and port used by an account's SMTP service.
+#: src/client/accounts/accounts-editor-add-pane.vala:631
+#: src/client/accounts/accounts-editor-servers-pane.vala:662
+msgid "SMTP server"
+msgstr "SMTP サーバー"
+
+#. Translators: Placeholder for the SMTP server hostname
+#. when adding an account.
+#: src/client/accounts/accounts-editor-add-pane.vala:634
+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
+#: ui/accounts_editor_remove_pane.ui:123
+msgid "Account name"
+msgstr "アカウント名"
+
+#. Translators: Tooltip used to undo changing
+#. the name of an account. The string
+#. substitution is the old name of the
+#. account.
+#: src/client/accounts/accounts-editor-edit-pane.vala:312
 #, c-format
-msgid "Additional addresses for %s"
-msgstr "%s の追加アドレス"
+msgid "Change account name back to “%s”"
+msgstr ""
 
-#. Sets min size.
-#: ../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "アカウント"
+#. Translators: Tooltip for adding a new email sender/from
+#. address's address to an account
+#: src/client/accounts/accounts-editor-edit-pane.vala:336
+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
+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
+msgid "Sender Name"
+msgstr "送信者名"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:479
+msgid "Remove"
+msgstr "削除"
 
-#. Copyright 2016 Software Freedom Conservancy Inc.
-#. *
-#. * This software is licensed under the GNU Lesser General Public License
-#. * (version 2.1 or later).  See the COPYING file in this distribution.
-#.
-#. Page for adding or editing an account.
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
-msgstr "氏名"
-
-#: ../src/client/accounts/add-edit-page.vala:235
-msgid "Welcome to Geary."
-msgstr "Geary へようこそ"
+#. 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
+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
+#, c-format
+msgid "Remove “%s”"
+msgstr "“%s”を削除"
+
+#. Translators: Label used as the undo tooltip after editing a
+#. sender address for an account. The string substitution is
+#. the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:601
+#, c-format
+msgid "Undo changes to “%s”"
+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:690
+#, c-format
+msgid "Add “%s” back"
+msgstr "“%s”を元に戻す"
+
+#. Translators: Label used as the undo tooltip after removing
+#. a sender address from an account. The string substitution
+#. is the email address edited.
+#: src/client/accounts/accounts-editor-edit-pane.vala:728
+msgid "Undo signature changes"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:235
-msgid "Enter your account information to get started."
-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:772
+msgid "Download mail"
+msgstr "メールのダウンロード"
+
+#. Translators: Tooltip for undoing a change
+#. to the length of time that past email
+#. should be downloaded for an account. The
+#. string substitution is the duration,
+#. e.g. "1 month back".
+#: src/client/accounts/accounts-editor-edit-pane.vala:804
+#, c-format
+msgid "Change download period back to: %s"
+msgstr "変更したダウンロード期間を元に戻す: %s"
 
-#: ../src/client/accounts/add-edit-page.vala:255
+#: src/client/accounts/accounts-editor-edit-pane.vala:825
+msgid "Everything"
+msgstr "すべて"
+
+#: src/client/accounts/accounts-editor-edit-pane.vala:829
 msgid "2 weeks back"
 msgstr "2週間前"
 
-#. IDs are # of days
-#: ../src/client/accounts/add-edit-page.vala:256
+#: src/client/accounts/accounts-editor-edit-pane.vala:833
 msgid "1 month back"
 msgstr "1ヶ月前"
 
-#: ../src/client/accounts/add-edit-page.vala:257
+#: src/client/accounts/accounts-editor-edit-pane.vala:837
 msgid "3 months back"
 msgstr "3ヶ月前"
 
-#: ../src/client/accounts/add-edit-page.vala:258
+#: src/client/accounts/accounts-editor-edit-pane.vala:841
 msgid "6 months back"
 msgstr "6ヶ月前"
 
-#: ../src/client/accounts/add-edit-page.vala:259
+#: src/client/accounts/accounts-editor-edit-pane.vala:845
 msgid "1 year back"
 msgstr "1年前"
 
-#: ../src/client/accounts/add-edit-page.vala:260
+#: src/client/accounts/accounts-editor-edit-pane.vala:849
 msgid "2 years back"
 msgstr "2年前"
 
-#: ../src/client/accounts/add-edit-page.vala:261
+#: src/client/accounts/accounts-editor-edit-pane.vala:853
 msgid "4 years back"
 msgstr "4年前"
 
-#. Separator
-#: ../src/client/accounts/add-edit-page.vala:263
-msgid "Everything"
-msgstr "すべて"
-
-#: ../src/client/accounts/add-edit-page.vala:283
-msgid "Edit"
-msgstr "編集"
-
-#: ../src/client/accounts/add-edit-page.vala:285
-msgid "Preview"
-msgstr "プレビュー"
-
-#: ../src/client/accounts/add-edit-page.vala:751
-msgid "Remem_ber passwords"
-msgstr "パスワードを記憶する(_B)"
-
-#: ../src/client/accounts/add-edit-page.vala:758 ../ui/login.glade.h:7
-msgid "Remem_ber password"
-msgstr "パスワードを記憶する(_B)"
+#: src/client/accounts/accounts-editor-edit-pane.vala:859
+#, c-format
+msgid "%d day back"
+msgid_plural "%d days back"
+msgstr[0] "%d日前"
 
-#: ../src/client/accounts/add-edit-page.vala:792
-msgid "Unable to validate:\n"
-msgstr "検証できません:\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:243
+msgid "Undo"
+msgstr "元に戻す"
 
-#: ../src/client/accounts/add-edit-page.vala:794
-msgid "        • Invalid account nickname.\n"
-msgstr "        • アカウントのニックネームが不正です。\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:251
+msgid "Redo"
+msgstr "やり直す"
 
-#: ../src/client/accounts/add-edit-page.vala:797
-msgid "        • Email address already added to Geary.\n"
-msgstr "        • メールアドレスが Geary に追加済みです。\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:345
+#: src/client/accounts/accounts-editor-list-pane.vala:433
+#: src/client/accounts/accounts-editor-row.vala:278
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/client/accounts/add-edit-page.vala:801
-msgid "        • IMAP connection error.\n"
-msgstr "        • IMAP の接続エラーです。\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:349
+#: src/client/accounts/accounts-editor-list-pane.vala:437
+#: src/client/accounts/accounts-editor-row.vala:282
+msgid "Outlook.com"
+msgstr "Outlook.com"
 
-#: ../src/client/accounts/add-edit-page.vala:804
-msgid "        • IMAP username or password incorrect.\n"
-msgstr "        • IMAP のユーザー名またはパスワードが不正です。\n"
+#: src/client/accounts/accounts-editor-list-pane.vala:353
+#: src/client/accounts/accounts-editor-list-pane.vala:441
+#: src/client/accounts/accounts-editor-row.vala:286
+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:371
+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:380
+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:430
+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:547
+#, c-format
+msgid "Account “%s” removed"
+msgstr "アカウント“%s”を削除しました"
 
-#: ../src/client/accounts/add-edit-page.vala:807
-msgid "        • SMTP connection error.\n"
-msgstr "        • SMTP の接続エラーです。\n"
+#. 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:554
+#, c-format
+msgid "Account “%s” restored"
+msgstr "アカウント“%s”を復元しました"
+
+#. Translators: Tooltip for dragging list items
+#: src/client/accounts/accounts-editor-row.vala:49
+msgid "Drag to move this item"
+msgstr "このアイテムをドラッグして移動"
+
+#. Translators: Label describes the service provider
+#. hosting the email account, e.g. Gmail, Yahoo, or some
+#. other generic IMAP service.
+#: src/client/accounts/accounts-editor-row.vala:294
+msgid "Service provider"
+msgstr "サービスプロバイダー"
+
+#. Translators: This label describes what form of transport
+#. security (TLS, StartTLS, etc) used by an account's IMAP or SMTP
+#. service.
+#: src/client/accounts/accounts-editor-row.vala:467
+msgid "Connection security"
+msgstr "接続のセキュリティ"
+
+#. Translators: Label used when no auth scheme is used
+#. by an account's IMAP or SMTP service.
+#: src/client/accounts/accounts-editor-row.vala:478
+#: src/client/accounts/accounts-editor-servers-pane.vala:681
+#: src/client/accounts/accounts-editor-servers-pane.vala:893
+#: src/engine/api/geary-special-folder-type.vala:58
+msgid "None"
+msgstr "なし"
 
-#: ../src/client/accounts/add-edit-page.vala:810
-msgid "        • SMTP username or password incorrect.\n"
-msgstr "        • SMTP のユーザー名またはパスワードが不正です。\n"
+#: src/client/accounts/accounts-editor-row.vala:485
+msgid "StartTLS"
+msgstr "StartTLS"
+
+#: src/client/accounts/accounts-editor-row.vala:492
+msgid "TLS"
+msgstr "TLS"
+
+#. Translators: Label for source of SMTP authentication
+#. credentials (none, use IMAP, custom) when adding a new
+#. account
+#. Button label for retrying when a login error has occurred
+#: src/client/accounts/accounts-editor-row.vala:533 ui/main-window.ui:455
+msgid "Login"
+msgstr "ログイン"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (none) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:540
+msgid "No login needed"
+msgstr "ログイン不要"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (use IMAP) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:548
+msgid "Use same login as receiving"
+msgstr "受信と同じ情報を使う"
+
+#. Translators: ComboBox value for source of SMTP
+#. authentication credentials (custom) when adding a new
+#. account
+#: src/client/accounts/accounts-editor-row.vala:556
+msgid "Use a different login"
+msgstr "他の情報を使う"
+
+#. Translators: In-app notification label, the
+#. string substitution is a more detailed reason.
+#: src/client/accounts/accounts-editor-servers-pane.vala:361
+#, c-format
+msgid "Account not updated: %s"
+msgstr ""
 
-#: ../src/client/accounts/add-edit-page.vala:814
-msgid "        • Connection error.\n"
-msgstr "        • 接続エラーです。\n"
+#. Translators: This label describes the program that
+#. created the account, e.g. an SSO service like GOA, or
+#. locally by Geary.
+#: src/client/accounts/accounts-editor-servers-pane.vala:524
+msgid "Account source"
+msgstr "アカウントのソース"
+
+#: src/client/accounts/accounts-editor-servers-pane.vala:536
+msgid "GNOME Online Accounts"
+msgstr "GNOME オンラインアカウント"
+
+#. Translators: This label describes an account
+#. preference.
+#: src/client/accounts/accounts-editor-servers-pane.vala:595
+msgid "Save drafts on server"
+msgstr "下書きをサーバーに保存"
+
+#. Add a suffix for OAuth2 auth so people know they
+#. shouldn't expect to be prompted for a password
+#. Translators: Label used when an account's IMAP or
+#. SMTP service uses OAuth2. The string replacement is
+#. the service's login name.
+#: src/client/accounts/accounts-editor-servers-pane.vala:879
+#, c-format
+msgid "%s using OAuth2"
+msgstr "%s は OAuth2 を使用しています"
 
-#: ../src/client/accounts/add-edit-page.vala:818
-msgid "        • Username or password incorrect.\n"
-msgstr "        • ユーザー名またはパスワードが不正です。\n"
+#: src/client/accounts/accounts-editor-servers-pane.vala:889
+msgid "Use receiving server login"
+msgstr "受信サーバーの情報を使う"
 
-#: ../src/client/application/geary-application.vala:22
+#: src/client/application/geary-application.vala:23
 msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
-#: ../src/client/application/geary-application.vala:23
-msgid "Copyright 2016-2017 Geary Development Team."
-msgstr "Copyright 2016-2017 Geary Development Team."
+#: src/client/application/geary-application.vala:24
+msgid "Copyright 2016-2019 Geary Development Team."
+msgstr "Copyright 2016-2019 Geary Development Team."
 
-#: ../src/client/application/geary-application.vala:25
+#: src/client/application/geary-application.vala:26
 msgid "Visit the Geary web site"
 msgstr "Geary のウェブサイト"
 
-#: ../src/client/application/geary-application.vala:474
+#: src/client/application/geary-application.vala:413
 #, c-format
 msgid "About %s"
 msgstr "%s について"
@@ -274,7 +767,7 @@ 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:478
+#: src/client/application/geary-application.vala:417
 msgid "translator-credits"
 msgstr ""
 "masami chikahiro <cmasa z321 gmail com>\n"
@@ -283,312 +776,107 @@ msgstr ""
 "sicklylife <translation sicklylife jp>\n"
 "UTUMI Hirosi <utuhiro78 yahoo co jp>"
 
-#: ../src/client/application/geary-args.vala:10
+#: src/client/application/geary-args.vala:10
 msgid "Start Geary with hidden main window"
 msgstr "メインウィンドウを隠して Geary を起動する"
 
-#: ../src/client/application/geary-args.vala:11
+#: src/client/application/geary-args.vala:11
 msgid "Output debugging information"
 msgstr "デバッグ情報を出力する"
 
-#: ../src/client/application/geary-args.vala:12
+#: src/client/application/geary-args.vala:12
 msgid "Log conversation monitoring"
 msgstr "スレッドのモニタリングを記録する"
 
-#: ../src/client/application/geary-args.vala:13
+#: src/client/application/geary-args.vala:13
 msgid "Log network deserialization"
 msgstr "ネットワークログをデシリアライズする"
 
-#: ../src/client/application/geary-args.vala:14
+#: src/client/application/geary-args.vala:14
 msgid "Log network activity"
 msgstr "ネットワーク情報を記録する"
 
 #. / The IMAP replay queue is how changes on the server are replicated on the client.
 #. / It could also be called the IMAP events queue.
-#: ../src/client/application/geary-args.vala:17
+#: src/client/application/geary-args.vala:17
 msgid "Log IMAP replay queue"
 msgstr "IMAP のイベントキューを記録する"
 
 #. / Serialization is how commands and responses are converted into a stream of bytes for
 #. / network transmission
-#: ../src/client/application/geary-args.vala:20
+#: src/client/application/geary-args.vala:20
 msgid "Log network serialization"
 msgstr "ネットワークのストリームを記録する"
 
-#: ../src/client/application/geary-args.vala:21
+#: src/client/application/geary-args.vala:21
 msgid "Log periodic activity"
 msgstr "定期的な行動を記録する"
 
-#: ../src/client/application/geary-args.vala:22
+#: src/client/application/geary-args.vala:22
 msgid "Log database queries (generates lots of messages)"
 msgstr "データベースのクエリを記録する (多くのメッセージを生成します)"
 
 #. / "Normalization" can also be called "synchronization"
-#: ../src/client/application/geary-args.vala:24
+#: src/client/application/geary-args.vala:24
 msgid "Log folder normalization"
 msgstr "フォルダーの同期を記録する"
 
-#: ../src/client/application/geary-args.vala:25
+#: src/client/application/geary-args.vala:25
 msgid "Allow inspection of WebView"
 msgstr "WebView での検証を有効にする"
 
-#: ../src/client/application/geary-args.vala:26
+#: src/client/application/geary-args.vala:26
 msgid "Revoke all server certificates with TLS warnings"
 msgstr "TLS の警告ですべてのサーバー証明書を失効させる"
 
-#: ../src/client/application/geary-args.vala:27
+#: src/client/application/geary-args.vala:27
 msgid "Perform a graceful quit"
 msgstr "正常に終了する"
 
-#: ../src/client/application/geary-args.vala:28
+#: src/client/application/geary-args.vala:28
 msgid "Display program version"
 msgstr "プログラムのバージョンを表示する"
 
 #. This gives a command-line hint on how to open new composer windows with mailto:
-#: ../src/client/application/geary-args.vala:53
+#: src/client/application/geary-args.vala:53
 #, c-format
 msgid "Use %s to open a new composer window"
 msgstr "%s を使用して新規作成ウィンドウを開く"
 
-#: ../src/client/application/geary-args.vala:56
+#: src/client/application/geary-args.vala:56
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "コメント、提案、バグ報告はこちら:"
 
 #. i18n: Command line arguments are invalid
-#: ../src/client/application/geary-args.vala:63
+#: src/client/application/geary-args.vala:63
 #, c-format
 msgid "Failed to parse command line options: %s\n"
 msgstr "不明なコマンドラインオプション: %s\n"
 
-#: ../src/client/application/geary-args.vala:74
+#: src/client/application/geary-args.vala:74
 #, c-format
 msgid "Unrecognized command line option “%s”\n"
 msgstr "不明なコマンドラインオプション“%s”\n"
 
-#: ../src/client/application/geary-controller.vala:57
-msgid "Delete conversation"
-msgstr "スレッドを削除"
-
-#: ../src/client/application/geary-controller.vala:58
-msgid "Delete conversation (Shift+Delete)"
-msgstr "スレッドを削除(Shift+Delete)"
-
-#: ../src/client/application/geary-controller.vala:59
-msgid "Delete conversations (Shift+Delete)"
-msgstr "スレッドを削除(Shift+Delete)"
-
-#. This refers to the action ("move email to the trash"), not the Trash folder itself
-#: ../src/client/application/geary-controller.vala:63
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgstr "スレッドをごみ箱に移動(Delete, Backspace)"
-
-#: ../src/client/application/geary-controller.vala:64
-msgid "Move conversations to Trash (Delete, Backspace)"
-msgstr "スレッドをごみ箱に移動(Delete, Backspace)"
-
-#. This refers to the action ("archive an email"), not the Archive folder itself
-#: ../src/client/application/geary-controller.vala:68
-msgid "_Archive"
-msgstr "アーカイブ(_A)"
-
-#: ../src/client/application/geary-controller.vala:69
-msgid "Archive conversation (A)"
-msgstr "スレッドをアーカイブに移動(A)"
-
-#: ../src/client/application/geary-controller.vala:70
-msgid "Archive conversations (A)"
-msgstr "スレッドをアーカイブに移動(A)"
-
-#: ../src/client/application/geary-controller.vala:73
-msgid "Mark as S_pam"
-msgstr "迷惑メールとしてマーク(_P)"
-
-#: ../src/client/application/geary-controller.vala:74
-msgid "Mark as not S_pam"
-msgstr "迷惑メールマークを外す(_P)"
-
-#: ../src/client/application/geary-controller.vala:76
-#: ../src/client/application/geary-controller.vala:445
-msgid "Mark conversation"
-msgstr "スレッドをマーク"
-
-#: ../src/client/application/geary-controller.vala:77
-msgid "Mark conversations"
-msgstr "スレッドをマーク"
-
-#: ../src/client/application/geary-controller.vala:78
-msgid "Add label to conversation"
-msgstr "スレッドにラベル付け"
-
-#: ../src/client/application/geary-controller.vala:79
-msgid "Add label to conversations"
-msgstr "スレッドにラベル付け"
-
-#: ../src/client/application/geary-controller.vala:80
-#: ../src/client/application/geary-controller.vala:484
-msgid "Move conversation"
-msgstr "スレッドを移動"
-
-#: ../src/client/application/geary-controller.vala:81
-msgid "Move conversations"
-msgstr "スレッドを移動"
-
-#: ../src/client/application/geary-controller.vala:447
-#, fuzzy
-#| msgid "_Mark as..."
-msgid "_Mark as…"
-msgstr "名前を付けてマーク(_M)"
-
-#: ../src/client/application/geary-controller.vala:453
-msgid "Mark as _Read"
-msgstr "既読としてマーク(_R)"
-
-#: ../src/client/application/geary-controller.vala:459
-msgid "Mark as _Unread"
-msgstr "未読としてマーク(_U)"
-
-#: ../src/client/application/geary-controller.vala:465
-msgid "_Star"
-msgstr "星を付ける(_S)"
-
-#: ../src/client/application/geary-controller.vala:470
-msgid "U_nstar"
-msgstr "星をはずす(_N)"
-
-#: ../src/client/application/geary-controller.vala:480
-msgid "Add label"
-msgstr ""
-
-#: ../src/client/application/geary-controller.vala:481
-msgid "_Label"
-msgstr "ラベル(_L)"
-
-#: ../src/client/application/geary-controller.vala:485
-msgid "_Move"
-msgstr "移動(_M)"
-
-#: ../src/client/application/geary-controller.vala:489
-msgid "Compose new message (Ctrl+N, N)"
-msgstr "新規メッセージを作成(Ctrl+N, N)"
-
-#: ../src/client/application/geary-controller.vala:493
-#: ../ui/conversation-email-menus.ui.h:1
-msgid "_Reply"
-msgstr "返信(_R)"
-
-#: ../src/client/application/geary-controller.vala:494
-msgid "Reply (Ctrl+R, R)"
-msgstr "返信(Ctrl+R, R)"
-
-#: ../src/client/application/geary-controller.vala:498
-msgid "R_eply All"
-msgstr "全員に返信(_E)"
-
-#: ../src/client/application/geary-controller.vala:499
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
-msgstr "全員に返信(Ctrl+Shift+R, Shift+R)"
-
-#: ../src/client/application/geary-controller.vala:504
-#: ../ui/conversation-email-menus.ui.h:3
-msgid "_Forward"
-msgstr "転送(_F)"
-
-#: ../src/client/application/geary-controller.vala:505
-msgid "Forward (Ctrl+L, F)"
-msgstr "転送(Ctrl+L, F)"
-
-#: ../src/client/application/geary-controller.vala:535
-msgid "Empty _Spam…"
-msgstr "迷惑メールを空にする(_S)…"
-
-#: ../src/client/application/geary-controller.vala:539
-msgid "Empty _Trash…"
-msgstr "ごみ箱を空にする(_T)…"
-
-#. No callback is connected, since we bind the toggle button to the search bar visibility
-#: ../src/client/application/geary-controller.vala:571
-msgid "Toggle search bar"
-msgstr "アカウント内を検索"
-
-#. No callback is connected, since we bind the toggle button to the find bar visibility
-#: ../src/client/application/geary-controller.vala:576
-msgid "Toggle find bar"
-msgstr "スレッド内を検索"
-
-#: ../src/client/application/geary-controller.vala:754
-msgid "Unable to store server trust exception"
-msgstr "サーバーの信頼に関する例外を保存できません"
-
-#: ../src/client/application/geary-controller.vala:989
-msgid "Your settings are insecure"
-msgstr "設定がセキュアではありません"
-
-#: ../src/client/application/geary-controller.vala:990
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"IMAP/SMTP の通信に SSL/TLS が指定されていません。ユーザー名やパスワードがネッ"
-"トワーク上の他人に読み取られる可能性があります。よろしいですか?"
-
-#: ../src/client/application/geary-controller.vala:991
-msgid "Co_ntinue"
-msgstr "継続(_N)"
+#. Translators: File name used in save chooser when saving
+#. attachments that do not otherwise have a name.
+#: src/client/application/geary-controller.vala:61
+msgid "Untitled"
+msgstr "無題"
 
-#: ../src/client/application/geary-controller.vala:1038
-msgid "Error connecting to the server"
-msgstr "サーバーへの接続時にエラーが発生しました"
-
-#: ../src/client/application/geary-controller.vala:1039
-msgid ""
-"Geary encountered an error while connecting to the server.  Please try again "
-"in a few moments."
-msgstr ""
-"サーバーへの接続時にエラーが発生しました。しばらく時間をあけてから再試行してください。"
-
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../src/client/application/geary-controller.vala:1076
-#: ../src/client/components/status-bar.vala:29
-msgid "Error sending email"
-msgstr "メール送信時にエラーが発生しました"
-
-#: ../src/client/application/geary-controller.vala:1077
-msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
-msgstr ""
-"メール送信時にエラーが発生しました。問題を解決できない場合は、メールを手動で"
-"送信済みトレイから削除してください。"
-
-#. Displayed in the space-limited status bar when a message fails to be uploaded
-#. to Sent Mail after being sent.
-#: ../src/client/application/geary-controller.vala:1081
-#: ../src/client/components/status-bar.vala:33
-msgid "Error saving sent mail"
-msgstr "送信メール保存時にエラーが発生しました"
-
-#: ../src/client/application/geary-controller.vala:1082
-msgid ""
-"Geary encountered an error saving a sent message to Sent Mail.  The message "
-"will stay in your Outbox folder until you delete it."
-msgstr ""
-"メールを送信済みトレイに保存するときにエラーが発生しました。削除するまで"
-"このメッセージを送信済みトレイに表示します。"
-
-#: ../src/client/application/geary-controller.vala:1151
+#: src/client/application/geary-controller.vala:907
 msgid "Labels"
 msgstr "ラベル"
 
 #. give the user two options: reset the Account local store, or exit Geary.  A third
 #. could be done to leave the Account in an unopened state, but we don't currently
 #. have provisions for that.
-#: ../src/client/application/geary-controller.vala:1163
+#: src/client/application/geary-controller.vala:920
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "%s のデータベースを開けません"
 
-#: ../src/client/application/geary-controller.vala:1164
+#: src/client/application/geary-controller.vala:921
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -612,20 +900,20 @@ msgstr ""
 "データベースを再構築すると、すべてのローカルメールと添付ファイルが破棄されま"
 "す。<b>サーバー上のメールは影響を受けません。</b>"
 
-#: ../src/client/application/geary-controller.vala:1166
+#: src/client/application/geary-controller.vala:923
 msgid "_Rebuild"
 msgstr "再構築(_R)"
 
-#: ../src/client/application/geary-controller.vala:1166
+#: src/client/application/geary-controller.vala:923
 msgid "E_xit"
 msgstr "終了(_X)"
 
-#: ../src/client/application/geary-controller.vala:1175
+#: src/client/application/geary-controller.vala:932
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "“%s”のデータベースを再構築できません"
 
-#: ../src/client/application/geary-controller.vala:1176
+#: src/client/application/geary-controller.vala:933
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -636,293 +924,543 @@ msgstr ""
 "\n"
 "%s"
 
-#. some other problem opening the account ... as with other flow path, can't run
-#. Geary today with an account in unopened state, so have to exit
-#: ../src/client/application/geary-controller.vala:1198
-#: ../src/client/application/geary-controller.vala:1208
-#: ../src/client/application/geary-controller.vala:1219
-#, c-format
-msgid "Unable to open local mailbox for %s"
-msgstr "%s のローカルメールボックスを開けません"
-
-#: ../src/client/application/geary-controller.vala:1199
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
-msgstr ""
-"このアカウントのローカルメールデータベースを開くときにエラーが発生しました。"
-"おそらくファイルのアクセス権に問題があります。\n"
-"\n"
-"このディレクトリのすべてのファイルの読み取り/書き込み権限を確認してください:\n"
-"\n"
-"%s"
-
-#: ../src/client/application/geary-controller.vala:1209
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be “rolled back” to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
-msgstr ""
-"ローカルメールデータベースは新しいバージョンの Geary 用にフォーマットされてい"
-"ます。残念ですが、このバージョンの Geary で動作するようデータベースを“ロール"
-"バック”することはできません。\n"
-"\n"
-"Geary の最新バージョンをインストールして再試行してください。"
-
-#: ../src/client/application/geary-controller.vala:1220
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
-msgstr ""
-"ローカルアカウントを開くときにエラーが発生しました。おそらく接続の問題による"
-"ものです。\n"
-"\n"
-"ネットワーク接続を確認し、Geary を再起動してください。"
-
-#: ../src/client/application/geary-controller.vala:2016
+#: src/client/application/geary-controller.vala:1774
 msgid "Undo move (Ctrl+Z)"
 msgstr "移動を元に戻す(Ctrl+Z)"
 
-#: ../src/client/application/geary-controller.vala:2026
+#: src/client/application/geary-controller.vala:1784
 msgid "Are you sure you want to open these attachments?"
 msgstr "これらの添付ファイルをを開きますか?"
 
-#: ../src/client/application/geary-controller.vala:2027
+#: src/client/application/geary-controller.vala:1785
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
 msgstr ""
-"添付ファイルはシステムにダメージを与える可能性があります。送信元が信頼できる場合"
-"のみ開くようにしてください。"
+"添付ファイルはシステムにダメージを与える可能性があります。送信元が信頼できる"
+"場合のみ開くようにしてください。"
 
-#: ../src/client/application/geary-controller.vala:2028
+#: src/client/application/geary-controller.vala:1786
 msgid "Don’t _ask me again"
 msgstr "次回から表示しない(_A)"
 
-#: ../src/client/application/geary-controller.vala:2132
+#. Translators: Dialog primary label when prompting to
+#. overwrite a file. The string substitution is the file'sx
+#. name.
+#: src/client/application/geary-controller.vala:1915
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "“%s”はすでに存在します。置き換えますか?"
 
-#: ../src/client/application/geary-controller.vala:2134
+#. Translators: Dialog secondary label when prompting to
+#. overwrite a file. The string substitution is the parent
+#. folder's name.
+#: src/client/application/geary-controller.vala:1922
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "ファイルはすでに“%s”に存在します。置き換えると内容を上書きします。"
 
-#: ../src/client/application/geary-controller.vala:2137
+#: src/client/application/geary-controller.vala:1926
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#. Find out what to do with the inline composers.
-#. TODO: Remove this in favor of automatically saving drafts
-#: ../src/client/application/geary-controller.vala:2385
-msgid "Close open draft messages?"
-msgstr "開いた下書きメッセージを閉じますか?"
+#: src/client/application/geary-controller.vala:2202
+msgid "Close the draft message?"
+msgid_plural "Close all draft messages?"
+msgstr[0] "下書きメッセージを閉じますか?"
 
-#: ../src/client/application/geary-controller.vala:2507
+#: src/client/application/geary-controller.vala:2328
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "%s フォルダーのすべてのメールを空にしますか?"
 
-#: ../src/client/application/geary-controller.vala:2508
+#: src/client/application/geary-controller.vala:2329
 msgid "This removes the email from Geary and your email server."
 msgstr "メールを Geary とメールサーバーから削除します。"
 
-#: ../src/client/application/geary-controller.vala:2509
+#: src/client/application/geary-controller.vala:2330
 msgid "This cannot be undone."
 msgstr "これは元に戻すことができません。"
 
-#: ../src/client/application/geary-controller.vala:2510
+#: src/client/application/geary-controller.vala:2331
 #, c-format
 msgid "Empty %s"
 msgstr "%s を空にする"
 
-#: ../src/client/application/geary-controller.vala:2527
+#: src/client/application/geary-controller.vala:2348
 #, c-format
 msgid "Error emptying %s"
 msgstr "%s を空にする際にエラーが発生しました"
 
-#: ../src/client/application/geary-controller.vala:2557
+#: src/client/application/geary-controller.vala:2380
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "このメッセージを完全に削除しますか?"
 
-#: ../src/client/application/geary-controller.vala:2559
-msgid "Delete"
-msgstr "削除"
+#: src/client/application/geary-controller.vala:2382
+msgid "Delete"
+msgstr "削除"
+
+#: src/client/application/geary-controller.vala:2396
+msgid "Undo trash (Ctrl+Z)"
+msgstr "ごみ箱から戻す(Ctrl+Z)"
+
+#: src/client/application/geary-controller.vala:2446
+msgid "Undo archive (Ctrl+Z)"
+msgstr "アーカイブから戻す(Ctrl+Z)"
+
+#: src/client/application/geary-controller.vala:2491
+msgid "Undo (Ctrl+Z)"
+msgstr "元に戻す(Ctrl+Z)"
+
+#. Translators: The label for an in-app notification. The
+#. string substitution is a list of recipients of the email.
+#: src/client/application/geary-controller.vala:2568
+#, c-format
+msgid "Successfully sent mail to %s."
+msgstr "%s にメールを送信しました。"
+
+#: src/client/application/geary-controller.vala:2650
+msgid "Failed to open default text editor."
+msgstr "デフォルトのテキストエディターの起動に失敗しました。"
+
+#. 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:341
+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:345
+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:391
+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:396
+msgid "Could not look up server name"
+msgstr "サーバー名が見つかりませんでした"
+
+#. Tooltips
+#: src/client/components/main-toolbar.vala:69
+msgid "Delete conversation (Shift+Delete)"
+msgstr "スレッドを削除(Shift+Delete)"
+
+#: src/client/components/main-toolbar.vala:70
+msgid "Delete conversations (Shift+Delete)"
+msgstr "スレッドを削除(Shift+Delete)"
+
+#: src/client/components/main-toolbar.vala:71
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr "スレッドをごみ箱に移動(Delete, Backspace)"
+
+#: src/client/components/main-toolbar.vala:72
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr "スレッドをごみ箱に移動(Delete, Backspace)"
+
+#: src/client/components/main-toolbar.vala:73
+msgid "Archive conversation (A)"
+msgstr "スレッドをアーカイブに移動(A)"
+
+#: src/client/components/main-toolbar.vala:74
+msgid "Archive conversations (A)"
+msgstr "スレッドをアーカイブに移動(A)"
+
+#: src/client/components/main-toolbar.vala:75
+msgid "Mark conversation"
+msgstr "スレッドをマーク"
+
+#: src/client/components/main-toolbar.vala:76
+msgid "Mark conversations"
+msgstr "スレッドをマーク"
+
+#: src/client/components/main-toolbar.vala:77
+msgid "Add label to conversation"
+msgstr "スレッドにラベル付け"
+
+#: src/client/components/main-toolbar.vala:78
+msgid "Add label to conversations"
+msgstr "スレッドにラベル付け"
+
+#: src/client/components/main-toolbar.vala:79
+msgid "Move conversation"
+msgstr "スレッドを移動"
+
+#: src/client/components/main-toolbar.vala:80
+msgid "Move conversations"
+msgstr "スレッドを移動"
+
+#: src/client/components/main-window.vala:500
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:47
+#, c-format
+msgid "Problem connecting to incoming server for %s"
+msgstr "%s の受信サーバーとの接続時に問題があります"
+
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:49
+#: src/client/components/main-window-info-bar.vala:57
+#, c-format
+msgid ""
+"Could not connect to %s, check your Internet access and the server name and "
+"try again"
+msgstr ""
+"%s に接続できなかったため、インターネット接続とサーバー名を確認して再試行してください"
+
+#. Button tooltip for retrying an account problem
+#: src/client/components/main-window-info-bar.vala:50
+#: src/client/components/main-window-info-bar.vala:59 ui/main-window.ui:265
+msgid "Retry connecting now"
+msgstr "今すぐ接続を再試行する"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:55
+#, c-format
+msgid "Problem connecting to outgoing server for %s"
+msgstr "%s の送信サーバーとの接続時に問題があります"
+
+#: src/client/components/main-window-info-bar.vala:58
+msgid "Try reconnecting now"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:64
+#, c-format
+msgid "Problem with connection to incoming server for %s"
+msgstr ""
+
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:66
+#: src/client/components/main-window-info-bar.vala:74
+#, c-format
+msgid "Network error talking to %s, check your Internet access and try again"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:67
+#: src/client/components/main-window-info-bar.vala:75
+#: src/client/components/main-window-info-bar.vala:83
+#: src/client/components/main-window-info-bar.vala:91
+#: src/client/components/main-window-info-bar.vala:126
+msgid "Try reconnecting"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:72
+#, c-format
+msgid "Problem with connection to outgoing server for %s"
+msgstr "%s の送信サーバーとの接続に問題があります"
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:80
+#, c-format
+msgid "Problem communicating with incoming server for %s"
+msgstr "%s の受信サーバーとの通信に問題があります"
+
+#. Translators: String substitution is the server name
+#: src/client/components/main-window-info-bar.vala:82
+#, c-format
+msgid ""
+"Geary did not understand a message from %s or vice versa, please file a bug "
+"report"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:87
+msgid "Problem communicating with outgoing mail server"
+msgstr ""
+
+#. Translators: First string substitution is the server
+#. name, second is the account name
+#: src/client/components/main-window-info-bar.vala:90
+#, c-format
+msgid ""
+"Could not communicate with %s for %s, check the server name and try again in "
+"a moment"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:96
+#, c-format
+msgid "Incoming mail server password required for %s"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:97
+msgid "Messages cannot be received without the correct password."
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:98
+msgid "Retry receiving email, you will be prompted for a password"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:103
+#, c-format
+msgid "Outgoing mail server password required for %s"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:104
+msgid "Messages cannot be sent without the correct password."
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:105
+msgid "Retry sending queued messages, you will be prompted for a password"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:110
+#, c-format
+msgid "Incoming mail server security is not trusted for %s"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:111
+msgid "Messages will not be received until checked."
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:112
+#: src/client/components/main-window-info-bar.vala:119
+msgid "Check security details"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:117
+#, c-format
+msgid "Outgoing mail server security is not trusted for %s"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:118
+msgid "Messages cannot be sent until checked."
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:124
+#, c-format
+msgid "A problem occurred checking mail for %s"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:125
+#: src/client/components/main-window-info-bar.vala:132
+msgid "Something went wrong, please file a bug report if the problem persists"
+msgstr ""
+
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:131
+#, c-format
+msgid "A problem occurred sending mail for %s"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:133
+msgid "Retry sending queued messages"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:144
+msgid "A database problem has occurred"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2591
-msgid "Undo archive (Ctrl+Z)"
-msgstr "アーカイブから戻す(Ctrl+Z)"
+#. Translators: String substitution is the account name
+#: src/client/components/main-window-info-bar.vala:146
+#, c-format
+msgid "Messages for %s must be downloaded again."
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2606
-msgid "Undo trash (Ctrl+Z)"
-msgstr "ごみ箱から戻す(Ctrl+Z)"
+#: src/client/components/main-window-info-bar.vala:159
+msgid "Geary has encountered a problem"
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2660
-msgid "Undo (Ctrl+Z)"
-msgstr "元に戻す(Ctrl+Z)"
+#: src/client/components/main-window-info-bar.vala:160
+msgid ""
+"Please check the technical details and report the problem if it persists."
+msgstr ""
 
-#: ../src/client/application/geary-controller.vala:2785
-msgid "Failed to open default text editor."
-msgstr "デフォルトのテキストエディターの起動に失敗しました。"
+#: src/client/components/main-window-info-bar.vala:168
+msgid "_Details"
+msgstr "詳細(_D)"
 
-#: ../src/client/components/main-window.vala:417
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
+#. Button tooltip for displaying technical details about an account problem
+#: src/client/components/main-window-info-bar.vala:169 ui/main-window.ui:250
+msgid "View technical details about the error"
+msgstr ""
+
+#: src/client/components/main-window-info-bar.vala:173
+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
+#: 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
+#: 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:100
+#: src/client/components/search-bar.vala:101
 #, c-format
 msgid "Indexing %s account"
 msgstr ""
 
-#: ../src/client/components/search-bar.vala:111
-#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#: src/client/components/search-bar.vala:112
+#: 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
+#: src/client/components/status-bar.vala:26
 msgid "Sending…"
 msgstr "送信中…"
 
-#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr "メール送信時にエラーが発生しました"
+
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr "送信メール保存時にエラーが発生しました"
+
+#: src/client/components/stock.vala:18
 msgid "_OK"
 msgstr "OK(_O)"
 
-#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
-#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
+#: src/client/components/stock.vala:19 ui/password-dialog.glade:196
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: ../src/client/components/stock.vala:21 ../ui/gtk/menus.ui.h:6
+#: src/client/components/stock.vala:21 ui/gtk/menus.ui:34
 msgid "_About"
 msgstr "このアプリケーションについて(_A)"
 
-#: ../src/client/components/stock.vala:23
+#: src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "追加(_A)"
+
+#: src/client/components/stock.vala:23
 msgid "_Close"
 msgstr "閉じる(_C)"
 
-#: ../src/client/components/stock.vala:24
+#: src/client/components/stock.vala:24
 msgid "_Discard"
 msgstr "破棄(_D)"
 
-#: ../src/client/components/stock.vala:25 ../ui/gtk/menus.ui.h:5
+#: src/client/components/stock.vala:25 ui/gtk/menus.ui:29
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: ../src/client/components/stock.vala:26 ../ui/conversation-email-menus.ui.h:9
+#: src/client/components/stock.vala:26 ui/conversation-email-menus.ui:77
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: ../src/client/components/stock.vala:27 ../ui/gtk/menus.ui.h:3
+#: src/client/components/stock.vala:27 ui/gtk/menus.ui:17
 msgid "_Preferences"
 msgstr "設定(_P)"
 
-#: ../src/client/components/stock.vala:28 ../ui/conversation-email-menus.ui.h:7
+#. Translators: Menu item to print a single, specific message
+#: src/client/components/stock.vala:28 ui/conversation-email-menus.ui:64
 msgid "_Print…"
 msgstr "印刷(_P)…"
 
-#: ../src/client/components/stock.vala:29 ../ui/gtk/menus.ui.h:7
+#: src/client/components/stock.vala:29 ui/gtk/menus.ui:38
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+#: src/client/components/stock.vala:30
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: ../src/client/components/stock.vala:32
+#: src/client/components/stock.vala:31 ui/conversation-email-menus.ui:83
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: src/client/components/stock.vala:32
 msgid "_Keep"
 msgstr "保持(_K)"
 
-#: ../src/client/composer/composer-link-popover.vala:150
+#: src/client/composer/composer-link-popover.vala:149
 msgid "Link URL is not correctly formatted, e.g. http://example.com";
 msgstr "リンク URL の書式が間違っています (例: http://example.com )"
 
-#: ../src/client/composer/composer-link-popover.vala:157
+#: src/client/composer/composer-link-popover.vala:156
 msgid "Invalid link URL"
 msgstr "無効なリンク URL"
 
-#: ../src/client/composer/composer-link-popover.vala:157
+#: src/client/composer/composer-link-popover.vala:156
 msgid "Invalid email address"
 msgstr "無効なメールアドレス"
 
-#: ../src/client/composer/composer-widget.vala:154
+#: src/client/composer/composer-widget.vala:158
 msgid "Saved"
 msgstr "保存済み"
 
-#: ../src/client/composer/composer-widget.vala:155
+#: src/client/composer/composer-widget.vala:159
 msgid "Saving"
 msgstr "保存中"
 
-#: ../src/client/composer/composer-widget.vala:156
+#: src/client/composer/composer-widget.vala:160
 msgid "Error saving"
 msgstr "保存エラー"
 
-#: ../src/client/composer/composer-widget.vala:157
+#: src/client/composer/composer-widget.vala:161
 msgid "Press Backspace to delete quote"
 msgstr "Backspace を押すと引用を削除できます"
 
-#: ../src/client/composer/composer-widget.vala:158
-msgid "New Message"
-msgstr "新規メッセージ"
-
 #. 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:167
+#: src/client/composer/composer-widget.vala:170
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
 msgstr ""
 
-#: ../src/client/composer/composer-widget.vala:1103
-#: ../src/client/composer/composer-widget.vala:1122
-msgid "Do you want to discard this message?"
-msgstr "このメッセージを破棄しますか?"
-
-#: ../src/client/composer/composer-widget.vala:1235
+#. 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:1103
+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:1131
+msgid "Do you want to discard this draft message?"
+msgstr "この下書きメッセージを破棄しますか?"
+
+#: src/client/composer/composer-widget.vala:1248
 msgid "Send message with an empty subject and body?"
 msgstr "メッセージを件名と本文なしで送信しますか?"
 
-#: ../src/client/composer/composer-widget.vala:1237
+#: src/client/composer/composer-widget.vala:1250
 msgid "Send message with an empty subject?"
 msgstr "メッセージを件名なしで送信しますか?"
 
-#: ../src/client/composer/composer-widget.vala:1239
+#: src/client/composer/composer-widget.vala:1252
 msgid "Send message with an empty body?"
 msgstr "メッセージを本文なしで送信しますか?"
 
-#: ../src/client/composer/composer-widget.vala:1243
+#: src/client/composer/composer-widget.vala:1256
 msgid "Send message without an attachment?"
 msgstr "メッセージを添付ファイルなしで送信しますか?"
 
-#: ../src/client/composer/composer-widget.vala:1544
+#: src/client/composer/composer-widget.vala:1561
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s”はすでに添付されています。"
@@ -932,199 +1470,287 @@ msgstr "“%s”はすでに添付されています。"
 #. 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:1552
-#: ../src/client/conversation-viewer/conversation-email.vala:136
+#: src/client/composer/composer-widget.vala:1569
+#: src/client/conversation-viewer/conversation-email.vala:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/client/composer/composer-widget.vala:1589
+#: src/client/composer/composer-widget.vala:1606
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s”が見つかりませんでした。"
 
-#: ../src/client/composer/composer-widget.vala:1595
+#: src/client/composer/composer-widget.vala:1612
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s”はフォルダーです。"
 
-#: ../src/client/composer/composer-widget.vala:1601
+#: src/client/composer/composer-widget.vala:1618
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s”は空ファイルです。"
 
-#: ../src/client/composer/composer-widget.vala:1614
+#: src/client/composer/composer-widget.vala:1631
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s”を読み取り用に開けませんでした。"
 
-#: ../src/client/composer/composer-widget.vala:1622
+#: src/client/composer/composer-widget.vala:1639
 msgid "Cannot add attachment"
 msgstr "添付できません"
 
-#: ../src/client/composer/composer-widget.vala:1675
+#: src/client/composer/composer-widget.vala:1688
 msgid "To: "
 msgstr "宛先: "
 
-#: ../src/client/composer/composer-widget.vala:1678
+#: src/client/composer/composer-widget.vala:1691
 msgid "Cc: "
 msgstr "Cc: "
 
-#: ../src/client/composer/composer-widget.vala:1681
+#: src/client/composer/composer-widget.vala:1694
 msgid "Bcc: "
 msgstr "Bcc: "
 
-#: ../src/client/composer/composer-widget.vala:1684
+#: src/client/composer/composer-widget.vala:1697
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: ../src/client/composer/composer-widget.vala:1816
+#: src/client/composer/composer-widget.vala:1835
 msgid "Select Color"
 msgstr "色を選択"
 
-#. Displayed in the From dropdown to indicate an "alternate email address"
-#. for an account.  The first printf argument will be the alternate email
-#. address, and the second will be the account's primary email address.
-#: ../src/client/composer/composer-widget.vala:2016
+#. Displayed in the From dropdown to indicate an
+#. "alternate email address" for an account.  The first
+#. printf argument will be the alternate email address,
+#. and the second will be the account's primary email
+#. address.
+#: src/client/composer/composer-widget.vala:2030
 #, 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:2058
+#: src/client/composer/composer-widget.vala:2090
 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:2269
+#: src/client/composer/composer-widget.vala:2315
 msgid "Images"
 msgstr "画像"
 
-#: ../src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/composer-window.vala:14
+msgid "New Message"
+msgstr "新規メッセージ"
+
+#: src/client/composer/spell-check-popover.vala:117
 msgid "Remove this language from the preferred list"
 msgstr "この言語を優先リストから削除"
 
-#: ../src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:121
 msgid "Add this language to the preferred list"
 msgstr "この言語を優先リストに追加"
 
-#: ../src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:217
 msgid "Search for more languages"
 msgstr "言語を検索"
 
-#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/conversation-list-view.vala:283
+msgid "Delete conversation"
+msgstr "スレッドを削除"
+
+#: src/client/conversation-list/conversation-list-view.vala:286
+#: ui/main-toolbar-menus.ui:16
+msgid "Mark as _Read"
+msgstr "既読としてマーク(_R)"
+
+#: src/client/conversation-list/conversation-list-view.vala:289
+#: ui/main-toolbar-menus.ui:20
+msgid "Mark as _Unread"
+msgstr "未読としてマーク(_U)"
+
+#: src/client/conversation-list/conversation-list-view.vala:292
+#: ui/main-toolbar-menus.ui:28
+msgid "U_nstar"
+msgstr "星をはずす(_N)"
+
+#: src/client/conversation-list/conversation-list-view.vala:294
+#: ui/main-toolbar-menus.ui:24
+msgid "_Star"
+msgstr "星を付ける(_S)"
+
+#. Translators: Menu item to reply to a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:297
+#: ui/conversation-email-menus.ui:9
+msgid "_Reply"
+msgstr "返信(_R)"
+
+#: src/client/conversation-list/conversation-list-view.vala:298
+msgid "R_eply All"
+msgstr "全員に返信(_E)"
+
+#. Translators: Menu item to forward a specific message.
+#: src/client/conversation-list/conversation-list-view.vala:299
+#: ui/conversation-email-menus.ui:21
+msgid "_Forward"
+msgstr "転送(_F)"
+
+#: src/client/conversation-list/formatted-conversation-data.vala:11
 msgid "Me"
 msgstr "自分"
 
 #. Translators: This is the file type displayed for
 #. attachments with unknown file types.
-#: ../src/client/conversation-viewer/conversation-email.vala:122
+#: src/client/conversation-viewer/conversation-email.vala:159
 msgid "Unknown"
 msgstr "不明"
 
-#. Preview headers
+#: src/client/conversation-viewer/conversation-email.vala:958
+msgid "From:"
+msgstr "差出人:"
+
+#: src/client/conversation-viewer/conversation-email.vala:962
+#: ui/conversation-message.ui:313
+msgid "To:"
+msgstr "宛先:"
+
+#: src/client/conversation-viewer/conversation-email.vala:966
+#: ui/conversation-message.ui:358
+msgid "Cc:"
+msgstr "Cc:"
+
+#: src/client/conversation-viewer/conversation-email.vala:970
+#: ui/conversation-message.ui:403
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: src/client/conversation-viewer/conversation-email.vala:974
+msgid "Date:"
+msgstr "日時:"
+
+#: src/client/conversation-viewer/conversation-email.vala:978
+msgid "Subject:"
+msgstr "件名:"
+
+#: src/client/conversation-viewer/conversation-message.vala:64
+msgid "This email address may have been forged"
+msgstr ""
+
+#. Compact headers
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: ../src/client/conversation-viewer/conversation-message.vala:332
+#: src/client/conversation-viewer/conversation-message.vala:392
 msgid "No sender"
 msgstr "送信者なし"
 
 #. Translators: This separates multiple 'from'
-#. addresses in the header preview for a message.
-#: ../src/client/conversation-viewer/conversation-message.vala:590
+#. addresses in the compact header for a message.
+#: src/client/conversation-viewer/conversation-message.vala:776
 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:689
+#: src/client/conversation-viewer/conversation-message.vala:879
 msgid "Image"
 msgstr "画像"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:74
+#. Translators: Title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:81
 msgid "No conversations selected"
 msgstr "スレッドを選択していません"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:76
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:85
 msgid "Selecting a conversation from the list will display it here"
 msgstr "リストからスレッドを選択すると、ここに表示します"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:81
+#. Translators: Title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:94
 msgid "Multiple conversations selected"
 msgstr "複数のスレッドを選択しています"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:83
+#. Translators: Sub-title label for placeholder when multiple
+#. conversations have been selected.
+#: src/client/conversation-viewer/conversation-viewer.vala:98
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "選択したすべてのスレッドにアクションを適用します"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:88
-#: ../src/client/conversation-viewer/conversation-viewer.vala:95
+#. Translators: Title label for placeholder when no
+#. conversations have exist in a folder.
+#. Translators: Title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:107
+#: src/client/conversation-viewer/conversation-viewer.vala:120
 msgid "No conversations found"
 msgstr "スレッドが見つかりません"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:90
+#. Translators: Sub-title label for placeholder when no
+#. conversations have exist in a folder.
+#: src/client/conversation-viewer/conversation-viewer.vala:111
 msgid "This folder does not contain any conversations"
 msgstr "このフォルダーにはスレッドがありません"
 
-#: ../src/client/conversation-viewer/conversation-viewer.vala:97
+#. Translators: Sub-title label for placeholder when no
+#. conversations have been found in a search.
+#: src/client/conversation-viewer/conversation-viewer.vala:124
 msgid "Your search returned no results, try refining your search terms"
 msgstr "検索結果がないため条件を変えて再検索してください"
 
-#: ../src/client/dialogs/attachment-dialog.vala:28
-#: ../src/client/dialogs/attachment-dialog.vala:30
+#: src/client/dialogs/attachment-dialog.vala:25
 msgid "Choose a file"
 msgstr "ファイルを選択"
 
-#: ../src/client/dialogs/attachment-dialog.vala:28
-#: ../src/client/dialogs/attachment-dialog.vala:30
+#: src/client/dialogs/attachment-dialog.vala:25
 msgid "_Attach"
 msgstr "添付(_A)"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#: src/client/dialogs/certificate-warning-dialog.vala:36
 #, c-format
 msgid "Untrusted Connection: %s"
 msgstr "信頼できない接続: %s"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#: src/client/dialogs/certificate-warning-dialog.vala:38
 #, c-format
 msgid "The identity of the %s mail server at %s:%u could not be verified."
 msgstr "%s メールサーバー (%s:%u) の ID を確認できませんでした。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+#: src/client/dialogs/certificate-warning-dialog.vala:48
 msgid ""
 "Selecting “Trust This Server” or “Always Trust This Server” may cause your "
 "username and password to be transmitted insecurely."
 msgstr ""
-"“このサーバーを信頼する”、“常にこのサーバーを信頼する”を選択すると、ユーザー名"
-"とパスワードが安全に送信されない可能性があります。"
+"“このサーバーを信頼する”、“常にこのサーバーを信頼する”を選択すると、ユーザー"
+"名とパスワードが安全に送信されない可能性があります。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+#: src/client/dialogs/certificate-warning-dialog.vala:56
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary not to access this "
 "server."
 msgstr ""
-"“このサーバーを信頼しない”を選択すると、Geary はこのサーバーにアクセスしません。"
+"“このサーバーを信頼しない”を選択すると、Geary はこのサーバーにアクセスしませ"
+"ん。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+#: src/client/dialogs/certificate-warning-dialog.vala:58
 msgid "Geary will not add or update this email account."
-msgstr ""
-"Geary はこのメールアカウントの追加または更新をしません。"
+msgstr "Geary はこのメールアカウントの追加または更新をしません。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+#: src/client/dialogs/certificate-warning-dialog.vala:63
 msgid ""
 "Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
 "account."
 msgstr ""
-"“このサーバーを信頼しない”を選択すると、Geary はこのアカウントへのアクセスを止めます。"
-
-#: ../src/client/dialogs/certificate-warning-dialog.vala:61
-msgid "Geary will exit if you have no other open email accounts."
-msgstr "他に開いているメールアカウントがなければ終了します。"
+"“このサーバーを信頼しない”を選択すると、Geary はこのアカウントへのアクセスを"
+"止めます。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+#: src/client/dialogs/certificate-warning-dialog.vala:69
 msgid ""
 "Contact your system administrator or email service provider if you have any "
 "question about these issues."
@@ -1132,50 +1758,50 @@ msgstr ""
 "これらの問題について質問がある場合は、システム管理者またはメールサービスプロ"
 "バイダーに問い合わせてください。"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+#: src/client/dialogs/certificate-warning-dialog.vala:76
 msgid "The server’s certificate is not signed by a known authority"
 msgstr "サーバーの証明書が既知の認証局によって署名されていません"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+#: src/client/dialogs/certificate-warning-dialog.vala:79
 msgid "The server’s identity does not match the identity in the certificate"
 msgstr "サーバーの ID が証明書の ID と一致しません"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+#: src/client/dialogs/certificate-warning-dialog.vala:82
 msgid "The server’s certificate has expired"
 msgstr "サーバーの証明書が期限切れです"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+#: src/client/dialogs/certificate-warning-dialog.vala:85
 msgid "The server’s certificate has not been activated"
 msgstr "サーバーの証明書が有効になっていません"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+#: src/client/dialogs/certificate-warning-dialog.vala:88
 msgid "The server’s certificate has been revoked and is now invalid"
 msgstr "このサーバーの証明書は失効しているため現在無効です"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+#: src/client/dialogs/certificate-warning-dialog.vala:91
 msgid "The server’s certificate is considered insecure"
 msgstr "このサーバーの証明書は安全ではないと思われます"
 
-#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+#: src/client/dialogs/certificate-warning-dialog.vala:94
 msgid "An error has occurred processing the server’s certificate"
 msgstr "サーバーの証明書を処理中にエラーが発生しました"
 
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
-#: ../src/client/dialogs/password-dialog.vala:16
+#: src/client/dialogs/password-dialog.vala:16
 msgid "Geary requires your email password to continue"
 msgstr "続けるにはメールのパスワードが必要です"
 
 #. Label displaying total number of email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+#: src/client/folder-list/folder-list-folder-entry.vala:32
 #, c-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] "%d 件のメッセージ"
 
 #. / Label displaying number of unread email messages in a folder
-#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+#: src/client/folder-list/folder-list-folder-entry.vala:39
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -1184,39 +1810,39 @@ msgstr[0] "%d 件の未読"
 #. / This string represents the divider between two messages: "n messages" and "n unread",
 #. / shown in the folder list as a tooltip.  Please use your languages conventions for
 #. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../src/client/folder-list/folder-list-folder-entry.vala:45
+#: src/client/folder-list/folder-list-folder-entry.vala:45
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+#: src/client/folder-list/folder-list-inboxes-branch.vala:14
 msgid "Inboxes"
 msgstr "受信トレイ"
 
-#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#: src/client/folder-list/folder-list-search-branch.vala:44
 #, c-format
 msgid "%d result"
 msgid_plural "%d results"
 msgstr[0] "%d 件の結果"
 
-#: ../src/client/notification/libmessagingmenu.vala:75
+#: src/client/notification/libmessagingmenu.vala:75
 #, c-format
 msgid "%s — New Messages"
 msgstr "%s — 新着メッセージ"
 
-#: ../src/client/notification/libnotify.vala:74
+#: src/client/notification/libnotify.vala:75
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 件の新着メッセージ"
 
-#: ../src/client/notification/libnotify.vala:77
+#: src/client/notification/libnotify.vala:78
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, 合計 %d 件の新着メッセージ"
 
-#: ../src/client/notification/libnotify.vala:109
+#: src/client/notification/libnotify.vala:110
 #, c-format
 msgid ""
 "%s\n"
@@ -1228,185 +1854,174 @@ msgstr[0] ""
 "%s\n"
 "(他に %d 件の新着メッセージ %s)"
 
-#: ../src/client/notification/libnotify.vala:165
+#: src/client/notification/libnotify.vala:149
 msgid "Open"
 msgstr "開く"
 
 #. / Datetime format for 12-hour time, i.e. 8:31 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:68
+#: src/client/util/util-date.vala:68
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:71
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:74
+#: src/client/util/util-date.vala:74
 msgctxt "Default clock format"
 msgid "%l:%M %P"
 msgstr "%l:%M %P"
 
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:78
 msgid "%b %-e"
 msgstr "%b %-e日"
 
 #. / Date format for dates within a different year, i.e. 02/04/10
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:83
+#: src/client/util/util-date.vala:83
 #, no-c-format
 msgid "%x"
 msgstr "%x"
 
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:88
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%Y年 %B %-e日, %-l:%M %P"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:91
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%Y年 %B %-e日, %-H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:94
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%Y年 %B %-e日, %-l:%M %P"
 
-#: ../src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:164
 msgid "Now"
 msgstr "今"
 
-#: ../src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:167
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%d分前"
 
-#: ../src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:171
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%d時間前"
 
-#: ../src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:178
 msgid "Yesterday"
 msgstr "昨日"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:183
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: ../src/client/util/util-email.vala:30
-#: ../src/engine/rfc822/rfc822-message.vala:908
+#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:846
 msgid "(no subject)"
 msgstr "(件名なし)"
 
-#: ../src/client/util/util-files.vala:16
+#. Translators: This is shown for displaying a list of
+#. email recipients that happens to be empty,
+#. i.e. contains no email addresses.
+#: src/client/util/util-email.vala:49
+msgid "(No recipients)"
+msgstr ""
+
+#. Translators: This is used for displaying a short list of
+#. email recipients lists with two or more addresses. The
+#. first (string) substitution is address of the first, the
+#. second substitution is the number of n - 1 remaining
+#. recipients.
+#: src/client/util/util-email.vala:63
+#, c-format
+msgid "%s and %d other"
+msgid_plural "%s and %d others"
+msgstr[0] ""
+
+#: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "バイト"
 
-#: ../src/client/util/util-files.vala:19
+#: src/client/util/util-files.vala:19
 msgctxt "Abbreviation for terabyte"
 msgid "TB"
 msgstr "TB"
 
-#: ../src/client/util/util-files.vala:22
+#: src/client/util/util-files.vala:22
 msgctxt "Abbreviation for gigabyte"
 msgid "GB"
 msgstr "GB"
 
-#: ../src/client/util/util-files.vala:25
+#: src/client/util/util-files.vala:25
 msgctxt "Abbreviation for megabyte"
 msgid "MB"
 msgstr "MB"
 
-#: ../src/client/util/util-files.vala:28
+#: src/client/util/util-files.vala:28
 msgctxt "Abbreviation for kilobyte"
 msgid "KB"
 msgstr "KB"
 
-#: ../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
-
-#: ../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
-msgstr "Outlook.com"
-
-#: ../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "その他"
-
-#: ../src/engine/api/geary-service.vala:20
-msgid "IMAP"
-msgstr "IMAP"
-
-#: ../src/engine/api/geary-service.vala:23
-msgid "SMTP"
-msgstr "SMTP"
-
-#: ../src/engine/api/geary-special-folder-type.vala:24
+#: src/engine/api/geary-special-folder-type.vala:24
 msgid "Inbox"
 msgstr "受信トレイ"
 
-#: ../src/engine/api/geary-special-folder-type.vala:27
+#: src/engine/api/geary-special-folder-type.vala:27
 msgid "Drafts"
 msgstr "下書き"
 
-#: ../src/engine/api/geary-special-folder-type.vala:30
+#: src/engine/api/geary-special-folder-type.vala:30
 msgid "Sent Mail"
 msgstr "送信済みメール"
 
-#: ../src/engine/api/geary-special-folder-type.vala:33
+#: src/engine/api/geary-special-folder-type.vala:33
 msgid "Starred"
 msgstr "星"
 
-#: ../src/engine/api/geary-special-folder-type.vala:36
+#: src/engine/api/geary-special-folder-type.vala:36
 msgid "Important"
 msgstr "重要"
 
-#: ../src/engine/api/geary-special-folder-type.vala:39
+#: src/engine/api/geary-special-folder-type.vala:39
 msgid "All Mail"
 msgstr "すべてのメール"
 
-#: ../src/engine/api/geary-special-folder-type.vala:42
+#: src/engine/api/geary-special-folder-type.vala:42
 msgid "Spam"
 msgstr "迷惑メール"
 
-#: ../src/engine/api/geary-special-folder-type.vala:45
+#: src/engine/api/geary-special-folder-type.vala:45
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: ../src/engine/api/geary-special-folder-type.vala:48
+#: src/engine/api/geary-special-folder-type.vala:48
 msgid "Outbox"
 msgstr "送信トレイ"
 
-#: ../src/engine/api/geary-special-folder-type.vala:54
+#: src/engine/api/geary-special-folder-type.vala:54
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:29
-msgid "None"
-msgstr "なし"
-
 #. Map of possibly translated search operator names and values
 #. to English/internal names and values. We include the
 #. English version anyway so that when translations provide a
@@ -1420,7 +2035,7 @@ msgstr "なし"
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:99
+#: src/engine/imap-db/imap-db-account.vala:125
 msgctxt "Search operator"
 msgid "attachment"
 msgstr ""
@@ -1433,7 +2048,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:108
+#: src/engine/imap-db/imap-db-account.vala:134
 msgctxt "Search operator"
 msgid "bcc"
 msgstr ""
@@ -1445,7 +2060,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:116
+#: src/engine/imap-db/imap-db-account.vala:142
 msgctxt "Search operator"
 msgid "body"
 msgstr ""
@@ -1458,7 +2073,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:125
+#: src/engine/imap-db/imap-db-account.vala:151
 msgctxt "Search operator"
 msgid "cc"
 msgstr ""
@@ -1471,7 +2086,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:134
+#: src/engine/imap-db/imap-db-account.vala:160
 msgctxt "Search operator"
 msgid "from"
 msgstr ""
@@ -1483,7 +2098,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:142
+#: src/engine/imap-db/imap-db-account.vala:168
 msgctxt "Search operator"
 msgid "is"
 msgstr ""
@@ -1495,7 +2110,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary
 #. User Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:150
+#: src/engine/imap-db/imap-db-account.vala:176
 msgctxt "Search operator"
 msgid "subject"
 msgstr ""
@@ -1508,7 +2123,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:159
+#: src/engine/imap-db/imap-db-account.vala:185
 msgctxt "Search operator"
 msgid "to"
 msgstr ""
@@ -1521,7 +2136,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:180
+#: src/engine/imap-db/imap-db-account.vala:206
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr ""
@@ -1533,7 +2148,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:192
+#: src/engine/imap-db/imap-db-account.vala:218
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr ""
@@ -1545,7 +2160,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:204
+#: src/engine/imap-db/imap-db-account.vala:230
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr ""
@@ -1558,7 +2173,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:215
+#: src/engine/imap-db/imap-db-account.vala:241
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr ""
@@ -1570,7 +2185,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: ../src/engine/imap-db/imap-db-account.vala:225
+#: src/engine/imap-db/imap-db-account.vala:251
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr ""
@@ -1579,7 +2194,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:626
+#: src/engine/imap-engine/imap-engine-generic-account.vala:936
 msgid "Drafts | Draft"
 msgstr ""
 
@@ -1587,13 +2202,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:635
+#: src/engine/imap-engine/imap-engine-generic-account.vala:945
 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:640
+#: src/engine/imap-engine/imap-engine-generic-account.vala:950
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr ""
@@ -1602,7 +2217,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:650
+#: src/engine/imap-engine/imap-engine-generic-account.vala:960
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -1612,13 +2227,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:660
+#: src/engine/imap-engine/imap-engine-generic-account.vala:970
 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:665
+#: src/engine/imap-engine/imap-engine-generic-account.vala:975
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr ""
@@ -1627,1018 +2242,1357 @@ 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:675
+#: src/engine/imap-engine/imap-engine-generic-account.vala:985
 msgid "Archive | Archives"
 msgstr ""
 
 #. / Format for the datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/engine/rfc822/rfc822-utils.vala:236
+#: src/engine/rfc822/rfc822-utils.vala:236
 msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgstr "%Y %b %-e日 (%a), %l:%M %p"
 
 #. / The quoted header for a message being replied to.
 #. / %1$s will be substituted for the date, and %2$s will be substituted for
 #. / the original sender.
-#: ../src/engine/rfc822/rfc822-utils.vala:242
+#: src/engine/rfc822/rfc822-utils.vala:242
 #, 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/engine/rfc822/rfc822-utils.vala:249
+#: src/engine/rfc822/rfc822-utils.vala:249
 #, c-format
 msgid "%s wrote:"
 msgstr "%s wrote:"
 
 #. / The quoted header for a message being replied to (in case the sender is not known).
 #. / %s will be replaced by the original date
-#: ../src/engine/rfc822/rfc822-utils.vala:255
+#: src/engine/rfc822/rfc822-utils.vala:255
 #, c-format
 msgid "On %s:"
 msgstr ""
 
-#: ../src/engine/rfc822/rfc822-utils.vala:282
+#: src/engine/rfc822/rfc822-utils.vala:282
 msgid "---------- Forwarded message ----------"
 msgstr "---------- 転送されたメッセージ ----------"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:286
+#: src/engine/rfc822/rfc822-utils.vala:286
 #, c-format
 msgid "From: %s\n"
 msgstr "差出人: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:287
+#: src/engine/rfc822/rfc822-utils.vala:287
 #, c-format
 msgid "Subject: %s\n"
 msgstr "件名: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:288
+#: src/engine/rfc822/rfc822-utils.vala:288
 #, c-format
 msgid "Date: %s\n"
 msgstr "日時: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:291
+#: src/engine/rfc822/rfc822-utils.vala:291
 #, c-format
 msgid "To: %s\n"
 msgstr "宛先: %s\n"
 
-#: ../src/engine/rfc822/rfc822-utils.vala:294
+#: src/engine/rfc822/rfc822-utils.vala:294
 #, c-format
 msgid "Cc: %s\n"
 msgstr "Cc: %s\n"
 
-#: ../ui/account_cannot_remove.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">アカウントを削除できません</span> "
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+msgid "Add an account"
+msgstr "アカウントを追加"
 
-#: ../ui/account_cannot_remove.glade.h:2
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
-msgstr ""
-"アカウントと関連づけられた作成画面がすでに開いています. メッセージを送信するか"
-"破棄してからもう一度試してください"
+#: ui/accounts_editor_add_pane.ui:53
+msgid "Create"
+msgstr "作成"
 
-#: ../ui/account_list.glade.h:1
-msgid "Add account"
-msgstr "アカウントを追加"
+#: ui/accounts_editor_add_pane.ui:130 ui/accounts_editor_servers_pane.ui:125
+msgid "Receiving"
+msgstr "受信"
+
+#: ui/accounts_editor_add_pane.ui:178 ui/accounts_editor_servers_pane.ui:165
+msgid "Sending"
+msgstr "送信"
 
-#: ../ui/account_list.glade.h:2
-msgid "Edit account"
+#: ui/accounts_editor_edit_pane.ui:8
+msgid "Edit Account"
 msgstr "アカウントを編集"
 
-#: ../ui/account_list.glade.h:3
+#: ui/accounts_editor_edit_pane.ui:9 ui/accounts_editor_servers_pane.ui:9
+msgid "Account Name"
+msgstr "アカウント名"
+
+#: ui/accounts_editor_edit_pane.ui:124
+msgid "Email addresses"
+msgstr "メールアドレス"
+
+#: ui/accounts_editor_edit_pane.ui:164
+msgid "Signature"
+msgstr ""
+
+#: ui/accounts_editor_edit_pane.ui:201
+msgid "Settings"
+msgstr "設定"
+
+#. This is a button in the account settings to show server settings.
+#: ui/accounts_editor_edit_pane.ui:243 ui/accounts_editor_servers_pane.ui:8
+msgid "Server Settings"
+msgstr "サーバー設定"
+
+#. This is the remove account button in the account settings.
+#: ui/accounts_editor_edit_pane.ui:258 ui/accounts_editor_remove_pane.ui:23
+msgid "Remove Account"
+msgstr "アカウントを削除"
+
+#: ui/accounts_editor_edit_pane.ui:262 ui/accounts_editor_remove_pane.ui:27
+msgid "Remove this account from Geary"
+msgstr "Geary からこのアカウントを削除"
+
+#: ui/accounts_editor_list_pane.ui:8
+msgid "Accounts"
+msgstr "アカウント"
+
+#: ui/accounts_editor_list_pane.ui:63
+msgid "To get started, select an email provider below."
+msgstr "以下の中からメールプロバイダーを選択してください。"
+
+#: ui/accounts_editor_list_pane.ui:76
+msgid "Welcome to Geary"
+msgstr "Geary へようこそ"
+
+#. This title is shown to users when confirming if they want to remove an account. The string substitution 
is replaced with the account's name.
+#: ui/accounts_editor_remove_pane.ui:73
+#, c-format
+msgid "Confirm removing: %s"
+msgstr "削除の確認: %s"
+
+#: ui/accounts_editor_remove_pane.ui:91
+msgid ""
+"Removing an account will remove it from Geary and delete locally cached "
+"email data from your computer, but not from your service provider."
+msgstr ""
+"Geary でアカウントを削除すると、コンピューターに保存されたメールデータの"
+"キャッシュが削除されますが、メールサービスプロバイダー側では削除されません。"
+
+#: ui/accounts_editor_remove_pane.ui:122
 msgid "Remove account"
 msgstr "アカウントを削除"
 
-#: ../ui/account_spinner.glade.h:1
-msgid "Please wait while Geary validates your account."
-msgstr "アカウントを検証しています..."
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: ui/accounts_editor_servers_pane.ui:47
+msgid "Apply"
+msgstr "適用"
 
-#: ../ui/certificate_warning_dialog.glade.h:1
+#: ui/certificate_warning_dialog.glade:7
 msgid "Untrusted Connection"
 msgstr "信頼できない接続"
 
-#: ../ui/certificate_warning_dialog.glade.h:2
+#: ui/certificate_warning_dialog.glade:29
 msgid "_Always Trust This Server"
 msgstr "常にこのサーバーを信頼する(_A)"
 
-#: ../ui/certificate_warning_dialog.glade.h:3
+#: ui/certificate_warning_dialog.glade:43
 msgid "_Trust This Server"
 msgstr "このサーバーを信頼する(_T)"
 
-#: ../ui/certificate_warning_dialog.glade.h:4
+#: ui/certificate_warning_dialog.glade:57
 msgid "_Don’t Trust This Server"
 msgstr "このサーバーを信頼しない(_D)"
 
-#: ../ui/composer-headerbar.ui.h:1
+#: ui/composer-headerbar.ui:17 ui/composer-headerbar.ui:174
 msgid "Detach (Ctrl+D)"
 msgstr "分離(Ctrl+D)"
 
-#: ../ui/composer-headerbar.ui.h:2
+#: ui/composer-headerbar.ui:57 ui/composer-headerbar.ui:83
 msgid "Attach File (Ctrl+T)"
 msgstr "ファイルを添付(Ctrl+T)"
 
-#: ../ui/composer-headerbar.ui.h:3
+#: ui/composer-headerbar.ui:107
 msgid "Include Original Attachments"
 msgstr "元の添付ファイルを含める"
 
-#: ../ui/composer-headerbar.ui.h:4
-msgid "Send (Ctrl+Enter)"
-msgstr "送信(Ctrl+Enter)"
-
-#: ../ui/composer-headerbar.ui.h:5
+#: ui/composer-headerbar.ui:202
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: ../ui/composer-headerbar.ui.h:6
+#: ui/composer-headerbar.ui:207
+msgid "Send (Ctrl+Enter)"
+msgstr "送信(Ctrl+Enter)"
+
+#: ui/composer-headerbar.ui:230
 msgid "Discard and Close"
 msgstr "破棄して閉じる"
 
-#: ../ui/composer-headerbar.ui.h:7
+#: ui/composer-headerbar.ui:254
 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.h:2
+#: ui/composer-link-popover.ui:41
 msgid "Insert the new link with this URL"
 msgstr "この URL の新規リンクを挿入"
 
-#: ../ui/composer-link-popover.ui.h:3
+#: ui/composer-link-popover.ui:52
 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.h:5
+#: ui/composer-link-popover.ui:66
 msgid "Update this link’s URL"
 msgstr "このリンクの URL を更新"
 
-#: ../ui/composer-link-popover.ui.h:6
+#: ui/composer-link-popover.ui:86
 msgid "Delete this link"
 msgstr "このリンクを削除"
 
-#: ../ui/composer-link-popover.ui.h:7
+#: ui/composer-link-popover.ui:106
 msgid "Open this link"
 msgstr "このリンクを開く"
 
-#: ../ui/composer-menus.ui.h:1
+#: ui/composer-menus.ui:7
 msgid "S_ans Serif"
 msgstr "Sans Serif(_A)"
 
-#: ../ui/composer-menus.ui.h:2
+#: ui/composer-menus.ui:12
 msgid "S_erif"
 msgstr "Serif(_E)"
 
-#: ../ui/composer-menus.ui.h:3
+#: ui/composer-menus.ui:17
 msgid "_Fixed Width"
 msgstr "等幅(_F)"
 
-#: ../ui/composer-menus.ui.h:4
+#: ui/composer-menus.ui:24
 msgid "_Small"
 msgstr "小(_S)"
 
-#: ../ui/composer-menus.ui.h:5
+#: ui/composer-menus.ui:29
 msgid "_Medium"
 msgstr "中(_M)"
 
-#: ../ui/composer-menus.ui.h:6
+#: ui/composer-menus.ui:34
 msgid "Lar_ge"
 msgstr "大(_G)"
 
-#: ../ui/composer-menus.ui.h:7
+#: ui/composer-menus.ui:41
 msgid "C_olor"
 msgstr "色(_O)"
 
-#: ../ui/composer-menus.ui.h:8
+#: ui/composer-menus.ui:47 ui/composer-menus.ui:62
 msgid "_Rich Text"
 msgstr "リッチテキスト(_R)"
 
-#: ../ui/composer-menus.ui.h:9
+#: ui/composer-menus.ui:53 ui/composer-menus.ui:68
 msgid "Show Extended Fields"
 msgstr "拡張フィールドを表示"
 
-#: ../ui/composer-menus.ui.h:10
+#: ui/composer-menus.ui:78
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: ../ui/composer-menus.ui.h:11
+#: ui/composer-menus.ui:82
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: ../ui/composer-menus.ui.h:12
+#: ui/composer-menus.ui:88 ui/composer-menus.ui:106
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: ../ui/composer-menus.ui.h:13 ../ui/conversation-message-menus.ui.h:7
+#: ui/composer-menus.ui:92 ui/composer-menus.ui:110
+#: ui/conversation-message-menus.ui:37
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: ../ui/composer-menus.ui.h:14
+#: ui/composer-menus.ui:96 ui/composer-menus.ui:114
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: ../ui/composer-menus.ui.h:15
-msgctxt "Clipboard paste with rich text"
-msgid "Paste _With Formatting"
+#: ui/composer-menus.ui:100
+msgctxt "Clipboard paste as plain text"
+msgid "Paste _Without Formatting"
 msgstr "書式なしで貼り付け(_W)"
 
-#: ../ui/composer-menus.ui.h:16
+#: ui/composer-menus.ui:120
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
+#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
 msgid "_Inspect…"
 msgstr "検証(_I)…"
 
 #. Address(es) e-mail is to be sent to
-#: ../ui/composer-widget.ui.h:2
+#: ui/composer-widget.ui:56
 msgid "_To"
 msgstr "宛先(_T)"
 
-#: ../ui/composer-widget.ui.h:3
+#: ui/composer-widget.ui:75
 msgid "_Cc"
 msgstr "Cc(_C)"
 
-#: ../ui/composer-widget.ui.h:4
+#: ui/composer-widget.ui:130
 msgid "_Subject"
 msgstr "件名(_S)"
 
-#: ../ui/composer-widget.ui.h:5
+#: ui/composer-widget.ui:149
 msgid "_Bcc"
 msgstr "Bcc(_B)"
 
-#: ../ui/composer-widget.ui.h:6
+#: ui/composer-widget.ui:179
 msgid "_Reply-To"
 msgstr "Reply-To(_R)"
 
 #. Geary account mail will be sent from
-#: ../ui/composer-widget.ui.h:8
+#: ui/composer-widget.ui:208
 msgid "From"
 msgstr "差出人"
 
-#: ../ui/composer-widget.ui.h:9
+#: ui/composer-widget.ui:293
 msgid "Drop files here"
 msgstr "ここにファイルをドロップ"
 
-#: ../ui/composer-widget.ui.h:10
+#: ui/composer-widget.ui:309
 msgid "To add them as attachments"
 msgstr "添付ファイルとして追加"
 
-#: ../ui/composer-widget.ui.h:11
+#: ui/composer-widget.ui:348
 msgid "Undo last edit (Ctrl+Z)"
 msgstr "元に戻す(Ctrl+Z)"
 
-#: ../ui/composer-widget.ui.h:12
+#: ui/composer-widget.ui:372
 msgid "Redo last edit  (Ctrl+Shift+Z)"
 msgstr "やり直す(Ctrl+Shift+Z)"
 
-#: ../ui/composer-widget.ui.h:13
+#: ui/composer-widget.ui:410
 msgid "Bold (Ctrl+B)"
 msgstr "太字(Ctrl+B)"
 
-#: ../ui/composer-widget.ui.h:14
+#: ui/composer-widget.ui:434
 msgid "Italic (Ctrl+I)"
 msgstr "斜体(Ctrl+I)"
 
-#: ../ui/composer-widget.ui.h:15
+#: ui/composer-widget.ui:458
 msgid "Underline (Ctrl+U)"
 msgstr "下線(Ctrl+U)"
 
-#: ../ui/composer-widget.ui.h:16
+#: ui/composer-widget.ui:482
 msgid "Strikethrough (Ctrl+K)"
 msgstr "取り消し線(Ctrl+K)"
 
-#: ../ui/composer-widget.ui.h:17
+#: ui/composer-widget.ui:520
+msgid "Insert unordered list"
+msgstr "番号無しリストを挿入"
+
+#: ui/composer-widget.ui:544
+msgid "Insert ordered list"
+msgstr "番号付きリストを挿入"
+
+#: ui/composer-widget.ui:582
 msgid "Quote text  (Ctrl+])"
 msgstr "引用(Ctrl+])"
 
-#: ../ui/composer-widget.ui.h:18
+#: ui/composer-widget.ui:606
 msgid "Unquote text  (Ctrl+[)"
 msgstr "引用解除(Ctrl+[)"
 
-#: ../ui/composer-widget.ui.h:19
+#: ui/composer-widget.ui:644
 msgid "Insert or update selection link (Ctrl+L)"
 msgstr "選択部分にリンクを挿入/更新(Ctrl+L)"
 
-#: ../ui/composer-widget.ui.h:20
+#: ui/composer-widget.ui:668
 msgid "Insert an image (Ctrl+G)"
 msgstr "画像を挿入(Ctrl+G)"
 
-#: ../ui/composer-widget.ui.h:21
+#: ui/composer-widget.ui:702
 msgid "Remove selection formatting (Ctrl+Space)"
 msgstr "選択部分の書式を削除(Ctrl+Space)"
 
-#: ../ui/composer-widget.ui.h:22
+#: ui/composer-widget.ui:726
 msgid "Select spell checking languages"
 msgstr "スペルチェックする言語を選択"
 
-#: ../ui/conversation-email.ui.h:1
+#: ui/conversation-email.ui:27
 msgid "Save all attachments"
 msgstr "すべての添付ファイルを保存"
 
 #. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
-#: ../ui/conversation-email.ui.h:3
+#: ui/conversation-email.ui:50
 msgid "Mark this message as starred"
 msgstr "このメッセージに星をつける"
 
 #. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
-#: ../ui/conversation-email.ui.h:5
+#: ui/conversation-email.ui:72
 msgid "Mark this message as not starred"
 msgstr "このメッセージの星を外す"
 
-#: ../ui/conversation-email.ui.h:6
+#: ui/conversation-email.ui:95
 msgid "Display the message menu"
 msgstr "メッセージメニューを表示"
 
-#: ../ui/conversation-email.ui.h:7
+#: ui/conversation-email.ui:161
 msgid "Open selected attachments"
 msgstr "選択した添付ファイルを開く"
 
-#: ../ui/conversation-email.ui.h:8
+#: ui/conversation-email.ui:178
 msgid "Save selected attachments"
 msgstr "選択した添付ファイルを保存"
 
-#: ../ui/conversation-email.ui.h:9
+#: ui/conversation-email.ui:195
 msgid "Select all attachments"
 msgstr "すべての添付ファイルを選択"
 
-#: ../ui/conversation-email.ui.h:10
+#: ui/conversation-email.ui:240
 msgid "Edit Draft"
 msgstr "下書きを編集"
 
-#: ../ui/conversation-email.ui.h:11
+#: ui/conversation-email.ui:267
 msgid "Draft message"
 msgstr "下書きメッセージ"
 
-#: ../ui/conversation-email.ui.h:12
+#: ui/conversation-email.ui:283
 msgid "This message has not yet been sent."
 msgstr "このメッセージはまだ送信していません。"
 
-#: ../ui/conversation-email.ui.h:13
+#: ui/conversation-email.ui:329
 msgid "Message not saved"
 msgstr "メッセージが保存されませんでした"
 
-#: ../ui/conversation-email.ui.h:14
+#: ui/conversation-email.ui:345
 msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 "このメッセージは送信されましたが、お使いのアカウントに保存されませんでした。"
 
-#: ../ui/conversation-email-menus.ui.h:2
+#. Translators: Menu item to reply to a specific message.
+#: ui/conversation-email-menus.ui:15
 msgid "Reply to _All"
 msgstr "全員に返信(_A)"
 
-#: ../ui/conversation-email-menus.ui.h:4
+#. Translators: Menu item to mark a specific message as
+#. read.
+#: ui/conversation-email-menus.ui:30
 msgid "_Mark Read"
 msgstr "既読としてマーク(_M)"
 
-#: ../ui/conversation-email-menus.ui.h:5
+#: ui/conversation-email-menus.ui:36
 msgid "_Mark Unread"
 msgstr "未読としてマーク(_M)"
 
-#: ../ui/conversation-email-menus.ui.h:6
+#. Translators: Menu item to mark all messages in a
+#. conversation from this one as unread.
+#: ui/conversation-email-menus.ui:42
 msgid "Mark Unread From _Here"
 msgstr "ここから未読としてマーク(_H)"
 
-#: ../ui/conversation-email-menus.ui.h:8
+#. Translators: Menu item to move a single, specific message
+#. to the trash
+#: ui/conversation-email-menus.ui:50
+msgid "_Trash"
+msgstr "ごみ箱(_T)"
+
+#. Translators: Menu item to delete a single, specific message
+#: ui/conversation-email-menus.ui:57
+msgid "_Delete…"
+msgstr "削除(_D)…"
+
+#. Translators: Menu item to view the source for a message
+#: ui/conversation-email-menus.ui:69
 msgid "_View Source"
 msgstr "ソースを表示(_V)"
 
-#: ../ui/conversation-email-menus.ui.h:11
+#: ui/conversation-email-menus.ui:87
 msgid "_Save All"
 msgstr "すべて保存(_S)"
 
-#: ../ui/conversation-message-menus.ui.h:1
+#: ui/conversation-message-menus.ui:7
 msgid "_Open Link"
 msgstr "リンクを開く(_O)"
 
-#: ../ui/conversation-message-menus.ui.h:2
+#: ui/conversation-message-menus.ui:11
 msgid "Copy Link _Address"
 msgstr "リンクのアドレスをコピー(_A)"
 
-#: ../ui/conversation-message-menus.ui.h:3
+#: ui/conversation-message-menus.ui:17
 msgid "Send New _Message…"
 msgstr "新規メッセージを送信(_M)…"
 
-#: ../ui/conversation-message-menus.ui.h:4
+#: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
 msgstr "メールアドレスをコピー(_A)"
 
-#: ../ui/conversation-message-menus.ui.h:5
+#: ui/conversation-message-menus.ui:27
 msgid "Save _Image As…"
 msgstr "画像に名前を付けて保存(_I)…"
 
-#: ../ui/conversation-message-menus.ui.h:6
+#: ui/conversation-message-menus.ui:33
 msgid "_Select All"
 msgstr "すべて選択(_S)"
 
-#: ../ui/conversation-message-menus.ui.h:8
+#: ui/conversation-message-menus.ui:43
 msgid "Search for messages from"
 msgstr "次の場所からメッセージを検索"
 
-#: ../ui/conversation-message.ui.h:1
+#: ui/conversation-message.ui:64
 msgid "From <email>"
 msgstr "送信者 <email>"
 
-#: ../ui/conversation-message.ui.h:2
+#: ui/conversation-message.ui:80 ui/conversation-message.ui:179
 msgid "1/1/1970\t"
 msgstr ""
 
-#: ../ui/conversation-message.ui.h:3
+#: ui/conversation-message.ui:103
 msgid "Preview body text."
 msgstr "本文をプレビューします。"
 
-#: ../ui/conversation-message.ui.h:4
+#: ui/conversation-message.ui:203
 msgid "Sent by:"
 msgstr "送信者:"
 
-#: ../ui/conversation-message.ui.h:5
+#: ui/conversation-message.ui:248
 msgid "Reply to:"
 msgstr "返信:"
 
-#: ../ui/conversation-message.ui.h:6
+#: ui/conversation-message.ui:292
 msgid "Subject"
 msgstr "件名"
 
-#: ../ui/conversation-message.ui.h:7
-msgid "To:"
-msgstr "宛先:"
-
-#: ../ui/conversation-message.ui.h:8
-msgid "Cc:"
-msgstr "Cc:"
-
-#: ../ui/conversation-message.ui.h:9
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: ../ui/conversation-message.ui.h:10
+#: ui/conversation-message.ui:502
 msgid "Show Images"
 msgstr "画像を表示"
 
-#: ../ui/conversation-message.ui.h:11
+#: ui/conversation-message.ui:515
 msgid "Always Show From Sender"
 msgstr "この送信者のものは常に表示"
 
-#: ../ui/conversation-message.ui.h:12
+#: ui/conversation-message.ui:543
 msgid "Remote images not shown"
 msgstr "リモート画像は表示しません"
 
-#: ../ui/conversation-message.ui.h:13
+#: ui/conversation-message.ui:560
 msgid "Only show remote images from senders you trust."
 msgstr "信頼できる送信者のリモート画像のみ表示するようにしてください。"
 
-#: ../ui/conversation-message.ui.h:14
+#: ui/conversation-message.ui:693
 msgid "But actually goes to:"
 msgstr ""
 
-#: ../ui/conversation-message.ui.h:15
+#: ui/conversation-message.ui:724
 msgid "The link appears to go to:"
 msgstr ""
 
-#: ../ui/conversation-message.ui.h:16
+#: ui/conversation-message.ui:736
 msgid "Deceptive link found"
 msgstr "虚偽リンクが見つかりました"
 
-#: ../ui/conversation-message.ui.h:17
+#: ui/conversation-message.ui:751
 msgid "The email sender may be leading you to the wrong web site."
-msgstr "このメールの送信者は間違ったウェブサイトに誘導している可能性があります。"
+msgstr ""
+"このメールの送信者は間違ったウェブサイトに誘導している可能性があります。"
 
-#: ../ui/conversation-message.ui.h:18
+#: ui/conversation-message.ui:764
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr "不明な場合は、続行する前に送信者に連絡して確認してください。"
 
-#: ../ui/conversation-viewer.ui.h:1
+#: ui/conversation-viewer.ui:60
 msgid "Find in conversation"
 msgstr "スレッド内を検索"
 
-#: ../ui/conversation-viewer.ui.h:2
+#: ui/conversation-viewer.ui:74
 msgid "Find the previous occurrence of the search string."
 msgstr "検索文字列が前に出現した場所を見つけます。"
 
-#: ../ui/conversation-viewer.ui.h:3
+#: ui/conversation-viewer.ui:95
 msgid "Find the next occurrence of the search string."
 msgstr "検索文字列が次に出現する場所を見つけます。"
 
-#: ../ui/edit_alternate_emails.glade.h:1
-msgid "Remove email address"
-msgstr "メールアドレスを削除"
-
-#: ../ui/edit_alternate_emails.glade.h:2
-msgid ""
-"Some email services require additional addresses be configured on the "
-"server.  Contact your email provider for more information."
-msgstr ""
-"一部のメールサービスでは、サーバーの設定に追加のアドレスが必要になりま"
-"す。詳細についてはメールプロバイダーに問い合わせてください。"
-
-#: ../ui/edit_alternate_emails.glade.h:4
-msgid "_Update"
-msgstr "更新(_U)"
-
-#: ../ui/find_bar.glade.h:1
+#: ui/find_bar.glade:66
 msgid "Find:"
 msgstr "検索:"
 
-#: ../ui/find_bar.glade.h:2
+#: ui/find_bar.glade:89
 msgid "_Previous"
 msgstr "前へ(_P)"
 
-#: ../ui/find_bar.glade.h:3
+#: ui/find_bar.glade:107
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: ../ui/find_bar.glade.h:4
+#: ui/find_bar.glade:125
 msgid "_Case sensitive"
 msgstr "大文字小文字を区別(_C)"
 
-#: ../ui/find_bar.glade.h:5
+#: ui/find_bar.glade:145
 msgid "label"
 msgstr "ラベル"
 
-#: ../ui/gtk/help-overlay.ui.h:1
+#: ui/gtk/help-overlay.ui:9
 msgid "Conversation Shortcuts"
 msgstr "スレッドのショートカット"
 
-#: ../ui/gtk/help-overlay.ui.h:2
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
 msgctxt "shortcut window"
 msgid "General"
 msgstr "全般"
 
-#: ../ui/gtk/help-overlay.ui.h:3
+#: ui/gtk/help-overlay.ui:17
 msgctxt "shortcut window"
 msgid "Move focus to the next/previous pane"
 msgstr "フォーカスを次/前のペインに移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:4
+#: ui/gtk/help-overlay.ui:24
 msgctxt "shortcut window"
 msgid "Move focus to conversation list"
 msgstr "スレッドリストにフォーカスを移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:5
+#: ui/gtk/help-overlay.ui:31
 msgctxt "shortcut window"
 msgid "Detach composer window"
 msgstr "作成ウィンドウを分離する"
 
-#: ../ui/gtk/help-overlay.ui.h:6
+#: ui/gtk/help-overlay.ui:38
 msgctxt "shortcut window"
 msgid "Close composer window"
 msgstr "作成ウィンドウを閉じる"
 
-#: ../ui/gtk/help-overlay.ui.h:7
+#: ui/gtk/help-overlay.ui:45
 msgctxt "shortcut window"
 msgid "Show keyboard shortcuts"
 msgstr "キーボードショートカットを表示する"
 
-#: ../ui/gtk/help-overlay.ui.h:8
+#: ui/gtk/help-overlay.ui:52
 msgctxt "shortcut window"
 msgid "Show help"
 msgstr "ヘルプを表示する"
 
-#: ../ui/gtk/help-overlay.ui.h:9
+#: ui/gtk/help-overlay.ui:59
 msgctxt "shortcut window"
 msgid "Quit the application"
 msgstr "アプリケーションを終了する"
 
-#: ../ui/gtk/help-overlay.ui.h:10
+#: ui/gtk/help-overlay.ui:68
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "検索"
 
-#: ../ui/gtk/help-overlay.ui.h:11
+#: ui/gtk/help-overlay.ui:72
 msgctxt "shortcut window"
 msgid "Jump to search box"
 msgstr "検索ボックスに移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:12
+#: ui/gtk/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "現在のスレッド内を検索する"
 
-#: ../ui/gtk/help-overlay.ui.h:13
+#: ui/gtk/help-overlay.ui:86
 msgctxt "shortcut window"
 msgid "Find next/previous in current conversation"
 msgstr "現在のスレッド内で次/前を検索する"
 
-#: ../ui/gtk/help-overlay.ui.h:14
+#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
 msgctxt "shortcut window"
 msgid "Actions"
 msgstr "アクション"
 
-#: ../ui/gtk/help-overlay.ui.h:15
+#: ui/gtk/help-overlay.ui:99
 msgctxt "shortcut window"
 msgid "Compose a new message"
 msgstr "新規メッセージを作成する"
 
-#: ../ui/gtk/help-overlay.ui.h:16
+#: ui/gtk/help-overlay.ui:106
 msgctxt "shortcut window"
 msgid "Reply to sender "
 msgstr "送信者に返信する "
 
-#: ../ui/gtk/help-overlay.ui.h:17
+#: ui/gtk/help-overlay.ui:113
 msgctxt "shortcut window"
 msgid "Reply to all"
 msgstr "全員に返信する"
 
-#: ../ui/gtk/help-overlay.ui.h:18
+#: ui/gtk/help-overlay.ui:120
 msgctxt "shortcut window"
 msgid "Forward"
 msgstr "転送する"
 
-#: ../ui/gtk/help-overlay.ui.h:19
+#: ui/gtk/help-overlay.ui:127
 msgctxt "shortcut window"
 msgid "Archive"
 msgstr "アーカイブに移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:20
+#: ui/gtk/help-overlay.ui:134
 msgctxt "shortcut window"
 msgid "Move to trash"
 msgstr "ごみ箱に移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:21
+#: ui/gtk/help-overlay.ui:141
 msgctxt "shortcut window"
 msgid "Toggle spam"
 msgstr "迷惑メールに指定/解除する"
 
-#: ../ui/gtk/help-overlay.ui.h:22
+#: ui/gtk/help-overlay.ui:148
 msgctxt "shortcut window"
 msgid "Move the conversation"
 msgstr "スレッドを移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:23
+#: ui/gtk/help-overlay.ui:155
 msgctxt "shortcut window"
 msgid "Label the conversation"
 msgstr "スレッドにラベルを付ける"
 
-#: ../ui/gtk/help-overlay.ui.h:24
+#: ui/gtk/help-overlay.ui:163
 msgctxt "shortcut window"
 msgid "Mark read"
 msgstr "既読としてマークする"
 
-#: ../ui/gtk/help-overlay.ui.h:25
+#: ui/gtk/help-overlay.ui:170
 msgctxt "shortcut window"
 msgid "Mark unread"
 msgstr "未読としてマークする"
 
-#: ../ui/gtk/help-overlay.ui.h:26
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
 msgid "View"
 msgstr "表示"
 
-#: ../ui/gtk/help-overlay.ui.h:27
+#: ui/gtk/help-overlay.ui:183
 msgctxt "shortcut window"
 msgid "Zoom in"
 msgstr "拡大する"
 
-#: ../ui/gtk/help-overlay.ui.h:28
+#: ui/gtk/help-overlay.ui:190
 msgctxt "shortcut window"
 msgid "Zoom out"
 msgstr "縮小する"
 
-#: ../ui/gtk/help-overlay.ui.h:29
+#: ui/gtk/help-overlay.ui:197
 msgctxt "shortcut window"
 msgid "Reset zoom"
 msgstr "拡大/縮小をリセットする"
 
-#: ../ui/gtk/help-overlay.ui.h:30
+#: ui/gtk/help-overlay.ui:206
 msgctxt "shortcut window"
 msgid "Additional Shortcuts"
 msgstr "その他のショートカット"
 
-#: ../ui/gtk/help-overlay.ui.h:31
+#: ui/gtk/help-overlay.ui:210
 msgctxt "shortcut window"
 msgid "Star"
 msgstr "星をつける"
 
-#: ../ui/gtk/help-overlay.ui.h:32
+#: ui/gtk/help-overlay.ui:217
 msgctxt "shortcut window"
 msgid "Unstar"
 msgstr "星を外す"
 
-#: ../ui/gtk/help-overlay.ui.h:33
+#: ui/gtk/help-overlay.ui:224
 msgctxt "shortcut window"
 msgid "Delete"
 msgstr "削除する"
 
-#: ../ui/gtk/help-overlay.ui.h:34
+#: ui/gtk/help-overlay.ui:231
 msgctxt "shortcut window"
 msgid "Jump to next (older) conversation"
 msgstr "古いスレッドに移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:35
+#: ui/gtk/help-overlay.ui:238
 msgctxt "shortcut window"
 msgid "Jump to previous (newer) conversation"
 msgstr "新しいスレッドに移動する"
 
-#: ../ui/gtk/help-overlay.ui.h:36
+#: ui/gtk/help-overlay.ui:250
 msgid "Composer Shortcuts"
 msgstr "作成画面のショートカット"
 
-#: ../ui/gtk/help-overlay.ui.h:37
+#: ui/gtk/help-overlay.ui:258
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "テキストを引用する"
 
-#: ../ui/gtk/help-overlay.ui.h:38
+#: ui/gtk/help-overlay.ui:265
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "テキストの引用を解除する"
 
-#: ../ui/gtk/help-overlay.ui.h:39
+#: ui/gtk/help-overlay.ui:278
 msgctxt "shortcut window"
 msgid "Send"
 msgstr "送信する"
 
-#: ../ui/gtk/help-overlay.ui.h:40
+#: ui/gtk/help-overlay.ui:285
 msgctxt "shortcut window"
 msgid "Add attachment"
 msgstr "添付ファイルを追加する"
 
-#: ../ui/gtk/help-overlay.ui.h:41
+#: ui/gtk/help-overlay.ui:294
 msgctxt "shortcut window"
 msgid "Rich text mode"
 msgstr "リッチテキストモード"
 
-#: ../ui/gtk/help-overlay.ui.h:42
+#: ui/gtk/help-overlay.ui:298
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "太字"
 
-#: ../ui/gtk/help-overlay.ui.h:43
+#: ui/gtk/help-overlay.ui:305
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "斜体"
 
-#: ../ui/gtk/help-overlay.ui.h:44
+#: ui/gtk/help-overlay.ui:312
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "下線"
 
-#: ../ui/gtk/help-overlay.ui.h:45
+#: ui/gtk/help-overlay.ui:319
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "取り消し線"
 
-#: ../ui/gtk/help-overlay.ui.h:46
+#: ui/gtk/help-overlay.ui:326
 msgctxt "shortcut window"
 msgid "Insert a link"
 msgstr "リンクを挿入する"
 
-#: ../ui/gtk/help-overlay.ui.h:47
+#: ui/gtk/help-overlay.ui:333
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "書式を削除する"
 
-#: ../ui/gtk/menus.ui.h:2
+#: ui/gtk/menus.ui:13
 msgid "A_ccounts"
 msgstr "アカウント(_C)"
 
-#: ../ui/gtk/menus.ui.h:4
+#: ui/gtk/menus.ui:23
 msgid "_Keyboard Shortcuts"
 msgstr "キーボードショートカット(_K)"
 
-#: ../ui/login.glade.h:1
-msgid "email example com"
-msgstr "email example com"
-
-#: ../ui/login.glade.h:2 ../ui/password-dialog.glade.h:3
-msgid "Password"
-msgstr "パスワード"
-
-#: ../ui/login.glade.h:3
-msgid "E_mail address"
-msgstr "メールアドレス(_M)"
-
-#: ../ui/login.glade.h:4
-msgid "_Password"
-msgstr "パスワード(_P)"
-
-#: ../ui/login.glade.h:5
-msgid "S_ervice"
-msgstr "メールサービス(_E)"
-
-#: ../ui/login.glade.h:6
-msgid "N_ame"
-msgstr "名前(_A)"
-
-#: ../ui/login.glade.h:8
-msgid "N_ickname"
-msgstr "ニックネーム(_I)"
-
-#: ../ui/login.glade.h:9
-msgid "Work, Home, etc."
-msgstr "仕事用、自宅用、など。"
-
-#: ../ui/login.glade.h:10
-msgid "_Save sent mail"
-msgstr "送信メールを保存する(_S)"
-
-#: ../ui/login.glade.h:11
-msgid "Addi_tional email addresses…"
-msgstr "追加のメールアドレス(_T)…"
-
-#: ../ui/login.glade.h:12
-msgid "IMAP settings"
-msgstr "IMAP 設定"
-
-#: ../ui/login.glade.h:13
-msgid "Se_rver"
-msgstr "サーバー(_R)"
-
-#: ../ui/login.glade.h:14
-msgid "imap.example.com"
-msgstr "imap.example.com"
-
-#: ../ui/login.glade.h:15
-msgid "P_ort"
-msgstr "ポート(_O)"
-
-#: ../ui/login.glade.h:16
-msgid "smtp.example.com"
-msgstr "smtp.example.com"
-
-#: ../ui/login.glade.h:17
-msgid "Ser_ver"
-msgstr "サーバー(_V)"
-
-#: ../ui/login.glade.h:18
-msgid "Por_t"
-msgstr "ポート(_T)"
-
-#: ../ui/login.glade.h:19
-msgid "SMTP settings"
-msgstr "SMTP 設定"
-
-#: ../ui/login.glade.h:20
-msgid "User_name"
-msgstr "ユーザー名(_N)"
-
-#: ../ui/login.glade.h:21
-msgid "Pass_word"
-msgstr "パスワード(_W)"
-
-#: ../ui/login.glade.h:22
-msgid "SMTP username"
-msgstr "SMTP のユーザー名"
-
-#: ../ui/login.glade.h:23
-msgid "SMTP password"
-msgstr "SMTP のパスワード"
-
-#: ../ui/login.glade.h:24
-msgid "_Username"
-msgstr "ユーザー名(_U)"
-
-#: ../ui/login.glade.h:25
-msgid "IMAP username"
-msgstr "IMAP のユーザー名"
+#: ui/main-toolbar.ui:51
+msgid "Toggle search bar"
+msgstr "アカウント内を検索"
 
-#: ../ui/login.glade.h:26
-msgid "IMAP password"
-msgstr "IMAP のパスワード"
+#: ui/main-toolbar.ui:72
+msgid "Empty Spam or Trash folders"
+msgstr "迷惑メールかごみ箱を空にする"
 
-#: ../ui/login.glade.h:27
-msgid "Encr_yption"
-msgstr "暗号化(_Y)"
+#: ui/main-toolbar.ui:112
+msgid "Reply"
+msgstr "返信"
 
-#: ../ui/login.glade.h:28
-msgid "Encrypt_ion"
-msgstr "暗号化(_I)"
+#: ui/main-toolbar.ui:135
+msgid "Reply All"
+msgstr "全員に返信"
 
-#: ../ui/login.glade.h:30
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
+#: ui/main-toolbar.ui:158
+msgid "Forward"
+msgstr "転送"
 
-#: ../ui/login.glade.h:31
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ui/main-toolbar.ui:264
+msgid "Toggle find bar"
+msgstr "スレッド内を検索"
 
-#: ../ui/login.glade.h:32
-msgid "No authentication re_quired"
-msgstr "認証の必要はない(_Q)"
+#: ui/main-toolbar.ui:306
+msgid "_Archive"
+msgstr "アーカイブ(_A)"
 
-#: ../ui/login.glade.h:33
-msgid "Use IMAP cre_dentials"
-msgstr "IMAP の情報を使う(_D)"
+#: ui/main-toolbar-menus.ui:5
+msgid "Empty _Spam…"
+msgstr "迷惑メールを空にする(_S)…"
 
-#: ../ui/login.glade.h:34
-msgid "Composer"
-msgstr "作成画面"
+#: ui/main-toolbar-menus.ui:9
+msgid "Empty _Trash…"
+msgstr "ごみ箱を空にする(_T)…"
 
-#: ../ui/login.glade.h:35
-msgid "Save dra_fts on server"
-msgstr "下書きをサーバーに保存する(_F)"
+#: ui/main-toolbar-menus.ui:32
+msgid "Mark as S_pam"
+msgstr "迷惑メールとしてマーク(_P)"
 
-#: ../ui/login.glade.h:36
-msgid "Si_gn emails (HTML allowed):"
-msgstr "メールに署名する (HTML 使用可)(_G):"
+#: ui/main-toolbar-menus.ui:36
+msgid "Mark as not S_pam"
+msgstr "迷惑メールマークを外す(_P)"
 
-#: ../ui/login.glade.h:37
-msgid "Storage"
-msgstr "ストレージ"
+#. Infobar title when one or more accounts are offline
+#: ui/main-window.ui:183
+msgid "Working offline"
+msgstr "オフラインで作業中です"
 
-#: ../ui/login.glade.h:38
-msgid "_Download mail"
-msgstr "メールをダウンロード(_D)"
+#. Label and tooltip for offline infobar
+#: ui/main-window.ui:197
+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:200
+msgid "You will not be able to send or receive email until re-connected."
+msgstr "再接続するまでメールの送受信はできません。"
+
+#. Button label for displaying technical details about an account problem
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: ui/main-window.ui:247 ui/problem-details-dialog.ui:13
+msgid "Details"
+msgstr "詳細"
+
+#. Button label for retrying an account problem
+#: ui/main-window.ui:261
+msgid "Retry"
+msgstr "再試行"
+
+#. Infobar title when one or more accounts have encounted an error
+#: ui/main-window.ui:294
+msgid "Account problem"
+msgstr "アカウントの問題"
+
+#. Label and tooltip for account service problem infobar
+#: ui/main-window.ui:308
+msgid ""
+"Geary encountered a problem connecting to an account.\n"
+"Please check your Internet connection, the server configuration and try "
+"again."
+msgstr ""
+"アカウントへの接続時に問題が発生しました。\n"
+"インターネット接続やサーバー設定を確認して再試行してください。"
+
+#. Label and tooltip for account service problem infobar
+#: ui/main-window.ui:311
+msgid "Geary encountered a problem connecting to an account."
+msgstr "アカウントへの接続時に問題が発生しました。"
+
+#. Button label for retrying TLS cert validation
+#: ui/main-window.ui:358
+msgid "Check"
+msgstr "確認"
+
+#. Button tooltip for retrying TLS cert validation
+#: ui/main-window.ui:362
+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:391
+msgid "Security problem"
+msgstr "セキュリティの問題"
+
+#. Label and tooltip for TLS cert validation error infobar
+#: ui/main-window.ui:405
+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:408
+msgid "An account has reported an untrusted server."
+msgstr "信頼できないサーバーです。"
+
+#. Button tooltip for retrying when a login error has occurred
+#: ui/main-window.ui:459
+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:488
+msgid "Login problem"
+msgstr "ログインの問題"
+
+#. Label and tooltip for authentication problem infobar
+#: ui/main-window.ui:502
+msgid ""
+"An account has reported an incorrect login or password.\n"
+"Please check your login name and try again."
+msgstr ""
+"ログイン情報かパスワードが間違っています。\n"
+"ログイン名を確認して再試行してください。"
 
-#: ../ui/main-toolbar.ui.h:1
-msgid "Empty Spam or Trash folders"
-msgstr "迷惑メールかごみ箱を空にする"
+#. Label and tooltip for authentication problem infobar
+#: ui/main-window.ui:505
+msgid "An account has reported an incorrect login or password."
+msgstr "ログイン情報かパスワードが間違っています。"
 
-#: ../ui/password-dialog.glade.h:1
+#: ui/password-dialog.glade:74
 msgid "SMTP Credentials"
 msgstr "SMTP 証明書"
 
-#: ../ui/password-dialog.glade.h:2
+#: ui/password-dialog.glade:91
 msgid "Username"
 msgstr "ユーザー名"
 
-#: ../ui/password-dialog.glade.h:4
+#: ui/password-dialog.glade:152
 msgid "_Remember password"
 msgstr "パスワードを記憶する(_R)"
 
-#: ../ui/password-dialog.glade.h:6
+#: ui/password-dialog.glade:210
 msgid "_Authenticate"
 msgstr "認証(_A)"
 
-#: ../ui/preferences-dialog.ui.h:1
+#: ui/preferences-dialog.ui:38
 msgid "Reading"
 msgstr "表示画面"
 
-#: ../ui/preferences-dialog.ui.h:2
+#: ui/preferences-dialog.ui:51
 msgid "_Automatically select next message"
 msgstr "自動的に次のメッセージを選択する(_A)"
 
-#: ../ui/preferences-dialog.ui.h:3
+#: ui/preferences-dialog.ui:70
 msgid "_Display conversation preview"
 msgstr "スレッドプレビューを表示する(_D)"
 
-#: ../ui/preferences-dialog.ui.h:4
+#: ui/preferences-dialog.ui:89
 msgid "Use _three pane view"
 msgstr "3ペインビューを使用する(_T)"
 
-#: ../ui/preferences-dialog.ui.h:5
+#: ui/preferences-dialog.ui:113
 msgid "Notifications"
 msgstr "通知"
 
-#: ../ui/preferences-dialog.ui.h:6
+#: ui/preferences-dialog.ui:126
 msgid "_Play notification sounds"
 msgstr "通知音を鳴らす(_P)"
 
-#: ../ui/preferences-dialog.ui.h:7
+#: ui/preferences-dialog.ui:145
 msgid "Show _notifications for new mail"
 msgstr "新着メールの通知を表示する(_N)"
 
-#: ../ui/preferences-dialog.ui.h:8
-msgid "Always _watch for new mail"
-msgstr "常に新着メールを監視する(_W)"
+#: ui/preferences-dialog.ui:164
+msgid "_Watch for new mail when closed"
+msgstr "閉じても新着メールを監視する(_W)"
 
-#: ../ui/preferences-dialog.ui.h:9
-msgid "Geary will run in the background and notify of new mail"
-msgstr "Geary をバックグラウンドで実行して新着メールを通知します"
+#: ui/preferences-dialog.ui:168
+msgid "Geary will keep running after all windows are closed"
+msgstr "すべてのウィンドウを閉じても Geary の実行を続けます"
 
-#: ../ui/preferences-dialog.ui.h:10
+#: ui/preferences-dialog.ui:195
 msgid "Preferences"
 msgstr "設定"
 
-#: ../ui/remove_confirm.glade.h:1
+#. Button label for copying technical information to the clipboard
+#: ui/problem-details-dialog.ui:17
+msgid "Copy to Clipboard"
+msgstr "クリップボードにコピー"
+
+#. Button tooltip for copying technical information to the clipboard
+#: ui/problem-details-dialog.ui:21
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">このアカウントを削除してもよろしいです"
-"か?</span> "
+"Copy technical details to clipboard for pasting into an email or bug report"
+msgstr "バグ報告用の技術的な詳細情報をクリップボードにコピーします"
 
-#: ../ui/remove_confirm.glade.h:2
+#: ui/problem-details-dialog.ui:73
 msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
+"If the problem is serious or persists, please copy and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
+"bug report</a>."
 msgstr ""
-"このアカウントに関連したすべてのメールを、コンピューターから削除します。サーバー"
-"上のメールには影響しません。"
-
-#: ../ui/remove_confirm.glade.h:3
-msgid "Nickname:"
-msgstr "ニックネーム:"
 
-#: ../ui/remove_confirm.glade.h:4
-msgid "Email address:"
-msgstr "メールアドレス:"
+#: ui/problem-details-dialog.ui:89
+msgid "Details:"
+msgstr "詳細:"
 
-#: ../ui/upgrade_dialog.glade.h:1
+#: ui/upgrade_dialog.glade:60
 msgid "Geary update in progress…"
 msgstr "Geary をアップデートしています…"
 
+#~ msgid "Geary Email"
+#~ msgstr "Geary メール"
+
+#~ msgid "Geary Mail"
+#~ msgstr "Geary メール"
+
+#~ msgid "Additional addresses for %s"
+#~ msgstr "%s の追加アドレス"
+
+#~ msgid "First Last"
+#~ msgstr "氏名"
+
+#~ msgid "Enter your account information to get started."
+#~ msgstr "アカウント情報を入力してください"
+
+#~ msgid "Edit"
+#~ msgstr "編集"
+
+#~ msgid "Preview"
+#~ msgstr "プレビュー"
+
+#~ msgid "Remem_ber passwords"
+#~ msgstr "パスワードを記憶する(_B)"
+
+#~ msgid "Remem_ber password"
+#~ msgstr "パスワードを記憶する(_B)"
+
+#~ msgid "Unable to validate:\n"
+#~ msgstr "検証できません:\n"
+
+#~ msgid "        • Invalid account nickname.\n"
+#~ msgstr "        • アカウントのニックネームが不正です。\n"
+
+#~ msgid "        • Email address already added to Geary.\n"
+#~ msgstr "        • メールアドレスが Geary に追加済みです。\n"
+
+#~ msgid "        • IMAP connection error.\n"
+#~ msgstr "        • IMAP の接続エラーです。\n"
+
+#~ msgid "        • IMAP username or password incorrect.\n"
+#~ msgstr "        • IMAP のユーザー名またはパスワードが不正です。\n"
+
+#~ msgid "        • SMTP connection error.\n"
+#~ msgstr "        • SMTP の接続エラーです。\n"
+
+#~ msgid "        • SMTP username or password incorrect.\n"
+#~ msgstr "        • SMTP のユーザー名またはパスワードが不正です。\n"
+
+#~ msgid "        • Connection error.\n"
+#~ msgstr "        • 接続エラーです。\n"
+
+#~ msgid "        • Username or password incorrect.\n"
+#~ msgstr "        • ユーザー名またはパスワードが不正です。\n"
+
+#, fuzzy
+#~| msgid "_Mark as..."
+#~ msgid "_Mark as…"
+#~ msgstr "名前を付けてマーク(_M)"
+
+#~ msgid "_Label"
+#~ msgstr "ラベル(_L)"
+
+#~ msgid "_Move"
+#~ msgstr "移動(_M)"
+
+#~ msgid "Compose new message (Ctrl+N, N)"
+#~ msgstr "新規メッセージを作成(Ctrl+N, N)"
+
+#~ msgid "Reply (Ctrl+R, R)"
+#~ msgstr "返信(Ctrl+R, R)"
+
+#~ msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#~ msgstr "全員に返信(Ctrl+Shift+R, Shift+R)"
+
+#~ msgid "Forward (Ctrl+L, F)"
+#~ msgstr "転送(Ctrl+L, F)"
+
+#~ msgid "Unable to store server trust exception"
+#~ msgstr "サーバーの信頼に関する例外を保存できません"
+
+#~ msgid "Your settings are insecure"
+#~ msgstr "設定がセキュアではありません"
+
+#~ msgid ""
+#~ "Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means "
+#~ "your username and password could be read by another person on the "
+#~ "network.  Are you sure you want to do this?"
+#~ msgstr ""
+#~ "IMAP/SMTP の通信に SSL/TLS が指定されていません。ユーザー名やパスワードが"
+#~ "ネットワーク上の他人に読み取られる可能性があります。よろしいですか?"
+
+#~ msgid "Co_ntinue"
+#~ msgstr "継続(_N)"
+
+#~ msgid ""
+#~ "Geary encountered an error sending an email.  If the problem persists, "
+#~ "please manually delete the email from your Outbox folder."
+#~ msgstr ""
+#~ "メール送信時にエラーが発生しました。問題を解決できない場合は、メールを手動"
+#~ "で送信済みトレイから削除してください。"
+
+#~ msgid ""
+#~ "Geary encountered an error saving a sent message to Sent Mail.  The "
+#~ "message will stay in your Outbox folder until you delete it."
+#~ msgstr ""
+#~ "メールを送信済みトレイに保存するときにエラーが発生しました。削除するまでこ"
+#~ "のメッセージを送信済みトレイに表示します。"
+
+#~ msgid "Unable to open local mailbox for %s"
+#~ msgstr "%s のローカルメールボックスを開けません"
+
+#~ msgid ""
+#~ "There was an error opening the local mail database for this account. This "
+#~ "is possibly due to a file permissions problem.\n"
+#~ "\n"
+#~ "Please check that you have read/write permissions for all files in this "
+#~ "directory:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "このアカウントのローカルメールデータベースを開くときにエラーが発生しまし"
+#~ "た。おそらくファイルのアクセス権に問題があります。\n"
+#~ "\n"
+#~ "このディレクトリのすべてのファイルの読み取り/書き込み権限を確認してくださ"
+#~ "い:\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The version number of the local mail database is formatted for a newer "
+#~ "version of Geary. Unfortunately, the database cannot be “rolled back” to "
+#~ "work with this version of Geary.\n"
+#~ "\n"
+#~ "Please install the latest version of Geary and try again."
+#~ msgstr ""
+#~ "ローカルメールデータベースは新しいバージョンの Geary 用にフォーマットされ"
+#~ "ています。残念ですが、このバージョンの Geary で動作するようデータベース"
+#~ "を“ロールバック”することはできません。\n"
+#~ "\n"
+#~ "Geary の最新バージョンをインストールして再試行してください。"
+
+#~ msgid ""
+#~ "There was an error opening the local account. This is probably due to "
+#~ "connectivity issues.\n"
+#~ "\n"
+#~ "Please check your network connection and restart Geary."
+#~ msgstr ""
+#~ "ローカルアカウントを開くときにエラーが発生しました。おそらく接続の問題によ"
+#~ "るものです。\n"
+#~ "\n"
+#~ "ネットワーク接続を確認し、Geary を再起動してください。"
+
+#~ msgid "Geary will exit if you have no other open email accounts."
+#~ msgstr "他に開いているメールアカウントがなければ終了します。"
+
+#~ msgid "Other"
+#~ msgstr "その他"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">アカウントを削除できません</span> "
+
+#~ msgid ""
+#~ "A composer window associated with this account is currently open. Send or "
+#~ "discard the message and try again."
+#~ msgstr ""
+#~ "アカウントと関連づけられた作成画面がすでに開いています. メッセージを送信す"
+#~ "るか破棄してからもう一度試してください"
+
+#~ msgid "Please wait while Geary validates your account."
+#~ msgstr "アカウントを検証しています..."
+
+#~ msgid ""
+#~ "Some email services require additional addresses be configured on the "
+#~ "server.  Contact your email provider for more information."
+#~ msgstr ""
+#~ "一部のメールサービスでは、サーバーの設定に追加のアドレスが必要になります。"
+#~ "詳細についてはメールプロバイダーに問い合わせてください。"
+
+#~ msgid "_Update"
+#~ msgstr "更新(_U)"
+
+#~ msgid "E_mail address"
+#~ msgstr "メールアドレス(_M)"
+
+#~ msgid "_Password"
+#~ msgstr "パスワード(_P)"
+
+#~ msgid "S_ervice"
+#~ msgstr "メールサービス(_E)"
+
+#~ msgid "N_ame"
+#~ msgstr "名前(_A)"
+
+#~ msgid "N_ickname"
+#~ msgstr "ニックネーム(_I)"
+
+#~ msgid "Work, Home, etc."
+#~ msgstr "仕事用、自宅用、など。"
+
+#~ msgid "_Save sent mail"
+#~ msgstr "送信メールを保存する(_S)"
+
+#~ msgid "Addi_tional email addresses…"
+#~ msgstr "追加のメールアドレス(_T)…"
+
+#~ msgid "IMAP settings"
+#~ msgstr "IMAP 設定"
+
+#~ msgid "Se_rver"
+#~ msgstr "サーバー(_R)"
+
+#~ msgid "P_ort"
+#~ msgstr "ポート(_O)"
+
+#~ msgid "Ser_ver"
+#~ msgstr "サーバー(_V)"
+
+#~ msgid "Por_t"
+#~ msgstr "ポート(_T)"
+
+#~ msgid "User_name"
+#~ msgstr "ユーザー名(_N)"
+
+#~ msgid "Pass_word"
+#~ msgstr "パスワード(_W)"
+
+#~ msgid "SMTP password"
+#~ msgstr "SMTP のパスワード"
+
+#~ msgid "_Username"
+#~ msgstr "ユーザー名(_U)"
+
+#~ msgid "IMAP password"
+#~ msgstr "IMAP のパスワード"
+
+#~ msgid "Encr_yption"
+#~ msgstr "暗号化(_Y)"
+
+#~ msgid "Encrypt_ion"
+#~ msgstr "暗号化(_I)"
+
+#~ msgid "STARTTLS"
+#~ msgstr "STARTTLS"
+
+#~ msgid "No authentication re_quired"
+#~ msgstr "認証の必要はない(_Q)"
+
+#~ msgid "Use IMAP cre_dentials"
+#~ msgstr "IMAP の情報を使う(_D)"
+
+#~ msgid "Composer"
+#~ msgstr "作成画面"
+
+#~ msgid "Si_gn emails (HTML allowed):"
+#~ msgstr "メールに署名する (HTML 使用可)(_G):"
+
+#~ msgid "Storage"
+#~ msgstr "ストレージ"
+
+#~ msgid "Geary will run in the background and notify of new mail"
+#~ msgstr "Geary をバックグラウンドで実行して新着メールを通知します"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">Are you sure you want to remove "
+#~ "this account?</span> "
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">このアカウントを削除してもよろしいで"
+#~ "すか?</span> "
+
+#~ msgid ""
+#~ "All email associated with this account will be removed from your "
+#~ "computer. This will not affect email on the server."
+#~ msgstr ""
+#~ "このアカウントに関連したすべてのメールを、コンピューターから削除します。"
+#~ "サーバー上のメールには影響しません。"
+
+#~ msgid "Nickname:"
+#~ msgstr "ニックネーム:"
+
 #~ msgid "Archive conversation (Delete, Backspace, A)"
 #~ msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
 
 #~ msgid "Copyright 2011-2013 Yorba Foundation"
 #~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#~ msgid "Date:"
-#~ msgstr "日時:"
-
 #~ msgid "Large"
 #~ msgstr "大"
 
@@ -2684,9 +3638,6 @@ msgstr "Geary をアップデートしています…"
 #~ msgid "_Center"
 #~ msgstr "中央揃え(_C)"
 
-#~ msgid "_Details"
-#~ msgstr "詳細(_D)"
-
 #~ msgid "_Justify"
 #~ msgstr "両端揃え(_J)"
 


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