[geary] Update Japanese translation



commit 3458868d03ca39e79355775c7b704b1e895d4576
Author: Ryuta Fujii <translation sicklylife jp>
Date:   Fri Sep 6 14:37:09 2019 +0000

    Update Japanese translation

 po/ja.po | 2126 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 1275 insertions(+), 851 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 5a31386d..2fddb5e6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n";
-"POT-Creation-Date: 2019-03-07 03:56+0000\n"
+"POT-Creation-Date: 2019-08-29 23:05+0000\n"
 "PO-Revision-Date: 2019-03-07 19:05+0900\n"
 "Last-Translator: sicklylife <translation sicklylife jp>\n"
 "Language-Team: Japanese (Japan) (https://l10n.gnome.org/module/geary/)\n"
@@ -26,51 +26,42 @@ msgstr ""
 msgid "Send by email"
 msgstr "メールで送信"
 
-#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-#: desktop/geary-attach.contract.desktop.in:5
-msgid "mail-send"
-msgstr "mail-send"
-
 #: desktop/geary-attach.contract.desktop.in:6
 msgid "Send files using Geary"
 msgstr "Geary でファイルを送信"
 
 #. Translators: The application name
-#: desktop/geary-autostart.desktop.in:3
-#: desktop/org.gnome.Geary.appdata.xml.in:11
-#: desktop/org.gnome.Geary.desktop.in:3
+#: desktop/geary-autostart.desktop.in.in:3
+#: desktop/org.gnome.Geary.appdata.xml.in.in:12
+#: desktop/org.gnome.Geary.desktop.in.in:3
 #: src/client/accounts/accounts-editor-servers-pane.vala:555
 msgid "Geary"
 msgstr "Geary"
 
-#: desktop/geary-autostart.desktop.in:4 desktop/org.gnome.Geary.desktop.in:4
+#: desktop/geary-autostart.desktop.in.in:4
+#: desktop/org.gnome.Geary.desktop.in.in:4
 msgid "Email"
 msgstr "メール"
 
 #. Translators: The application's summary / tagline
-#: desktop/geary-autostart.desktop.in:5
-#: desktop/org.gnome.Geary.appdata.xml.in:15
-#: desktop/org.gnome.Geary.desktop.in:5
-#: src/client/application/geary-application.vala:23
+#: desktop/geary-autostart.desktop.in.in:5
+#: desktop/org.gnome.Geary.appdata.xml.in.in:16
+#: desktop/org.gnome.Geary.desktop.in.in:5
+#: src/client/application/geary-application.vala:30
 msgid "Send and receive email"
 msgstr "メールの送信と受信"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/geary-autostart.desktop.in:7
+#: desktop/geary-autostart.desktop.in.in:7
 msgid "Email;E-mail;Mail;"
 msgstr "Email;E-mail;Mail;メール;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
+#: desktop/org.gnome.Geary.appdata.xml.in.in:14
 msgid "Geary Development Team"
 msgstr "Geary 開発チーム"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:17
+#: desktop/org.gnome.Geary.appdata.xml.in.in:18
 msgid ""
 "Geary is an email application built around conversations, for the GNOME 3 "
 "desktop. It allows you to read, find and send email with a straightforward, "
@@ -80,7 +71,7 @@ msgstr ""
 "ケーションです。明快かつモダンなインターフェースで、メールを読んだり、探した"
 "り、送ったりできます。"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:22
+#: desktop/org.gnome.Geary.appdata.xml.in.in:23
 msgid ""
 "Conversations allow you to read a complete discussion without having to find "
 "and click from message to message."
@@ -88,52 +79,52 @@ msgstr ""
 "やり取りしたメッセージを一々探し出すことなく、抜けのないディスカッションを読"
 "むことが可能です。"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:26
+#: desktop/org.gnome.Geary.appdata.xml.in.in:27
 msgid "Geary’s features include:"
 msgstr "Geary には以下の機能があります"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:28
+#: desktop/org.gnome.Geary.appdata.xml.in.in:29
 msgid "Quick email account setup"
 msgstr "メールアカウントを素早くセットアップ"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:29
+#: desktop/org.gnome.Geary.appdata.xml.in.in:30
 msgid "Shows related messages together in conversations"
 msgstr "関連したメッセージをまとめてスレッドに表示"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:30
+#: desktop/org.gnome.Geary.appdata.xml.in.in:31
 msgid "Fast, full text and keyword search"
 msgstr "高速な全文検索とキーワード検索"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:31
+#: desktop/org.gnome.Geary.appdata.xml.in.in:32
 msgid "Full-featured HTML and plain text message composer"
 msgstr "十分なテキスト/HTML メール作成機能"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:32
+#: desktop/org.gnome.Geary.appdata.xml.in.in:33
 msgid "Desktop notification of new mail"
 msgstr "新着メールのデスクトップ通知"
 
-#: desktop/org.gnome.Geary.appdata.xml.in:33
+#: desktop/org.gnome.Geary.appdata.xml.in.in:34
 msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 "Gmail、Yahoo! Mail (Yahoo.com)、Outlook.com、その他の IMAP 対応サービスとの互"
 "換"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:47
+#: desktop/org.gnome.Geary.appdata.xml.in.in:48
 msgid "Geary displaying a conversation"
 msgstr "スレッド表示中の Geary"
 
 #. Translators: A screenshot description.
-#: desktop/org.gnome.Geary.appdata.xml.in:52
+#: desktop/org.gnome.Geary.appdata.xml.in.in:59
 msgid "Geary showing the rich text composer"
 msgstr "HTML メール作成中の Geary"
 
 #. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
-#: desktop/org.gnome.Geary.desktop.in:7
+#: desktop/org.gnome.Geary.desktop.in.in:7
 msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 msgstr "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;メール;Eメール;E-メール;"
 
-#: desktop/org.gnome.Geary.desktop.in:21
+#: desktop/org.gnome.Geary.desktop.in.in:22
 msgid "Compose Message"
 msgstr "メッセージを作成"
 
@@ -225,99 +216,91 @@ 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 "スペルをチェックする言語の一覧です。"
+msgid ""
+"A list of POSIX locales, with the empty list disabling spell checking and "
+"the null list using desktop languages by default."
+msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:74
+#: desktop/org.gnome.Geary.gschema.xml:76
 msgid "Languages that are displayed in the spell checker popover"
 msgstr "スペルチェッカーのポップオーバーメニューに表示する言語"
 
-#: desktop/org.gnome.Geary.gschema.xml:75
+#: desktop/org.gnome.Geary.gschema.xml:77
 msgid ""
 "List of languages that are always displayed in the popover of the spell "
 "checker."
 msgstr "スペルチェッカーのポップオーバーメニューに常に表示する言語の一覧です。"
 
-#: desktop/org.gnome.Geary.gschema.xml:80
+#: desktop/org.gnome.Geary.gschema.xml:82
 msgid "Enable notification sounds"
 msgstr "通知音を有効にする"
 
-#: desktop/org.gnome.Geary.gschema.xml:81
+#: desktop/org.gnome.Geary.gschema.xml:83
 msgid "True to play sounds for notifications and sending."
 msgstr "true にすると通知時と送信時に音を鳴らします。"
 
-#: desktop/org.gnome.Geary.gschema.xml:86
+#: desktop/org.gnome.Geary.gschema.xml:88
 msgid "Show notifications for new mail"
 msgstr "新着メールの通知を表示する"
 
-#: desktop/org.gnome.Geary.gschema.xml:87
+#: desktop/org.gnome.Geary.gschema.xml:89
 msgid "True to show notification bubbles."
 msgstr "true にするとポップアップ通知を表示します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:92
+#: desktop/org.gnome.Geary.gschema.xml:94
 msgid "Notify of new mail at startup"
 msgstr "起動時に新着メールを通知する"
 
-#: desktop/org.gnome.Geary.gschema.xml:93
+#: desktop/org.gnome.Geary.gschema.xml:95
 msgid "True to notify of new mail at startup."
 msgstr "true にすると起動時に新着メールを通知します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:98
+#: desktop/org.gnome.Geary.gschema.xml:100
 msgid "Ask when opening an attachment"
 msgstr "添付ファイルを開くときに確認する"
 
-#: desktop/org.gnome.Geary.gschema.xml:99
+#: desktop/org.gnome.Geary.gschema.xml:101
 msgid "True to ask when opening an attachment."
 msgstr "true にすると添付ファイルを開くときに確認します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:104
+#: desktop/org.gnome.Geary.gschema.xml:106
 msgid "Whether to compose emails in HTML"
 msgstr "HTML メールを作成するかどうか"
 
-#: desktop/org.gnome.Geary.gschema.xml:105
+#: desktop/org.gnome.Geary.gschema.xml:107
 msgid "True to compose emails in HTML; false for plain text."
 msgstr "true にすると HTML メール、false にするとテキストメールを作成します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:110
+#: desktop/org.gnome.Geary.gschema.xml:112
 msgid "Advisory strategy for full-text searching"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:111
+#: desktop/org.gnome.Geary.gschema.xml:113
 msgid ""
 "Acceptable values are “exact”, “conservative”, “aggressive”, and “horizon”."
 msgstr "許容できる値は“exact”、“conservative”、“aggressive”、“horizon”です。"
 
-#: desktop/org.gnome.Geary.gschema.xml:116
+#: desktop/org.gnome.Geary.gschema.xml:118
 msgid "Zoom of conversation viewer"
 msgstr "スレッドビューアーのズーム"
 
-#: desktop/org.gnome.Geary.gschema.xml:117
+#: desktop/org.gnome.Geary.gschema.xml:119
 msgid "The zoom to apply on the conservation view."
 msgstr "指定した倍率でスレッドビューを拡大または縮小します。"
 
-#: desktop/org.gnome.Geary.gschema.xml:122
+#: desktop/org.gnome.Geary.gschema.xml:124
 msgid "Size of detached composer window"
 msgstr "分離した作成ウィンドウのサイズ"
 
-#: desktop/org.gnome.Geary.gschema.xml:123
+#: desktop/org.gnome.Geary.gschema.xml:125
 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 "アバター画像検索用のベース URL"
-
-#: desktop/org.gnome.Geary.gschema.xml:129
-msgid ""
-"A Gravatar or Libravatar compatible URL, set to the empty string to disable."
-msgstr ""
-"Gravatar または Libravatar 対応の URLです。無効にする場合は空にしてください。"
-
-#: desktop/org.gnome.Geary.gschema.xml:134
+#: desktop/org.gnome.Geary.gschema.xml:130
 msgid "Whether we migrated the old settings"
 msgstr ""
 
-#: desktop/org.gnome.Geary.gschema.xml:135
+#: desktop/org.gnome.Geary.gschema.xml:131
 msgid ""
 "False to check for the old “org.yorba.geary”-schema and copy its values."
 msgstr ""
@@ -325,7 +308,7 @@ 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
+#: src/client/accounts/accounts-editor.vala:204
 msgid "Failed to store certificate"
 msgstr "証明書の保存に失敗しました"
 
@@ -590,54 +573,55 @@ msgid "%d day back"
 msgid_plural "%d days back"
 msgstr[0] "%d日前"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:243
+#: src/client/accounts/accounts-editor-list-pane.vala:247
+#: src/client/application/application-controller.vala:2392
 msgid "Undo"
 msgstr "元に戻す"
 
-#: src/client/accounts/accounts-editor-list-pane.vala:251
+#: src/client/accounts/accounts-editor-list-pane.vala:255
 msgid "Redo"
 msgstr "やり直す"
 
-#: 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
+#: 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:279
 msgid "Gmail"
 msgstr "Gmail"
 
-#: 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
+#: 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:283
 msgid "Outlook.com"
 msgstr "Outlook.com"
 
-#: 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
+#: src/client/accounts/accounts-editor-list-pane.vala:357
+#: src/client/accounts/accounts-editor-list-pane.vala:445
+#: src/client/accounts/accounts-editor-row.vala:287
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. Translators: Tooltip for accounts that have been
 #. loaded but disabled by the user.
-#: src/client/accounts/accounts-editor-list-pane.vala:371
+#: src/client/accounts/accounts-editor-list-pane.vala:375
 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
+#: src/client/accounts/accounts-editor-list-pane.vala:384
 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
+#: src/client/accounts/accounts-editor-list-pane.vala:434
 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
+#: src/client/accounts/accounts-editor-list-pane.vala:551
 #, c-format
 msgid "Account “%s” removed"
 msgstr "アカウント“%s”を削除しました"
@@ -645,44 +629,44 @@ msgstr "アカウント“%s”を削除しました"
 #. Translators: Notification shown after removing an account
 #. is undone. The string substitution is the name of the
 #. account.
-#: src/client/accounts/accounts-editor-list-pane.vala:554
+#: src/client/accounts/accounts-editor-list-pane.vala:558
 #, c-format
 msgid "Account “%s” restored"
 msgstr "アカウント“%s”を復元しました"
 
 #. Translators: Tooltip for dragging list items
-#: src/client/accounts/accounts-editor-row.vala:49
+#: src/client/accounts/accounts-editor-row.vala:50
 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
+#: src/client/accounts/accounts-editor-row.vala:295
 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
+#: src/client/accounts/accounts-editor-row.vala:468
 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-row.vala:479
 #: src/client/accounts/accounts-editor-servers-pane.vala:752
 #: src/client/accounts/accounts-editor-servers-pane.vala:964
 #: src/engine/api/geary-special-folder-type.vala:58
 msgid "None"
 msgstr "なし"
 
-#: src/client/accounts/accounts-editor-row.vala:485
+#: src/client/accounts/accounts-editor-row.vala:486
 msgid "StartTLS"
 msgstr "StartTLS"
 
-#: src/client/accounts/accounts-editor-row.vala:492
+#: src/client/accounts/accounts-editor-row.vala:493
 msgid "TLS"
 msgstr "TLS"
 
@@ -690,28 +674,28 @@ msgstr "TLS"
 #. credentials (none, use IMAP, custom) when adding a new
 #. account
 #. Button label for retrying when a login error has occurred
-#: src/client/accounts/accounts-editor-row.vala:533 ui/main-window.ui:455
+#: src/client/accounts/accounts-editor-row.vala:534 ui/main-window.ui:346
 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
+#: src/client/accounts/accounts-editor-row.vala:541
 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
+#: src/client/accounts/accounts-editor-row.vala:549
 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
+#: src/client/accounts/accounts-editor-row.vala:557
 msgid "Use a different login"
 msgstr "他の情報を使う"
 
@@ -736,8 +720,10 @@ msgstr "GNOME オンラインアカウント"
 #. Translators: This label describes an account
 #. preference.
 #: src/client/accounts/accounts-editor-servers-pane.vala:611
-msgid "Save drafts on server"
-msgstr "下書きをサーバーに保存"
+#, fuzzy
+#| msgid "Save sent email on server"
+msgid "Save draft email on server"
+msgstr "送信メールをサーバーに保存"
 
 #. Translators: This label describes an account
 #. preference.
@@ -759,136 +745,39 @@ msgstr "%s は OAuth2 を使用しています"
 msgid "Use receiving server login"
 msgstr "受信サーバーの情報を使う"
 
-#: src/client/application/geary-application.vala:24
-msgid "Copyright 2016 Software Freedom Conservancy Inc."
-msgstr "Copyright 2016 Software Freedom Conservancy Inc."
-
-#: src/client/application/geary-application.vala:25
-msgid "Copyright 2016-2019 Geary Development Team."
-msgstr "Copyright 2016-2019 Geary Development Team."
-
-#: src/client/application/geary-application.vala:27
-msgid "Visit the Geary web site"
-msgstr "Geary のウェブサイト"
-
-#: src/client/application/geary-application.vala:454
-#, c-format
-msgid "About %s"
-msgstr "%s について"
-
-#. Translators: add your name and email address to receive
-#. credit in the About dialog For example: Yamada Taro
-#. <yamada taro example com>
-#: src/client/application/geary-application.vala:458
-msgid "translator-credits"
-msgstr ""
-"masami chikahiro <cmasa z321 gmail com>\n"
-"Minato Kanzaki <pikadcolon gmail com>\n"
-"pikatenor <pikatenor gmail com>\n"
-"sicklylife <translation sicklylife jp>\n"
-"UTUMI Hirosi <utuhiro78 yahoo co jp>"
-
-#: src/client/application/geary-args.vala:10
-msgid "Start Geary with hidden main window"
-msgstr "メインウィンドウを隠して Geary を起動する"
-
-#: src/client/application/geary-args.vala:11
-msgid "Output debugging information"
-msgstr "デバッグ情報を出力する"
-
-#: src/client/application/geary-args.vala:12
-msgid "Log conversation monitoring"
-msgstr "スレッドのモニタリングを記録する"
-
-#: src/client/application/geary-args.vala:13
-msgid "Log network deserialization"
-msgstr "ネットワークのデシリアライズを記録する"
-
-#: src/client/application/geary-args.vala:14
-msgid "Log network activity"
-msgstr "ネットワークのアクティビティを記録する"
-
-#. / The IMAP replay queue is how changes on the server are replicated on the client.
-#. / It could also be called the IMAP events queue.
-#: src/client/application/geary-args.vala:17
-msgid "Log IMAP replay queue"
-msgstr "IMAP のイベントキューを記録する"
-
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: src/client/application/geary-args.vala:20
-msgid "Log network serialization"
-msgstr "ネットワークのストリームを記録する"
-
-#: src/client/application/geary-args.vala:21
-msgid "Log periodic activity"
-msgstr "定期的なアクティビティを記録する"
-
-#: src/client/application/geary-args.vala:22
-msgid "Log database queries (generates lots of messages)"
-msgstr "データベースのクエリを記録する (多くのメッセージを生成します)"
-
-#. / "Normalization" can also be called "synchronization"
-#: src/client/application/geary-args.vala:24
-msgid "Log folder normalization"
-msgstr "フォルダーの同期を記録する"
-
-#: src/client/application/geary-args.vala:25
-msgid "Allow inspection of WebView"
-msgstr "WebView での検証を有効にする"
-
-#: src/client/application/geary-args.vala:26
-msgid "Revoke all server certificates with TLS warnings"
-msgstr "TLS 警告のあるサーバー証明書をすべて失効させる"
-
-#: src/client/application/geary-args.vala:27
-msgid "Perform a graceful quit"
-msgstr "正常に終了する"
-
-#: 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
-#, c-format
-msgid "Use %s to open a new composer window"
-msgstr "%s を使って新規作成ウィンドウを開くことができます"
-
-#: 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
-#, c-format
-msgid "Failed to parse command line options: %s\n"
-msgstr "不明なコマンドラインオプション: %s\n"
-
-#: src/client/application/geary-args.vala:74
-#, c-format
-msgid "Unrecognized command line option “%s”\n"
-msgstr "不明なコマンドラインオプション“%s”\n"
-
 #. Translators: File name used in save chooser when saving
 #. attachments that do not otherwise have a name.
-#: src/client/application/geary-controller.vala:58
+#: src/client/application/application-controller.vala:59
 msgid "Untitled"
 msgstr "無題"
 
-#: src/client/application/geary-controller.vala:937
+#. / Notification title.
+#: src/client/application/application-controller.vala:551
+#, fuzzy, c-format
+#| msgid "A problem occurred sending mail for %s"
+msgid "A problem occurred sending email for %s"
+msgstr "%s のメール送信時に問題が発生しました"
+
+#. / Notification body
+#: src/client/application/application-controller.vala:555
+#, fuzzy
+#| msgid "You will not be able to send or receive email until re-connected."
+msgid "Email will not be sent until re-connected"
+msgstr "再接続するまでメールの送受信はできません。"
+
+#: src/client/application/application-controller.vala:906
 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:950
+#: src/client/application/application-controller.vala:919
 #, c-format
 msgid "Unable to open the database for %s"
 msgstr "%s のデータベースを開けません"
 
-#: src/client/application/geary-controller.vala:951
+#: src/client/application/application-controller.vala:920
 #, c-format
 msgid ""
 "There was an error opening the local mail database for this account. This is "
@@ -912,20 +801,20 @@ msgstr ""
 "データベースを再構築すると、すべてのローカルメールと添付ファイルが破棄されま"
 "す。<b>サーバー上のメールは影響を受けません。</b>"
 
-#: src/client/application/geary-controller.vala:953
+#: src/client/application/application-controller.vala:922
 msgid "_Rebuild"
 msgstr "再構築(_R)"
 
-#: src/client/application/geary-controller.vala:953
+#: src/client/application/application-controller.vala:922
 msgid "E_xit"
 msgstr "終了(_X)"
 
-#: src/client/application/geary-controller.vala:962
+#: src/client/application/application-controller.vala:931
 #, c-format
 msgid "Unable to rebuild database for “%s”"
 msgstr "“%s”のデータベースを再構築できません"
 
-#: src/client/application/geary-controller.vala:963
+#: src/client/application/application-controller.vala:932
 #, c-format
 msgid ""
 "Error during rebuild:\n"
@@ -936,15 +825,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/client/application/geary-controller.vala:1818
-msgid "Undo move (Ctrl+Z)"
-msgstr "移動を元に戻す(Ctrl+Z)"
+#: src/client/application/application-controller.vala:1726
+#, fuzzy, c-format
+#| msgid "%d message"
+#| msgid_plural "%d messages"
+msgid "Moved %d message to %s"
+msgid_plural "Moved %d messages to %s"
+msgstr[0] "%d 件のメッセージ"
 
-#: src/client/application/geary-controller.vala:1828
+#: src/client/application/application-controller.vala:1736
 msgid "Are you sure you want to open these attachments?"
 msgstr "これらの添付ファイルを開いてもよろしいですか?"
 
-#: src/client/application/geary-controller.vala:1829
+#: src/client/application/application-controller.vala:1737
 msgid ""
 "Attachments may cause damage to your system if opened.  Only open files from "
 "trusted sources."
@@ -952,14 +845,14 @@ msgstr ""
 "添付ファイルはシステムにダメージを与える可能性があります。送信元が信頼できる"
 "場合のみ開くようにしてください。"
 
-#: src/client/application/geary-controller.vala:1830
+#: src/client/application/application-controller.vala:1738
 msgid "Don’t _ask me again"
 msgstr "次回から表示しない(_A)"
 
 #. Translators: Dialog primary label when prompting to
 #. overwrite a file. The string substitution is the file'sx
 #. name.
-#: src/client/application/geary-controller.vala:1959
+#: src/client/application/application-controller.vala:1861
 #, c-format
 msgid "A file named “%s” already exists.  Do you want to replace it?"
 msgstr "“%s”はすでに存在します。置き換えますか?"
@@ -967,76 +860,294 @@ msgstr "“%s”はすでに存在します。置き換えますか?"
 #. 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:1966
+#: src/client/application/application-controller.vala:1868
 #, c-format
 msgid ""
 "The file already exists in “%s”.  Replacing it will overwrite its contents."
 msgstr "ファイルはすでに“%s”に存在します。置き換えると内容を上書きします。"
 
-#: src/client/application/geary-controller.vala:1970
+#: src/client/application/application-controller.vala:1872
 msgid "_Replace"
 msgstr "置換(_R)"
 
-#: src/client/application/geary-controller.vala:2246
-msgid "Close the draft message?"
-msgid_plural "Close all draft messages?"
-msgstr[0] "下書きメッセージを閉じますか?"
-
-#: src/client/application/geary-controller.vala:2372
+#: src/client/application/application-controller.vala:2232
 #, c-format
 msgid "Empty all email from your %s folder?"
 msgstr "%s フォルダーのすべてのメールを空にしますか?"
 
-#: src/client/application/geary-controller.vala:2373
+#: src/client/application/application-controller.vala:2233
 msgid "This removes the email from Geary and your email server."
 msgstr "メールを Geary とメールサーバーから削除します。"
 
-#: src/client/application/geary-controller.vala:2374
+#: src/client/application/application-controller.vala:2234
 msgid "This cannot be undone."
 msgstr "これは元に戻すことができません。"
 
-#: src/client/application/geary-controller.vala:2375
+#: src/client/application/application-controller.vala:2235
 #, c-format
 msgid "Empty %s"
 msgstr "%s を空にする"
 
-#: src/client/application/geary-controller.vala:2392
+#: src/client/application/application-controller.vala:2252
 #, c-format
 msgid "Error emptying %s"
 msgstr "%s を空にするときにエラーが発生しました"
 
-#: src/client/application/geary-controller.vala:2424
+#: src/client/application/application-controller.vala:2283
 msgid "Do you want to permanently delete this message?"
 msgid_plural "Do you want to permanently delete these messages?"
 msgstr[0] "このメッセージを完全に削除しますか?"
 
-#: src/client/application/geary-controller.vala:2426
+#: src/client/application/application-controller.vala:2285
 msgid "Delete"
 msgstr "削除"
 
-#: src/client/application/geary-controller.vala:2440
-msgid "Undo trash (Ctrl+Z)"
-msgstr "ごみ箱から戻す(Ctrl+Z)"
-
-#: src/client/application/geary-controller.vala:2490
-msgid "Undo archive (Ctrl+Z)"
-msgstr "アーカイブから戻す(Ctrl+Z)"
+#: src/client/application/application-controller.vala:2299
+#, fuzzy, c-format
+#| msgid "%d message"
+#| msgid_plural "%d messages"
+msgid "Trashed %d message"
+msgid_plural "Trashed %d messages"
+msgstr[0] "%d 件のメッセージ"
 
-#: src/client/application/geary-controller.vala:2535
-msgid "Undo (Ctrl+Z)"
-msgstr "元に戻す(Ctrl+Z)"
+#: src/client/application/application-controller.vala:2346
+#, fuzzy, c-format
+#| msgid "%d message"
+#| msgid_plural "%d messages"
+msgid "Archived %d message"
+msgid_plural "Archived %d messages"
+msgstr[0] "%d 件のメッセージ"
 
 #. Translators: The label for an in-app notification. The
 #. string substitution is a list of recipients of the email.
-#: src/client/application/geary-controller.vala:2616
+#: src/client/application/application-controller.vala:2474
 #, c-format
 msgid "Successfully sent mail to %s."
 msgstr "%s にメールを送信しました。"
 
-#: src/client/application/geary-controller.vala:2698
+#: src/client/application/application-controller.vala:2552
 msgid "Failed to open default text editor."
 msgstr "デフォルトのテキストエディターの起動に失敗しました。"
 
+#: src/client/application/geary-application.vala:31
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
+
+#: src/client/application/geary-application.vala:32
+msgid "Copyright 2016-2019 Geary Development Team."
+msgstr "Copyright 2016-2019 Geary Development Team."
+
+#: src/client/application/geary-application.vala:34
+msgid "Visit the Geary web site"
+msgstr "Geary のウェブサイト"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:109
+msgid "Print debug logging"
+msgstr ""
+
+#. / Command line option
+#: src/client/application/geary-application.vala:112
+#, fuzzy
+#| msgid "Start Geary with hidden main window"
+msgid "Start with the main window hidden (deprecated)"
+msgstr "メインウィンドウを隠して Geary を起動する"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:115
+msgid "Enable WebKitGTK Inspector in web views"
+msgstr ""
+
+#. / Command line option
+#: src/client/application/geary-application.vala:118
+msgid "Log conversation monitoring"
+msgstr "スレッドのモニタリングを記録する"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:121
+#, fuzzy
+#| msgid "Log network deserialization"
+msgid "Log IMAP network deserialization"
+msgstr "ネットワークのデシリアライズを記録する"
+
+#. / Command line option. "Normalization" can also be called
+#. / "synchronization".
+#: src/client/application/geary-application.vala:125
+msgid "Log folder normalization"
+msgstr "フォルダーの同期を記録する"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:128
+msgid "Log network activity"
+msgstr "ネットワークのアクティビティを記録する"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:131
+msgid "Log periodic activity"
+msgstr "定期的なアクティビティを記録する"
+
+#. / Command line option. The IMAP replay queue is how changes
+#. / on the server are replicated on the client.  It could
+#. / also be called the IMAP events queue.
+#: src/client/application/geary-application.vala:136
+msgid "Log IMAP replay queue"
+msgstr "IMAP のイベントキューを記録する"
+
+#. / Command line option. Serialization is how commands and
+#. / responses are converted into a stream of bytes for
+#. / network transmission
+#: src/client/application/geary-application.vala:141
+#, fuzzy
+#| msgid "Log network serialization"
+msgid "Log IMAP network serialization"
+msgstr "ネットワークのストリームを記録する"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:144
+msgid "Log database queries (generates lots of messages)"
+msgstr "データベースのクエリを記録する (多くのメッセージを生成します)"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:147
+msgid "Perform a graceful quit"
+msgstr "正常に終了する"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:150
+#, fuzzy
+#| msgid "Revoke all server certificates with TLS warnings"
+msgid "Revoke all pinned TLS server certificates"
+msgstr "TLS 警告のあるサーバー証明書をすべて失効させる"
+
+#. / Command line option
+#: src/client/application/geary-application.vala:153
+msgid "Display program version"
+msgstr "プログラムのバージョンを表示する"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:280
+#, fuzzy
+#| msgid "Mark conversation"
+#| msgid_plural "Mark conversations"
+msgid "Geary version"
+msgstr "スレッドをマーク"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:282
+msgid "Geary revision"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:284
+msgid "GTK version"
+msgstr ""
+
+#. / Applciation runtime information label
+#: src/client/application/geary-application.vala:291
+msgid "GLib version"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:298
+msgid "WebKitGTK version"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:305
+msgid "Desktop environment"
+msgstr ""
+
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: src/client/application/geary-application.vala:307
+#: src/client/conversation-viewer/conversation-email.vala:159
+msgid "Unknown"
+msgstr "不明"
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:337
+msgid "Distribution name"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:342
+msgid "Distribution release"
+msgstr ""
+
+#. / Application runtime information label
+#: src/client/application/geary-application.vala:350
+msgid "Installation prefix"
+msgstr ""
+
+#: src/client/application/geary-application.vala:490
+#, c-format
+msgid "About %s"
+msgstr "%s について"
+
+#. Translators: add your name and email address to receive
+#. credit in the About dialog For example: Yamada Taro
+#. <yamada taro example com>
+#: src/client/application/geary-application.vala:494
+msgid "translator-credits"
+msgstr ""
+"masami chikahiro <cmasa z321 gmail com>\n"
+"Minato Kanzaki <pikadcolon gmail com>\n"
+"pikatenor <pikatenor gmail com>\n"
+"sicklylife <translation sicklylife jp>\n"
+"UTUMI Hirosi <utuhiro78 yahoo co jp>"
+
+#. / Warning printed to the console when a deprecated
+#. / command line option is used.
+#: src/client/application/geary-application.vala:778
+msgid "The `--hidden` option is deprecated and will be removed in the future."
+msgstr ""
+
+#. / Command line warning, string substitution
+#. / is the given argument
+#: src/client/application/geary-application.vala:810
+#, fuzzy, c-format
+#| msgid "Unrecognized command line option “%s”\n"
+msgid "Unrecognised program argument: “%s”"
+msgstr "不明なコマンドラインオプション“%s”\n"
+
+#: src/client/components/components-inspector.vala:68
+#, fuzzy
+#| msgid "_Inspect…"
+msgid "Inspector"
+msgstr "検証(_I)…"
+
+#. / Translators: Title for Inspector logs pane
+#. / Translators: Title for problem report dialog logs pane
+#: src/client/components/components-inspector.vala:77
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:91
+msgid "Logs"
+msgstr ""
+
+#. / Translators: Title for Inspector system system information pane
+#. / Translators: Title for problem report system information
+#. / pane
+#: src/client/components/components-inspector.vala:81
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:94
+msgid "System"
+msgstr ""
+
+#. Button label for saving problem report information
+#: src/client/components/components-inspector.vala:198
+#: src/client/components/components-inspector.vala:201
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:210
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:213
+#: ui/problem-details-dialog.ui:42
+#, fuzzy
+#| msgid "_Save As..."
+msgid "Save As"
+msgstr "名前を付けて保存(_S)..."
+
+#: src/client/components/components-inspector.vala:202
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:214
+#: ui/accounts_editor_servers_pane.ui:17
+msgid "Cancel"
+msgstr "キャンセル"
+
 #. Translators: Tooltip used when an entry requires a valid
 #. email address to be entered, but one is not provided.
 #: src/client/components/components-validator.vala:378
@@ -1063,247 +1174,140 @@ msgstr "サーバー名は必須です"
 msgid "Could not look up server name"
 msgstr "サーバー名が見つかりませんでした"
 
-#: src/client/components/main-toolbar.vala:151
+#: src/client/components/main-toolbar.vala:139
 msgid "Mark conversation"
 msgid_plural "Mark conversations"
 msgstr[0] "スレッドをマーク"
 
-#: src/client/components/main-toolbar.vala:156
+#: src/client/components/main-toolbar.vala:144
 msgid "Add label to conversation"
 msgid_plural "Add label to conversations"
 msgstr[0] "スレッドにラベル付け"
 
-#: src/client/components/main-toolbar.vala:161
+#: src/client/components/main-toolbar.vala:149
 msgid "Move conversation"
 msgid_plural "Move conversations"
 msgstr[0] "スレッドを移動"
 
-#: src/client/components/main-toolbar.vala:166
-msgid "Archive conversation (A)"
-msgid_plural "Archive conversations (A)"
+#: src/client/components/main-toolbar.vala:154
+#, fuzzy
+#| msgid "Archive conversation (A)"
+#| msgid_plural "Archive conversations (A)"
+msgid "Archive conversation"
+msgid_plural "Archive conversations"
 msgstr[0] "スレッドをアーカイブに移動(A)"
 
-#: src/client/components/main-toolbar.vala:175
-msgid "Move conversation to Trash (Delete, Backspace)"
-msgid_plural "Move conversations to Trash (Delete, Backspace)"
-msgstr[0] "スレッドをごみ箱に移動(Delete, Backspace)"
+#: src/client/components/main-toolbar.vala:163
+#, fuzzy
+#| msgid "Move conversations"
+msgid "Move conversation to Trash"
+msgid_plural "Move conversations to Trash"
+msgstr[0] "スレッドを移動"
 
-#: src/client/components/main-toolbar.vala:183
-msgid "Delete conversation (Shift+Delete)"
-msgid_plural "Delete conversations (Shift+Delete)"
-msgstr[0] "スレッドを削除(Shift+Delete)"
+#: src/client/components/main-toolbar.vala:171
+#, fuzzy
+#| msgid "Delete conversation"
+msgid "Delete conversation"
+msgid_plural "Delete conversations"
+msgstr[0] "スレッドを削除"
 
-#: src/client/components/main-window.vala:503
+#: src/client/components/main-window.vala:738
 #, 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: Info bar title for a generic account
+#. problem.
+#: src/client/components/main-window-info-bar.vala:44
+msgid "Account problem"
+msgstr "アカウントの問題"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:49
-#: src/client/components/main-window-info-bar.vala:58
-#, c-format
-msgid ""
-"Could not connect to %s, check your Internet access and the server name and "
-"try again"
-msgstr ""
-"%s に接続できなかったため、インターネット接続とサーバー名を確認して再試行して"
-"ください"
+#. Translators: Info bar sub-title for a generic account
+#. problem. String substitution is the account name.
+#: src/client/components/main-window-info-bar.vala:48
+#, fuzzy, c-format
+#| msgid "Geary has encountered a problem"
+msgid "Geary has encountered a problem with %s."
+msgstr "Geary に問題が発生しました"
+
+#. Translators: Info bar sub-title for a generic
+#. account problem. String substitution is the
+#. account name.
+#: src/client/components/main-window-info-bar.vala:61
+#, fuzzy, c-format
+#| msgid "Geary encountered a problem connecting to an account."
+msgid "Geary encountered a problem checking mail for %s."
+msgstr "アカウントへの接続時に問題が発生しました。"
 
 #. Translators: Tooltip label for Retry button
-#. Button tooltip for retrying an account problem
-#: src/client/components/main-window-info-bar.vala:51
-#: src/client/components/main-window-info-bar.vala:60
-#: src/client/components/main-window-info-bar.vala:69
-#: src/client/components/main-window-info-bar.vala:78
-#: src/client/components/main-window-info-bar.vala:87
-#: src/client/components/main-window-info-bar.vala:96
-#: src/client/components/main-window-info-bar.vala:136 ui/main-window.ui:265
+#: src/client/components/main-window-info-bar.vala:65
 msgid "Try reconnecting"
 msgstr "再接続を試行"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:56
-#, c-format
-msgid "Problem connecting to outgoing server for %s"
-msgstr "%s の送信サーバーとの接続時に問題があります"
+#. Translators: Info bar title for an outgoing
+#. account problem. String substitution is the
+#. account name
+#: src/client/components/main-window-info-bar.vala:73
+#, fuzzy, c-format
+#| msgid "Geary encountered a problem connecting to an account."
+msgid "Geary encountered a problem sending email for %s."
+msgstr "アカウントへの接続時に問題が発生しました。"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:65
-#: src/client/components/main-window-info-bar.vala:83
-#, c-format
-msgid "Problem communicating with incoming server for %s"
-msgstr "%s の受信サーバーとの通信に問題があります"
+#. Translators: Tooltip label for Retry button
+#: src/client/components/main-window-info-bar.vala:77
+msgid "Retry sending queued messages"
+msgstr "待機メッセージの送信を再試行"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:67
-#: src/client/components/main-window-info-bar.vala:76
-#, c-format
-msgid "Network error talking to %s, check your Internet access and try again"
-msgstr ""
-"%s との接続でネットワークエラーが発生したため、インターネット接続を確認して再"
-"試行してください"
+#. Translators: Info bar title for a generic application
+#. problem.
+#: src/client/components/main-window-info-bar.vala:84
+msgid "Geary has encountered a problem"
+msgstr "Geary に問題が発生しました"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:74
-#: src/client/components/main-window-info-bar.vala:91
-msgid "Problem communicating with outgoing mail server"
-msgstr "送信メールサーバーとの通信に問題があります"
+#. Translators: Info bar sub-title for a generic
+#. application problem.
+#: src/client/components/main-window-info-bar.vala:88
+#, fuzzy
+#| msgid ""
+#| "Please check the technical details and report the problem if it persists."
+msgid "Please report the details if it persists."
+msgstr "問題が解決しない場合は、技術的な詳細情報を確認して報告してください。"
 
-#. Translators: String substitution is the server name
-#: src/client/components/main-window-info-bar.vala:85
-#, c-format
-msgid ""
-"Geary did not understand a message from %s or vice versa, please file a bug "
-"report"
-msgstr ""
-"Geary か %s のどちらかがメッセージを理解できないバグに遭遇したため、可能でし"
-"たらバグ報告してください"
+#. Translators: Button label for viewing technical details
+#. for a problem report.
+#: src/client/components/main-window-info-bar.vala:99
+msgid "_Details"
+msgstr "詳細(_D)"
 
-#. Translators: First string substitution is the server
-#. name, second is the account name
-#: src/client/components/main-window-info-bar.vala:94
-#, c-format
-msgid ""
-"Could not communicate with %s for %s, check the server name and try again in "
-"a moment"
-msgstr ""
-"%2$s の %1$s と通信できなかったため、サーバー名を確認して後ほど再試行してくだ"
-"さい"
+#. Translators: Tooltip for viewing technical details for
+#. a problem report.
+#: src/client/components/main-window-info-bar.vala:102
+msgid "View technical details about the error"
+msgstr "エラーについての技術的な詳細情報を表示"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:101
-#, c-format
-msgid "Incoming mail server password required for %s"
-msgstr "%s の受信メールサーバーのパスワードが必要です"
+#. Translators: Button label for retrying a server
+#. connection
+#: src/client/components/main-window-info-bar.vala:108
+msgid "_Retry"
+msgstr "再試行(_R)"
 
-#: src/client/components/main-window-info-bar.vala:102
-msgid "Messages cannot be received without the correct password."
-msgstr "正しいパスワードがないとメッセージを受信できません。"
+#: src/client/components/search-bar.vala:8
+#: src/client/folder-list/folder-list-search-branch.vala:38
+#: src/engine/api/geary-special-folder-type.vala:51
+msgid "Search"
+msgstr "検索"
 
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:104
-msgid "Retry receiving email, you will be prompted for a password"
-msgstr "メール受信の再試行にはパスワードが必要です"
+#. Search entry.
+#: src/client/components/search-bar.vala:23
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr "アカウント内のすべてのメールをキーワードで検索(Ctrl+S)"
 
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:109
+#: src/client/components/search-bar.vala:83
 #, c-format
-msgid "Outgoing mail server password required for %s"
-msgstr "%s の送信メールサーバーのパスワードが必要です"
+msgid "Indexing %s account"
+msgstr ""
 
-#: src/client/components/main-window-info-bar.vala:110
-msgid "Messages cannot be sent without the correct password."
-msgstr "正しいパスワードがないとメッセージを送信できません。"
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:112
-msgid "Retry sending queued messages, you will be prompted for a password"
-msgstr "待機メッセージ送信の再試行にはパスワードが必要です"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:117
-#, c-format
-msgid "Incoming mail server security is not trusted for %s"
-msgstr "%s の受信メールサーバーのセキュリティを信頼していません"
-
-#: src/client/components/main-window-info-bar.vala:118
-msgid "Messages will not be received until checked."
-msgstr "確認するまでメッセージを受信しません。"
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:120
-#: src/client/components/main-window-info-bar.vala:128
-msgid "Check security details"
-msgstr "セキュリティの詳細を確認"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:125
-#, c-format
-msgid "Outgoing mail server security is not trusted for %s"
-msgstr "%s の送信メールサーバーのセキュリティを信頼していません"
-
-#: src/client/components/main-window-info-bar.vala:126
-msgid "Messages cannot be sent until checked."
-msgstr "確認するまでメッセージを送信できません。"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:133
-#, c-format
-msgid "A problem occurred checking mail for %s"
-msgstr "%s のメール確認時に問題が発生しました"
-
-#: src/client/components/main-window-info-bar.vala:134
-#: src/client/components/main-window-info-bar.vala:142
-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:141
-#, c-format
-msgid "A problem occurred sending mail for %s"
-msgstr "%s のメール送信時に問題が発生しました"
-
-#. Translators: Tooltip label for Retry button
-#: src/client/components/main-window-info-bar.vala:144
-msgid "Retry sending queued messages"
-msgstr "待機メッセージの送信を再試行"
-
-#: src/client/components/main-window-info-bar.vala:155
-msgid "A database problem has occurred"
-msgstr "データベースに問題が発生しました"
-
-#. Translators: String substitution is the account name
-#: src/client/components/main-window-info-bar.vala:157
-#, c-format
-msgid "Messages for %s must be downloaded again."
-msgstr "%s のメッセージを再ダウンロードする必要があります。"
-
-#: src/client/components/main-window-info-bar.vala:170
-msgid "Geary has encountered a problem"
-msgstr "Geary に問題が発生しました"
-
-#: src/client/components/main-window-info-bar.vala:171
-msgid ""
-"Please check the technical details and report the problem if it persists."
-msgstr "問題が解決しない場合は、技術的な詳細情報を確認して報告してください。"
-
-#: src/client/components/main-window-info-bar.vala:179
-msgid "_Details"
-msgstr "詳細(_D)"
-
-#. Button tooltip for displaying technical details about an account problem
-#: src/client/components/main-window-info-bar.vala:180 ui/main-window.ui:250
-msgid "View technical details about the error"
-msgstr "エラーについての技術的な詳細情報を表示"
-
-#: src/client/components/main-window-info-bar.vala:184
-msgid "_Retry"
-msgstr "再試行(_R)"
-
-#: src/client/components/search-bar.vala:8
-#: src/client/folder-list/folder-list-search-branch.vala:38
-#: src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
-msgstr "検索"
-
-#. Search entry.
-#: src/client/components/search-bar.vala:23
-msgid "Search all mail in account for keywords (Ctrl+S)"
-msgstr "アカウント内のすべてのメールをキーワードで検索(Ctrl+S)"
-
-#: src/client/components/search-bar.vala:101
-#, c-format
-msgid "Indexing %s account"
-msgstr ""
-
-#: src/client/components/search-bar.vala:112
+#: src/client/components/search-bar.vala:110
 #: src/client/folder-list/folder-list-search-branch.vala:39
 #, c-format
 msgid "Search %s account"
@@ -1394,19 +1398,19 @@ msgstr "無効なリンク URL"
 msgid "Invalid email address"
 msgstr "無効なメールアドレス"
 
-#: src/client/composer/composer-widget.vala:158
+#: src/client/composer/composer-widget.vala:156
 msgid "Saved"
 msgstr "保存済み"
 
-#: src/client/composer/composer-widget.vala:159
+#: src/client/composer/composer-widget.vala:157
 msgid "Saving"
 msgstr "保存中"
 
-#: src/client/composer/composer-widget.vala:160
+#: src/client/composer/composer-widget.vala:158
 msgid "Error saving"
 msgstr "保存エラー"
 
-#: src/client/composer/composer-widget.vala:161
+#: src/client/composer/composer-widget.vala:159
 msgid "Press Backspace to delete quote"
 msgstr "Backspace を押すと引用を削除できます"
 
@@ -1414,7 +1418,7 @@ msgstr "Backspace を押すと引用を削除できます"
 #. characters, that suggest an attachment; since this is full-word
 #. checking, include all variants of each word.  No spaces are
 #. allowed.
-#: src/client/composer/composer-widget.vala:170
+#: src/client/composer/composer-widget.vala:168
 msgid ""
 "attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
 "enclosing|encloses|enclosure|enclosures"
@@ -1423,34 +1427,34 @@ msgstr ""
 #. Translators: This dialog text is displayed to the
 #. user when closing a composer where the options are
 #. Keep, Discard or Cancel.
-#: src/client/composer/composer-widget.vala:1131
+#: src/client/composer/composer-widget.vala:1181
 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:1159
+#: src/client/composer/composer-widget.vala:1211
 msgid "Do you want to discard this draft message?"
 msgstr "この下書きメッセージを破棄しますか?"
 
-#: src/client/composer/composer-widget.vala:1276
+#: src/client/composer/composer-widget.vala:1330
 msgid "Send message with an empty subject and body?"
 msgstr "メッセージを件名と本文なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1278
+#: src/client/composer/composer-widget.vala:1332
 msgid "Send message with an empty subject?"
 msgstr "メッセージを件名なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1280
+#: src/client/composer/composer-widget.vala:1334
 msgid "Send message with an empty body?"
 msgstr "メッセージを本文なしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1284
+#: src/client/composer/composer-widget.vala:1338
 msgid "Send message without an attachment?"
 msgstr "メッセージを添付ファイルなしで送信しますか?"
 
-#: src/client/composer/composer-widget.vala:1589
+#: src/client/composer/composer-widget.vala:1652
 #, c-format
 msgid "“%s” already attached for delivery."
 msgstr "“%s”はすでに添付されています。"
@@ -1460,63 +1464,63 @@ 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:1597
+#: src/client/composer/composer-widget.vala:1660
 #: src/client/conversation-viewer/conversation-email.vala:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: src/client/composer/composer-widget.vala:1634
+#: src/client/composer/composer-widget.vala:1697
 #, c-format
 msgid "“%s” could not be found."
 msgstr "“%s”が見つかりませんでした。"
 
-#: src/client/composer/composer-widget.vala:1640
+#: src/client/composer/composer-widget.vala:1703
 #, c-format
 msgid "“%s” is a folder."
 msgstr "“%s”はフォルダーです。"
 
-#: src/client/composer/composer-widget.vala:1646
+#: src/client/composer/composer-widget.vala:1709
 #, c-format
 msgid "“%s” is an empty file."
 msgstr "“%s”は空ファイルです。"
 
-#: src/client/composer/composer-widget.vala:1659
+#: src/client/composer/composer-widget.vala:1722
 #, c-format
 msgid "“%s” could not be opened for reading."
 msgstr "“%s”を読み取り用に開けませんでした。"
 
-#: src/client/composer/composer-widget.vala:1667
+#: src/client/composer/composer-widget.vala:1730
 msgid "Cannot add attachment"
 msgstr "添付できません"
 
 #. Translators: Human-readable version of the RFC 822 To header
-#: src/client/composer/composer-widget.vala:1717
-#: src/client/conversation-viewer/conversation-email.vala:975
-#: src/engine/rfc822/rfc822-utils.vala:298 ui/conversation-message.ui:313
+#: src/client/composer/composer-widget.vala:1787
+#: src/client/conversation-viewer/conversation-email.vala:976
+#: src/client/util/util-email.vala:216 ui/conversation-message.ui:312
 msgid "To:"
 msgstr "宛先:"
 
 #. Translators: Human-readable version of the RFC 822 CC header
-#: src/client/composer/composer-widget.vala:1723
-#: src/client/conversation-viewer/conversation-email.vala:980
-#: src/engine/rfc822/rfc822-utils.vala:303 ui/conversation-message.ui:358
+#: src/client/composer/composer-widget.vala:1793
+#: src/client/conversation-viewer/conversation-email.vala:981
+#: src/client/util/util-email.vala:221 ui/conversation-message.ui:357
 msgid "Cc:"
 msgstr "Cc:"
 
 #. Translators: Human-readable version of the RFC 822 BCC header
-#: src/client/composer/composer-widget.vala:1729
-#: src/client/conversation-viewer/conversation-email.vala:985
-#: ui/conversation-message.ui:403
+#: src/client/composer/composer-widget.vala:1799
+#: src/client/conversation-viewer/conversation-email.vala:986
+#: ui/conversation-message.ui:402
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Translators: Human-readable version of the RFC 822 Reply-To header
-#: src/client/composer/composer-widget.vala:1735
+#: src/client/composer/composer-widget.vala:1805
 msgid "Reply-To: "
 msgstr "Reply-To: "
 
-#: src/client/composer/composer-widget.vala:1875
+#: src/client/composer/composer-widget.vala:1945
 msgid "Select Color"
 msgstr "色を選択"
 
@@ -1525,20 +1529,20 @@ msgstr "色を選択"
 #. printf argument will be the alternate email address,
 #. and the second will be the account's primary email
 #. address.
-#: src/client/composer/composer-widget.vala:2065
+#: src/client/composer/composer-widget.vala:2137
 #, 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:2126
+#: src/client/composer/composer-widget.vala:2192
 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:2352
+#: src/client/composer/composer-widget.vala:2472
 msgid "Images"
 msgstr "画像"
 
@@ -1546,131 +1550,138 @@ msgstr "画像"
 msgid "New Message"
 msgstr "新規メッセージ"
 
-#: src/client/composer/spell-check-popover.vala:117
+#: src/client/composer/spell-check-popover.vala:108
 msgid "Remove this language from the preferred list"
 msgstr "この言語を優先リストから削除"
 
-#: src/client/composer/spell-check-popover.vala:121
+#: src/client/composer/spell-check-popover.vala:112
 msgid "Add this language to the preferred list"
 msgstr "この言語を優先リストに追加"
 
-#: src/client/composer/spell-check-popover.vala:217
+#: src/client/composer/spell-check-popover.vala:199
 msgid "Search for more languages"
 msgstr "言語を検索"
 
-#: src/client/conversation-list/conversation-list-view.vala:283
-msgid "Delete conversation"
-msgstr "スレッドを削除"
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:337
+#, fuzzy
+#| msgid "Move conversations"
+msgid "Move conversation to _Trash"
+msgid_plural "Move conversations to _Trash"
+msgstr[0] "スレッドを移動"
+
+#. / Translators: Context menu item
+#: src/client/conversation-list/conversation-list-view.vala:347
+#, fuzzy
+#| msgid "Delete conversation"
+msgid "_Delete conversation"
+msgid_plural "_Delete conversations"
+msgstr[0] "スレッドを削除"
 
-#: src/client/conversation-list/conversation-list-view.vala:286
+#: src/client/conversation-list/conversation-list-view.vala:356
 #: ui/main-toolbar-menus.ui:5
 msgid "Mark as _Read"
 msgstr "既読としてマーク(_R)"
 
-#: src/client/conversation-list/conversation-list-view.vala:289
+#: src/client/conversation-list/conversation-list-view.vala:359
 #: ui/main-toolbar-menus.ui:9
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: src/client/conversation-list/conversation-list-view.vala:292
+#: src/client/conversation-list/conversation-list-view.vala:362
 #: ui/main-toolbar-menus.ui:17
 msgid "U_nstar"
 msgstr "星を外す(_N)"
 
-#: src/client/conversation-list/conversation-list-view.vala:294
+#: src/client/conversation-list/conversation-list-view.vala:364
 #: ui/main-toolbar-menus.ui:13
 msgid "_Star"
 msgstr "星を付ける(_S)"
 
 #. Translators: Menu item to reply to a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:297
+#: src/client/conversation-list/conversation-list-view.vala:367
 #: ui/conversation-email-menus.ui:9
 msgid "_Reply"
 msgstr "返信(_R)"
 
-#: src/client/conversation-list/conversation-list-view.vala:298
+#: src/client/conversation-list/conversation-list-view.vala:368
 msgid "R_eply All"
 msgstr "全員に返信(_E)"
 
 #. Translators: Menu item to forward a specific message.
-#: src/client/conversation-list/conversation-list-view.vala:299
+#: src/client/conversation-list/conversation-list-view.vala:369
 #: ui/conversation-email-menus.ui:21
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: src/client/conversation-list/formatted-conversation-data.vala:11
+#: src/client/conversation-list/formatted-conversation-data.vala:18
 msgid "Me"
 msgstr "自分"
 
-#. Translators: This is the file type displayed for
-#. attachments with unknown file types.
-#: src/client/conversation-viewer/conversation-email.vala:159
-msgid "Unknown"
-msgstr "不明"
-
 #. Translators: Human-readable version of the RFC 822 From header
-#: src/client/conversation-viewer/conversation-email.vala:970
-#: src/engine/rfc822/rfc822-utils.vala:289
+#: src/client/conversation-viewer/conversation-email.vala:971
+#: src/client/util/util-email.vala:207
 msgid "From:"
 msgstr "差出人:"
 
 #. Translators: Human-readable version of the RFC 822 Date header
-#: src/client/conversation-viewer/conversation-email.vala:990
-#: src/engine/rfc822/rfc822-utils.vala:294
+#: src/client/conversation-viewer/conversation-email.vala:991
+#: src/client/util/util-email.vala:212
 msgid "Date:"
 msgstr "日時:"
 
 #. Translators: Human-readable version of the RFC 822 Subject header
-#: src/client/conversation-viewer/conversation-email.vala:995
-#: src/engine/rfc822/rfc822-utils.vala:292
+#: src/client/conversation-viewer/conversation-email.vala:1001
+#: src/client/util/util-email.vala:210
 msgid "Subject:"
 msgstr "件名:"
 
-#: src/client/conversation-viewer/conversation-message.vala:65
+#: src/client/conversation-viewer/conversation-message.vala:129
 msgid "This email address may have been forged"
 msgstr "これは偽装メールアドレスである可能性があります"
 
-#. Compact headers
+#. Compact headers. These are partially done here and partially
+#. in load_contacts.
 #. Translators: This is displayed in place of the from address
 #. when the message has no from address.
-#: src/client/conversation-viewer/conversation-message.vala:394
+#: src/client/conversation-viewer/conversation-message.vala:447
 msgid "No sender"
 msgstr "送信者なし"
 
 #. Translators: This separates multiple 'from'
 #. addresses in the compact header for a message.
-#: src/client/conversation-viewer/conversation-message.vala:767
+#: src/client/conversation-viewer/conversation-message.vala:840
 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:870
+#: src/client/conversation-viewer/conversation-message.vala:960
 msgid "Image"
 msgstr "画像"
 
 #. Translators: Title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:81
+#: src/client/conversation-viewer/conversation-viewer.vala:82
 msgid "No conversations selected"
 msgstr "スレッドを選択していません"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:85
+#: src/client/conversation-viewer/conversation-viewer.vala:86
 msgid "Selecting a conversation from the list will display it here"
 msgstr "リストからスレッドを選択すると、ここに表示します"
 
 #. Translators: Title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:94
+#: src/client/conversation-viewer/conversation-viewer.vala:95
 msgid "Multiple conversations selected"
 msgstr "複数のスレッドを選択しています"
 
 #. Translators: Sub-title label for placeholder when multiple
 #. conversations have been selected.
-#: src/client/conversation-viewer/conversation-viewer.vala:98
+#: src/client/conversation-viewer/conversation-viewer.vala:99
 msgid "Choosing an action will apply to all selected conversations"
 msgstr "選択したすべてのスレッドにアクションを適用します"
 
@@ -1678,20 +1689,20 @@ msgstr "選択したすべてのスレッドにアクションを適用します
 #. conversations have exist in a folder.
 #. Translators: Title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:107
-#: src/client/conversation-viewer/conversation-viewer.vala:120
+#: src/client/conversation-viewer/conversation-viewer.vala:108
+#: src/client/conversation-viewer/conversation-viewer.vala:121
 msgid "No conversations found"
 msgstr "スレッドが見つかりません"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have exist in a folder.
-#: src/client/conversation-viewer/conversation-viewer.vala:111
+#: src/client/conversation-viewer/conversation-viewer.vala:112
 msgid "This folder does not contain any conversations"
 msgstr "このフォルダーにはスレッドがありません"
 
 #. Translators: Sub-title label for placeholder when no
 #. conversations have been found in a search.
-#: src/client/conversation-viewer/conversation-viewer.vala:124
+#: src/client/conversation-viewer/conversation-viewer.vala:125
 msgid "Your search returned no results, try refining your search terms"
 msgstr "検索結果がないため条件を変えて再検索してください"
 
@@ -1777,6 +1788,14 @@ msgstr "サーバーの証明書が安全ではありません"
 msgid "An error has occurred processing the server’s certificate"
 msgstr "サーバーの証明書を処理中にエラーが発生しました"
 
+#. / Translators: Title for problem report dialog error
+#. / information pane
+#. Dialog title for displaying technical details of a problem. Same as the button that invokes it.
+#: src/client/dialogs/dialogs-problem-details-dialog.vala:89
+#: ui/problem-details-dialog.ui:12
+msgid "Details"
+msgstr "詳細"
+
 #. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
 #. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
 #. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
@@ -1821,19 +1840,24 @@ msgstr[0] "%d 件の結果"
 msgid "%s — New Messages"
 msgstr "%s — 新着メッセージ"
 
-#: src/client/notification/libnotify.vala:75
+#. / Notification body text for new email when no other
+#. / new messages are already awaiting.
+#: src/client/notification/notification-desktop.vala:90
 #, c-format
 msgid "%d new message"
 msgid_plural "%d new messages"
 msgstr[0] "%d 件の新着メッセージ"
 
-#: src/client/notification/libnotify.vala:78
+#. / Notification body text for new email when
+#. / other new messages have already been notified
+#. / about
+#: src/client/notification/notification-desktop.vala:98
 #, c-format
 msgid "%s, %d new message total"
 msgid_plural "%s, %d new messages total"
 msgstr[0] "%s, 合計 %d 件の新着メッセージ"
 
-#: src/client/notification/libnotify.vala:110
+#: src/client/notification/notification-desktop.vala:130
 #, c-format
 msgid ""
 "%s\n"
@@ -1845,96 +1869,104 @@ msgstr[0] ""
 "%s\n"
 "(他に %d 件の新着メッセージ %s)"
 
-#: 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:69
 msgid "%l:%M %P"
 msgstr "%p %I:%M"
 
 #. / Datetime format for 24-hour time, i.e. 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:71
+#: src/client/util/util-date.vala:72
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. / Datetime format for the locale default, i.e. 8:31 am or 16:35,
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:74
-msgctxt "Default clock format"
-msgid "%l:%M %P"
-msgstr "%p %I:%M"
-
 #. / Date format for dates within the current year, i.e. Nov 8
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:78
+#: src/client/util/util-date.vala:79
 msgid "%b %-e"
 msgstr "%B%-e日"
 
-#. / Date format for dates within a different year, i.e. 02/04/10
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:83
-#, no-c-format
-msgid "%x"
-msgstr "%x"
-
 #. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:88
+#: src/client/util/util-date.vala:84
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%Y年%m月%d日, %p %I:%M"
 
 #. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:91
+#: src/client/util/util-date.vala:87
 msgid "%B %-e, %Y %-H:%M"
 msgstr "%Y年%m月%d日, %H:%M"
 
 #. / Verbose datetime format for the locale default (full month, day and time)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:94
+#: src/client/util/util-date.vala:90
 msgctxt "Default full date"
 msgid "%B %-e, %Y %-l:%M %P"
 msgstr "%Y年%m月%d日, %p %I:%M"
 
-#: src/client/util/util-date.vala:164
+#: src/client/util/util-date.vala:159
 msgid "Now"
 msgstr "今"
 
-#: src/client/util/util-date.vala:167
+#: src/client/util/util-date.vala:162
 #, c-format
 msgid "%dm ago"
 msgid_plural "%dm ago"
 msgstr[0] "%d分前"
 
-#: src/client/util/util-date.vala:171
+#: src/client/util/util-date.vala:166
 #, c-format
 msgid "%dh ago"
 msgid_plural "%dh ago"
 msgstr[0] "%d時間前"
 
-#: src/client/util/util-date.vala:178
+#: src/client/util/util-date.vala:173
 msgid "Yesterday"
 msgstr "昨日"
 
 #. / Date format that shows the weekday (Monday, Tuesday, ...)
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/client/util/util-date.vala:183
+#: src/client/util/util-date.vala:178
 #, c-format
 msgid "%A"
 msgstr "%A"
 
-#: src/client/util/util-email.vala:30 src/engine/rfc822/rfc822-message.vala:846
+#. / 12 hours format for datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:216
+#, fuzzy
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %l:%M %P"
+msgstr "%Y/%m/%d, %H:%M"
+
+#. / 24 hours format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:220
+#, fuzzy
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %H:%M"
+msgstr "%Y/%m/%d, %H:%M"
+
+#. / Format for the datetime that a message being replied to was received
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/client/util/util-date.vala:224
+#, fuzzy
+#| msgid "%a, %b %-e, %Y at %-l:%M %p"
+msgid "%a, %b %-e, %Y at %X"
+msgstr "%Y/%m/%d, %H:%M"
+
+#: src/client/util/util-email.vala:38 src/engine/rfc822/rfc822-message.vala:948
 msgid "(no subject)"
 msgstr "(件名なし)"
 
 #. Translators: This is shown for displaying a list of
 #. email recipients that happens to be empty,
 #. i.e. contains no email addresses.
-#: src/client/util/util-email.vala:49
+#: src/client/util/util-email.vala:116
 msgid "(No recipients)"
 msgstr "(受信者なし)"
 
@@ -1943,12 +1975,38 @@ msgstr "(受信者なし)"
 #. 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
+#: src/client/util/util-email.vala:130
 #, c-format
 msgid "%s and %d other"
 msgid_plural "%s and %d others"
 msgstr[0] "%s とその他 %d 人"
 
+#. / The quoted header for a message being replied to.
+#. / %1$s will be substituted for the date, and %2$s will be substituted for
+#. / the original sender.
+#: src/client/util/util-email.vala:160
+#, c-format
+msgid "On %1$s, %2$s wrote:"
+msgstr ""
+
+#. / The quoted header for a message being replied to (in case the date is not known).
+#. / %s will be replaced by the original sender.
+#: src/client/util/util-email.vala:167
+#, c-format
+msgid "%s wrote:"
+msgstr ""
+
+#. / The quoted header for a message being replied to (in case the sender is not known).
+#. / %s will be replaced by the original date
+#: src/client/util/util-email.vala:173
+#, c-format
+msgid "On %s:"
+msgstr ""
+
+#: src/client/util/util-email.vala:202
+msgid "---------- Forwarded message ----------"
+msgstr ""
+
 #: src/client/util/util-files.vala:16
 msgid "bytes"
 msgstr "バイト"
@@ -2026,7 +2084,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/search/imap-db-search-query.vala:73
 msgctxt "Search operator"
 msgid "attachment"
 msgstr ""
@@ -2039,7 +2097,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/search/imap-db-search-query.vala:82
 msgctxt "Search operator"
 msgid "bcc"
 msgstr ""
@@ -2051,7 +2109,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/search/imap-db-search-query.vala:90
 msgctxt "Search operator"
 msgid "body"
 msgstr ""
@@ -2064,7 +2122,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:151
+#: src/engine/imap-db/search/imap-db-search-query.vala:99
 msgctxt "Search operator"
 msgid "cc"
 msgstr ""
@@ -2077,7 +2135,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:160
+#: src/engine/imap-db/search/imap-db-search-query.vala:108
 msgctxt "Search operator"
 msgid "from"
 msgstr ""
@@ -2089,7 +2147,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:168
+#: src/engine/imap-db/search/imap-db-search-query.vala:116
 msgctxt "Search operator"
 msgid "is"
 msgstr ""
@@ -2101,7 +2159,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:176
+#: src/engine/imap-db/search/imap-db-search-query.vala:124
 msgctxt "Search operator"
 msgid "subject"
 msgstr ""
@@ -2114,7 +2172,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:185
+#: src/engine/imap-db/search/imap-db-search-query.vala:133
 msgctxt "Search operator"
 msgid "to"
 msgstr ""
@@ -2127,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:206
+#: src/engine/imap-db/search/imap-db-search-query.vala:154
 msgctxt "Search operator value - mail addressed to the user"
 msgid "me"
 msgstr ""
@@ -2139,7 +2197,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:218
+#: src/engine/imap-db/search/imap-db-search-query.vala:166
 msgctxt "Search operator value - mail sent by the user"
 msgid "me"
 msgstr ""
@@ -2151,7 +2209,7 @@ msgstr ""
 #. or similar to combine words into one), should be short, and
 #. also match the translation in "search.page" of the Geary User
 #. Guide.
-#: src/engine/imap-db/imap-db-account.vala:230
+#: src/engine/imap-db/search/imap-db-search-query.vala:178
 msgctxt "'is:' search operator value"
 msgid "read"
 msgstr ""
@@ -2164,7 +2222,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:241
+#: src/engine/imap-db/search/imap-db-search-query.vala:189
 msgctxt "'is:' search operator value"
 msgid "starred"
 msgstr ""
@@ -2176,7 +2234,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:251
+#: src/engine/imap-db/search/imap-db-search-query.vala:199
 msgctxt "'is:' search operator value"
 msgid "unread"
 msgstr ""
@@ -2185,7 +2243,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:935
+#: src/engine/imap-engine/imap-engine-generic-account.vala:953
 msgid "Drafts | Draft"
 msgstr "下書き"
 
@@ -2193,13 +2251,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:944
+#: src/engine/imap-engine/imap-engine-generic-account.vala:962
 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:949
+#: src/engine/imap-engine/imap-engine-generic-account.vala:967
 msgctxt "Outlook localised name"
 msgid "Sent Items"
 msgstr "送信したアイテム"
@@ -2208,7 +2266,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:959
+#: src/engine/imap-engine/imap-engine-generic-account.vala:977
 msgid ""
 "Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
 "| Bulk E-Mail"
@@ -2218,13 +2276,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:969
+#: src/engine/imap-engine/imap-engine-generic-account.vala:987
 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:974
+#: src/engine/imap-engine/imap-engine-generic-account.vala:992
 msgctxt "Outlook localised name"
 msgid "Deleted Items"
 msgstr "削除したアイテム"
@@ -2233,43 +2291,11 @@ 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:984
+#: src/engine/imap-engine/imap-engine-generic-account.vala:1002
 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
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%Y/%m/%d, %H:%M"
-
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: src/engine/rfc822/rfc822-utils.vala:242
-#, 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
-#, c-format
-msgid "%s wrote:"
-msgstr ""
-
-#. / The quoted header for a message being replied to (in case the sender is not known).
-#. / %s will be replaced by the original date
-#: src/engine/rfc822/rfc822-utils.vala:255
-#, c-format
-msgid "On %s:"
-msgstr ""
-
-#: src/engine/rfc822/rfc822-utils.vala:284
-msgid "---------- Forwarded message ----------"
-msgstr ""
-
-#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:127
+#: ui/accounts_editor_add_pane.ui:8 ui/accounts_editor_list_pane.ui:126
 msgid "Add an account"
 msgstr "アカウントを追加"
 
@@ -2323,11 +2349,11 @@ msgstr "Geary からこのアカウントを削除"
 msgid "Accounts"
 msgstr "アカウント"
 
-#: ui/accounts_editor_list_pane.ui:63
+#: ui/accounts_editor_list_pane.ui:62
 msgid "To get started, select an email provider below."
 msgstr "以下からメールプロバイダーを選択してください。"
 
-#: ui/accounts_editor_list_pane.ui:76
+#: ui/accounts_editor_list_pane.ui:75
 msgid "Welcome to Geary"
 msgstr "Geary へようこそ"
 
@@ -2349,10 +2375,6 @@ msgstr ""
 msgid "Remove account"
 msgstr "アカウントを削除"
 
-#: ui/accounts_editor_servers_pane.ui:17
-msgid "Cancel"
-msgstr "キャンセル"
-
 #: ui/accounts_editor_servers_pane.ui:47
 msgid "Apply"
 msgstr "適用"
@@ -2489,7 +2511,7 @@ msgstr "書式なしで貼り付け(_W)"
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:49
+#: ui/composer-menus.ui:127 ui/conversation-message-menus.ui:43
 msgid "_Inspect…"
 msgstr "検証(_I)…"
 
@@ -2583,6 +2605,120 @@ msgstr "選択部分の書式を削除(Ctrl+Space)"
 msgid "Select spell checking languages"
 msgstr "スペルチェックする言語を選択"
 
+#: ui/components-inspector-error-view.ui:33
+#, fuzzy
+#| msgid ""
+#| "If the problem is serious or persists, please copy and send these details "
+#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing "
+#| "list</a> or file a <a href=\"https://wiki.gnome.org/Apps/Geary/";
+#| "ReportingABug\">new bug report</a>."
+msgid ""
+"If the problem is serious or persists, please save and send these details to "
+"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
+"or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug";
+"\">new bug report</a>."
+msgstr ""
+"問題が深刻な場合や継続して発生している場合は、詳細をコピーして<a href="
+"\"https://wiki.gnome.org/Apps/Geary/Contact\";>メーリングリスト</a>に投稿する"
+"か、<a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>バグとして報"
+"告</a>してください。"
+
+#: ui/components-inspector-error-view.ui:49
+msgid "Details:"
+msgstr "詳細:"
+
+#: ui/components-inspector-log-view.ui:13
+msgid "Inspector opened"
+msgstr ""
+
+#: ui/components-inspector-log-view.ui:65
+msgid "column"
+msgstr ""
+
+#. Tooltip for inspector button
+#: ui/components-inspector.ui:20
+msgid "Toggle appending new log entries"
+msgstr ""
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
+#, fuzzy
+#| msgid "Search for more languages"
+msgid "Search for matching log entries"
+msgstr "言語を検索"
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:63 ui/problem-details-dialog.ui:46
+msgid "Save logs entries and details"
+msgstr ""
+
+#. Tooltip for inspector button
+#. Tooltip for problem report button
+#: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
+#, fuzzy
+#| msgid "Copy to Clipboard"
+msgid "Copy to clipboard"
+msgstr "クリップボードにコピー"
+
+#: ui/conversation-contact-popover.ui:146
+#, fuzzy
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
+msgid "New Conversation…"
+msgstr "スレッドを移動"
+
+#: ui/conversation-contact-popover.ui:159
+#, fuzzy
+#| msgid "Copy Email _Address"
+msgid "Copy Email Address"
+msgstr "メールアドレスをコピー(_A)"
+
+#: ui/conversation-contact-popover.ui:182
+#, fuzzy
+#| msgid "Save and Close"
+msgid "Save in Contacts…"
+msgstr "保存して閉じる"
+
+#: ui/conversation-contact-popover.ui:195
+#, fuzzy
+#| msgid "Move conversations"
+msgid "Show Conversations"
+msgstr "スレッドを移動"
+
+#: ui/conversation-contact-popover.ui:208
+msgid "Open in Contacts"
+msgstr ""
+
+#: ui/conversation-contact-popover.ui:221
+msgid "Always Load Remote Images"
+msgstr ""
+
+#. Title label on contact popover
+#: ui/conversation-contact-popover.ui:264
+#, fuzzy
+#| msgid "Invalid email address"
+msgid "Deceptive email address"
+msgstr "無効なメールアドレス"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:294
+#, fuzzy
+#| msgid "Email addresses"
+msgid "This email address is:"
+msgstr "メールアドレス"
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:319
+msgid "But was forged as:"
+msgstr ""
+
+#. Contact popover label
+#: ui/conversation-contact-popover.ui:344
+msgid "The sender may not be trustworthy"
+msgstr ""
+
 #: ui/conversation-email.ui:27
 msgid "Save all attachments"
 msgstr "すべての添付ファイルを保存"
@@ -2656,14 +2792,19 @@ msgid "Mark Unread From _Here"
 msgstr "ここから未読としてマーク(_H)"
 
 #. Translators: Menu item to move a single, specific message
-#. to the trash
+#. to the trash folder
 #: ui/conversation-email-menus.ui:50
-msgid "_Trash"
-msgstr "ごみ箱(_T)"
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move to trash"
+msgid "Move message to _Trash"
+msgstr "ごみ箱に移動する"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-msgid "_Delete…"
+#, fuzzy
+#| msgid "_Delete…"
+msgid "_Delete message…"
 msgstr "削除(_D)…"
 
 #. Translators: Menu item to view the source for a message
@@ -2684,8 +2825,11 @@ msgid "Copy Link _Address"
 msgstr "リンクのアドレスをコピー(_A)"
 
 #: ui/conversation-message-menus.ui:17
-msgid "Send New _Message…"
-msgstr "新規メッセージを送信(_M)…"
+#, fuzzy
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
+msgid "_New Conversation…"
+msgstr "スレッドを移動"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2699,68 +2843,64 @@ msgstr "画像に名前を付けて保存(_I)…"
 msgid "_Select All"
 msgstr "すべて選択(_S)"
 
-#: ui/conversation-message-menus.ui:43
-msgid "Search for messages from"
-msgstr "この差出人からのメッセージを検索"
-
-#: ui/conversation-message.ui:64
+#: ui/conversation-message.ui:63
 msgid "From <email>"
 msgstr "差出人 <email>"
 
-#: ui/conversation-message.ui:80 ui/conversation-message.ui:179
+#: ui/conversation-message.ui:79 ui/conversation-message.ui:178
 msgid "1/1/1970\t"
 msgstr ""
 
-#: ui/conversation-message.ui:103
+#: ui/conversation-message.ui:102
 msgid "Preview body text."
 msgstr "本文をプレビューします。"
 
-#: ui/conversation-message.ui:203
+#: ui/conversation-message.ui:202
 msgid "Sent by:"
 msgstr "送信者:"
 
-#: ui/conversation-message.ui:248
+#: ui/conversation-message.ui:247
 msgid "Reply to:"
 msgstr "返信:"
 
-#: ui/conversation-message.ui:292
+#: ui/conversation-message.ui:291
 msgid "Subject"
 msgstr "件名"
 
-#: ui/conversation-message.ui:502
+#: ui/conversation-message.ui:501
 msgid "Show Images"
 msgstr "画像を表示"
 
-#: ui/conversation-message.ui:515
+#: ui/conversation-message.ui:514
 msgid "Always Show From Sender"
 msgstr "この送信者のものは常に表示"
 
-#: ui/conversation-message.ui:543
+#: ui/conversation-message.ui:542
 msgid "Remote images not shown"
 msgstr "リモート画像は表示しません"
 
-#: ui/conversation-message.ui:560
+#: ui/conversation-message.ui:559
 msgid "Only show remote images from senders you trust."
 msgstr "信頼できる送信者のリモート画像のみ表示するようにしてください。"
 
-#: ui/conversation-message.ui:693
+#: ui/conversation-message.ui:692
 msgid "But actually goes to:"
 msgstr "実際の行き先:"
 
-#: ui/conversation-message.ui:724
+#: ui/conversation-message.ui:723
 msgid "The link appears to go to:"
 msgstr "リンクの表示上の行き先:"
 
-#: ui/conversation-message.ui:736
+#: ui/conversation-message.ui:735
 msgid "Deceptive link found"
 msgstr "虚偽リンクが見つかりました"
 
-#: ui/conversation-message.ui:751
+#: ui/conversation-message.ui:750
 msgid "The email sender may be leading you to the wrong web site."
 msgstr ""
 "このメールの送信者は不適切なウェブサイトに誘導している可能性があります。"
 
-#: ui/conversation-message.ui:764
+#: ui/conversation-message.ui:763
 msgid "If unsure, contact the sender and ask before continuing."
 msgstr "不明な場合は、続行する前に送信者に連絡して確認してください。"
 
@@ -2768,11 +2908,11 @@ msgstr "不明な場合は、続行する前に送信者に連絡して確認し
 msgid "Find in conversation"
 msgstr "スレッド内を検索"
 
-#: ui/conversation-viewer.ui:74
+#: ui/conversation-viewer.ui:75
 msgid "Find the previous occurrence of the search string."
 msgstr "検索文字列が前に出現した場所を見つけます。"
 
-#: ui/conversation-viewer.ui:95
+#: ui/conversation-viewer.ui:96
 msgid "Find the next occurrence of the search string."
 msgstr "検索文字列が次に出現する場所を見つけます。"
 
@@ -2800,261 +2940,380 @@ msgstr "ラベル"
 msgid "Conversation Shortcuts"
 msgstr "スレッドのショートカット"
 
-#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:254
+#: ui/gtk/help-overlay.ui:13 ui/gtk/help-overlay.ui:347
 msgctxt "shortcut window"
-msgid "General"
-msgstr "全般"
+msgid "Actions"
+msgstr "アクション"
 
 #: ui/gtk/help-overlay.ui:17
+#, fuzzy
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
 msgctxt "shortcut window"
-msgid "Move focus to the next/previous pane"
-msgstr "フォーカスを次/前のペインに移動する"
+msgid "New conversation"
+msgstr "スレッドを移動"
 
 #: ui/gtk/help-overlay.ui:24
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Reply to sender "
 msgctxt "shortcut window"
-msgid "Move focus to conversation list"
-msgstr "スレッドリストにフォーカスを移動する"
+msgid "Reply to sender"
+msgstr "送信者に返信する "
 
-#: ui/gtk/help-overlay.ui:31
+#: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
 msgctxt "shortcut window"
-msgid "Detach composer window"
-msgstr "作成ウィンドウを分離する"
+msgid "Reply to all"
+msgstr "全員に返信する"
 
-#: ui/gtk/help-overlay.ui:38
+#: ui/gtk/help-overlay.ui:38 ui/gtk/help-overlay.ui:289
 msgctxt "shortcut window"
-msgid "Close composer window"
-msgstr "作成ウィンドウを閉じる"
+msgid "Forward"
+msgstr "転送する"
 
-#: ui/gtk/help-overlay.ui:45
+#: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Mark read"
 msgctxt "shortcut window"
-msgid "Show keyboard shortcuts"
-msgstr "キーボードショートカットを表示する"
+msgid "Un-mark/mark read"
+msgstr "既読としてマークする"
 
-#: ui/gtk/help-overlay.ui:52
+#: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
 msgctxt "shortcut window"
-msgid "Show help"
-msgstr "ヘルプを表示する"
+msgid "Mark/un-mark starred"
+msgstr ""
 
-#: ui/gtk/help-overlay.ui:59
+#: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
+#, fuzzy
+#| msgid "Archive conversation (A)"
+#| msgid_plural "Archive conversations (A)"
 msgctxt "shortcut window"
-msgid "Quit the application"
-msgstr "アプリケーションを終了する"
+msgid "Archive conversation"
+msgstr "スレッドをアーカイブに移動(A)"
+
+#: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
+#, fuzzy
+#| msgid "Move conversation"
+#| msgid_plural "Move conversations"
+msgctxt "shortcut window"
+msgid "Move conversation"
+msgstr "スレッドを移動"
+
+#: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Label the conversation"
+msgctxt "shortcut window"
+msgid "Label conversation"
+msgstr "スレッドにラベルを付ける"
+
+#: ui/gtk/help-overlay.ui:80
+#, fuzzy
+#| msgid "Mark conversation"
+#| msgid_plural "Mark conversations"
+msgctxt "shortcut window"
+msgid "Trash conversation"
+msgstr "スレッドをマーク"
+
+#: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move to trash"
+msgctxt "shortcut window"
+msgid "Move to Spam"
+msgstr "ごみ箱に移動する"
 
-#: ui/gtk/help-overlay.ui:68
+#: ui/gtk/help-overlay.ui:95
+#, fuzzy
+#| msgid "Delete conversation"
+msgctxt "shortcut window"
+msgid "Delete conversation"
+msgstr "スレッドを削除"
+
+#: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "検索"
 
-#: ui/gtk/help-overlay.ui:72
+#: ui/gtk/help-overlay.ui:108
+#, fuzzy
+#| msgid "Mark conversations"
 msgctxt "shortcut window"
-msgid "Jump to search box"
-msgstr "検索ボックスに移動する"
+msgid "Search for conversations"
+msgstr "スレッドをマーク"
 
-#: ui/gtk/help-overlay.ui:79
+#: ui/gtk/help-overlay.ui:115
 msgctxt "shortcut window"
 msgid "Find in current conversation"
 msgstr "現在のスレッド内を検索する"
 
-#: ui/gtk/help-overlay.ui:86
+#: ui/gtk/help-overlay.ui:141
+#, fuzzy
+#| msgid "Undo"
 msgctxt "shortcut window"
-msgid "Find next/previous in current conversation"
-msgstr "現在のスレッド内で次/前を検索する"
+msgid "Undo"
+msgstr "元に戻す"
 
-#: ui/gtk/help-overlay.ui:95 ui/gtk/help-overlay.ui:274
+#: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
-msgid "Actions"
-msgstr "アクション"
+msgid "Undo the last action"
+msgstr ""
 
-#: ui/gtk/help-overlay.ui:99
+#: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
-msgid "Compose a new message"
-msgstr "新規メッセージを作成する"
+msgid "Redo the last action"
+msgstr ""
 
-#: ui/gtk/help-overlay.ui:106
+#: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
-msgid "Reply to sender "
-msgstr "送信者に返信する "
+msgid "View"
+msgstr "表示"
 
-#: ui/gtk/help-overlay.ui:113
+#: ui/gtk/help-overlay.ui:165
 msgctxt "shortcut window"
-msgid "Reply to all"
-msgstr "全員に返信する"
+msgid "Zoom in"
+msgstr "拡大する"
 
-#: ui/gtk/help-overlay.ui:120
+#: ui/gtk/help-overlay.ui:172
 msgctxt "shortcut window"
-msgid "Forward"
-msgstr "転送する"
+msgid "Zoom out"
+msgstr "縮小する"
 
-#: ui/gtk/help-overlay.ui:127
+#: ui/gtk/help-overlay.ui:179
 msgctxt "shortcut window"
-msgid "Archive"
-msgstr "アーカイブに移動する"
+msgid "Reset zoom"
+msgstr "拡大/縮小をリセットする"
 
-#: ui/gtk/help-overlay.ui:134
+#: ui/gtk/help-overlay.ui:188 ui/gtk/help-overlay.ui:367
 msgctxt "shortcut window"
-msgid "Move to trash"
-msgstr "ごみ箱に移動する"
+msgid "General"
+msgstr "全般"
 
-#: ui/gtk/help-overlay.ui:141
+#: ui/gtk/help-overlay.ui:192
 msgctxt "shortcut window"
-msgid "Toggle spam"
-msgstr "迷惑メールに指定/解除する"
+msgid "Show help"
+msgstr "ヘルプを表示する"
 
-#: ui/gtk/help-overlay.ui:148
+#: ui/gtk/help-overlay.ui:199
 msgctxt "shortcut window"
-msgid "Move the conversation"
-msgstr "スレッドを移動する"
+msgid "Show keyboard shortcuts"
+msgstr "キーボードショートカットを表示する"
 
-#: ui/gtk/help-overlay.ui:155
+#: ui/gtk/help-overlay.ui:206
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Close composer window"
 msgctxt "shortcut window"
-msgid "Label the conversation"
-msgstr "スレッドにラベルを付ける"
+msgid "Close current window"
+msgstr "作成ウィンドウを閉じる"
 
-#: ui/gtk/help-overlay.ui:163
+#: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
-msgid "Mark read"
-msgstr "既読としてマークする"
+msgid "Quit the application"
+msgstr "アプリケーションを終了する"
 
-#: ui/gtk/help-overlay.ui:170
+#: ui/gtk/help-overlay.ui:222
 msgctxt "shortcut window"
-msgid "Mark unread"
-msgstr "未読としてマークする"
+msgid "Keyboard navigation"
+msgstr ""
 
-#: ui/gtk/help-overlay.ui:179
+#: ui/gtk/help-overlay.ui:226
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "View"
-msgstr "表示"
+msgid "Focus the next pane"
+msgstr "フォーカスを次/前のペインに移動する"
 
-#: ui/gtk/help-overlay.ui:183
+#: ui/gtk/help-overlay.ui:233
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Zoom in"
-msgstr "拡大する"
+msgid "Focus the previous pane"
+msgstr "フォーカスを次/前のペインに移動する"
 
-#: ui/gtk/help-overlay.ui:190
+#: ui/gtk/help-overlay.ui:240
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to conversation list"
 msgctxt "shortcut window"
-msgid "Zoom out"
-msgstr "縮小する"
+msgid "Focus the conversation list"
+msgstr "スレッドリストにフォーカスを移動する"
 
-#: ui/gtk/help-overlay.ui:197
+#: ui/gtk/help-overlay.ui:247
+#, fuzzy
+#| msgid "Delete conversation"
 msgctxt "shortcut window"
-msgid "Reset zoom"
-msgstr "拡大/縮小をリセットする"
+msgid "Select the conversation down"
+msgstr "スレッドを削除"
 
-#: ui/gtk/help-overlay.ui:206
+#: ui/gtk/help-overlay.ui:254
+#, fuzzy
+#| msgid "Delete conversation"
 msgctxt "shortcut window"
-msgid "Additional Shortcuts"
-msgstr "その他のショートカット"
+msgid "Select the conversation up"
+msgstr "スレッドを削除"
 
-#: ui/gtk/help-overlay.ui:210
+#: ui/gtk/help-overlay.ui:261
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
-msgid "Star"
-msgstr "星を付ける"
+msgid "Focus next/previous message"
+msgstr "フォーカスを次/前のペインに移動する"
 
-#: ui/gtk/help-overlay.ui:217
+#: ui/gtk/help-overlay.ui:271
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Show keyboard shortcuts"
 msgctxt "shortcut window"
-msgid "Unstar"
-msgstr "星を外す"
+msgid "Single-key shortcuts"
+msgstr "キーボードショートカットを表示する"
 
-#: ui/gtk/help-overlay.ui:224
+#: ui/gtk/help-overlay.ui:275
 msgctxt "shortcut window"
-msgid "Delete"
-msgstr "削除する"
+msgid "Reply to sender "
+msgstr "送信者に返信する "
 
-#: ui/gtk/help-overlay.ui:231
+#: ui/gtk/help-overlay.ui:343
+msgid "Composer Shortcuts"
+msgstr "作成画面のショートカット"
+
+#: ui/gtk/help-overlay.ui:351
 msgctxt "shortcut window"
-msgid "Jump to next (older) conversation"
-msgstr "古いスレッドに移動する"
+msgid "Send"
+msgstr "送信する"
 
-#: ui/gtk/help-overlay.ui:238
+#: ui/gtk/help-overlay.ui:358
 msgctxt "shortcut window"
-msgid "Jump to previous (newer) conversation"
-msgstr "新しいスレッドに移動する"
+msgid "Add attachment"
+msgstr "添付ファイルを追加する"
 
-#: ui/gtk/help-overlay.ui:250
-msgid "Composer Shortcuts"
-msgstr "作成画面のショートカット"
+#: ui/gtk/help-overlay.ui:371
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr "作成ウィンドウを閉じる"
+
+#: ui/gtk/help-overlay.ui:378
+msgctxt "shortcut window"
+msgid "Detach composer window"
+msgstr "作成ウィンドウを分離する"
+
+#: ui/gtk/help-overlay.ui:385
+#, fuzzy
+#| msgid "Edit"
+msgctxt "shortcut window"
+msgid "Editing"
+msgstr "編集"
+
+#: ui/gtk/help-overlay.ui:390
+msgctxt "shortcut window"
+msgid "Move selection to the clipboard"
+msgstr ""
+
+#: ui/gtk/help-overlay.ui:397
+#, fuzzy
+#| msgid "Copy to Clipboard"
+msgctxt "shortcut window"
+msgid "Copy selection to clipboard"
+msgstr "クリップボードにコピー"
 
-#: ui/gtk/help-overlay.ui:258
+#: ui/gtk/help-overlay.ui:404
+msgctxt "shortcut window"
+msgid "Paste from the clipboard"
+msgstr ""
+
+#: ui/gtk/help-overlay.ui:411
 msgctxt "shortcut window"
 msgid "Quote text"
 msgstr "テキストを引用する"
 
-#: ui/gtk/help-overlay.ui:265
+#: ui/gtk/help-overlay.ui:418
 msgctxt "shortcut window"
 msgid "Unquote text"
 msgstr "テキストの引用を解除する"
 
-#: ui/gtk/help-overlay.ui:278
-msgctxt "shortcut window"
-msgid "Send"
-msgstr "送信する"
-
-#: ui/gtk/help-overlay.ui:285
+#: ui/gtk/help-overlay.ui:427
+#, fuzzy
+#| msgctxt "shortcut window"
+#| msgid "Rich text mode"
 msgctxt "shortcut window"
-msgid "Add attachment"
-msgstr "添付ファイルを追加する"
+msgid "Rich text editing"
+msgstr "リッチテキストモード"
 
-#: ui/gtk/help-overlay.ui:294
+#: ui/gtk/help-overlay.ui:431
+#, fuzzy
+#| msgctxt "Clipboard paste as plain text"
+#| msgid "Paste _Without Formatting"
 msgctxt "shortcut window"
-msgid "Rich text mode"
-msgstr "リッチテキストモード"
+msgid "Paste without formatting"
+msgstr "書式なしで貼り付け(_W)"
 
-#: ui/gtk/help-overlay.ui:298
+#: ui/gtk/help-overlay.ui:438
 msgctxt "shortcut window"
 msgid "Bold text"
 msgstr "テキストを太字にする"
 
-#: ui/gtk/help-overlay.ui:305
+#: ui/gtk/help-overlay.ui:445
 msgctxt "shortcut window"
 msgid "Italicize text"
 msgstr "テキストを斜体にする"
 
-#: ui/gtk/help-overlay.ui:312
+#: ui/gtk/help-overlay.ui:452
 msgctxt "shortcut window"
 msgid "Underline text"
 msgstr "テキストに下線を引く"
 
-#: ui/gtk/help-overlay.ui:319
+#: ui/gtk/help-overlay.ui:459
 msgctxt "shortcut window"
 msgid "Strike text"
 msgstr "テキストに取り消し線を引く"
 
-#: ui/gtk/help-overlay.ui:326
-msgctxt "shortcut window"
-msgid "Insert a link"
-msgstr "リンクを挿入する"
-
-#: ui/gtk/help-overlay.ui:333
+#: ui/gtk/help-overlay.ui:466
 msgctxt "shortcut window"
 msgid "Remove formatting"
 msgstr "書式を削除する"
 
+#: ui/gtk/help-overlay.ui:473
+#, fuzzy
+#| msgid "Insert an image (Ctrl+G)"
+msgctxt "shortcut window"
+msgid "Insert an image"
+msgstr "画像を挿入(Ctrl+G)"
+
+#: ui/gtk/help-overlay.ui:480
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr "リンクを挿入する"
+
 #: ui/main-toolbar.ui:23
 msgctxt "tooltip"
 msgid "Compose Message"
 msgstr "メッセージを作成"
 
-#: ui/main-toolbar.ui:52
+#: ui/main-toolbar.ui:61
 msgid "Toggle search bar"
 msgstr "アカウント内を検索"
 
-#: ui/main-toolbar.ui:112
+#: ui/main-toolbar.ui:113
 msgid "Reply"
 msgstr "返信"
 
-#: ui/main-toolbar.ui:135
+#: ui/main-toolbar.ui:136
 msgid "Reply All"
 msgstr "全員に返信"
 
-#: ui/main-toolbar.ui:158
+#: ui/main-toolbar.ui:159
 msgid "Forward"
 msgstr "転送"
 
-#: ui/main-toolbar.ui:264
+#: ui/main-toolbar.ui:265
 msgid "Toggle find bar"
 msgstr "スレッド内を検索"
 
-#: ui/main-toolbar.ui:306
+#: ui/main-toolbar.ui:286
 msgid "_Archive"
 msgstr "アーカイブ(_A)"
 
@@ -3087,12 +3346,12 @@ msgid "_About Geary"
 msgstr "Geary について(_A)"
 
 #. Infobar title when one or more accounts are offline
-#: ui/main-window.ui:183
+#: ui/main-window.ui:185
 msgid "Working offline"
 msgstr "オフラインで作業中です"
 
 #. Label and tooltip for offline infobar
-#: ui/main-window.ui:197
+#: ui/main-window.ui:199
 msgid ""
 "Your computer does not appear to be connected to the Internet.\n"
 "You will not be able to send or receive email until it is re-connected."
@@ -3101,58 +3360,27 @@ msgstr ""
 "再接続するまでメールの送受信はできません。"
 
 #. Label and tooltip for offline infobar
-#: ui/main-window.ui:200
+#: ui/main-window.ui:202
 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
+#: ui/main-window.ui:249
 msgid "Check"
 msgstr "確認"
 
 #. Button tooltip for retrying TLS cert validation
-#: ui/main-window.ui:362
+#: ui/main-window.ui:253
 msgid "Check the security details for the connection"
 msgstr "接続のセキュリティに関する詳細を確認"
 
 #. Infobar title when one or more accounts have a TLS cert validation error
-#: ui/main-window.ui:391
+#: ui/main-window.ui:282
 msgid "Security problem"
 msgstr "セキュリティの問題"
 
 #. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:405
+#: ui/main-window.ui:296
 msgid ""
 "An account has reported an untrusted server.\n"
 "Please check the server configuration and try again."
@@ -3161,22 +3389,22 @@ msgstr ""
 "サーバー設定を確認して再試行してください。"
 
 #. Label and tooltip for TLS cert validation error infobar
-#: ui/main-window.ui:408
+#: ui/main-window.ui:299
 msgid "An account has reported an untrusted server."
 msgstr "信頼できないサーバーです。"
 
 #. Button tooltip for retrying when a login error has occurred
-#: ui/main-window.ui:459
+#: ui/main-window.ui:350
 msgid "Retry login, you will be prompted for your password"
 msgstr "ログインの再試行にはパスワードが必要です"
 
 #. Infobar title when one or more accounts have a login error
-#: ui/main-window.ui:488
+#: ui/main-window.ui:379
 msgid "Login problem"
 msgstr "ログインの問題"
 
 #. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:502
+#: ui/main-window.ui:393
 msgid ""
 "An account has reported an incorrect login or password.\n"
 "Please check your login name and try again."
@@ -3185,7 +3413,7 @@ msgstr ""
 "ログイン名を確認して再試行してください。"
 
 #. Label and tooltip for authentication problem infobar
-#: ui/main-window.ui:505
+#: ui/main-window.ui:396
 msgid "An account has reported an incorrect login or password."
 msgstr "ログイン情報かパスワードが間違っています。"
 
@@ -3245,36 +3473,244 @@ msgstr "すべてのウィンドウを閉じても Geary の実行を続けま
 msgid "Preferences"
 msgstr "設定"
 
-#. Button label for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:17
-msgid "Copy to Clipboard"
-msgstr "クリップボードにコピー"
+#: ui/upgrade_dialog.glade:60
+msgid "Geary update in progress…"
+msgstr "Geary を更新しています…"
 
-#. Button tooltip for copying technical information to the clipboard
-#: ui/problem-details-dialog.ui:21
-msgid ""
-"Copy technical details to clipboard for pasting into an email or bug report"
-msgstr "バグ報告用の技術的な詳細情報をクリップボードにコピー"
+#~ msgid "mail-send"
+#~ msgstr "mail-send"
 
-#: ui/problem-details-dialog.ui:73
-msgid ""
-"If the problem is serious or persists, please copy and send these details to "
-"the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\";>mailing list</a> "
-"or file a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>new "
-"bug report</a>."
-msgstr ""
-"問題が深刻な場合や継続して発生している場合は、詳細をコピーして<a href="
-"\"https://wiki.gnome.org/Apps/Geary/Contact\";>メーリングリスト</a>に投稿する"
-"か、<a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\";>バグとして報"
-"告</a>してください。"
+#~ msgid "org.gnome.Geary"
+#~ msgstr "org.gnome.Geary"
 
-#: ui/problem-details-dialog.ui:89
-msgid "Details:"
-msgstr "詳細:"
+#~ msgid "List of the languages to use in the spell checker."
+#~ msgstr "スペルをチェックする言語の一覧です。"
 
-#: ui/upgrade_dialog.glade:60
-msgid "Geary update in progress…"
-msgstr "Geary を更新しています…"
+#~ msgid "Base URL to look up contact avatars"
+#~ msgstr "アバター画像検索用のベース URL"
+
+#~ msgid ""
+#~ "A Gravatar or Libravatar compatible URL, set to the empty string to "
+#~ "disable."
+#~ msgstr ""
+#~ "Gravatar または Libravatar 対応の URLです。無効にする場合は空にしてくださ"
+#~ "い。"
+
+#~ msgid "Save drafts on server"
+#~ msgstr "下書きをサーバーに保存"
+
+#~ msgid "Output debugging information"
+#~ msgstr "デバッグ情報を出力する"
+
+#~ msgid "Allow inspection of WebView"
+#~ msgstr "WebView での検証を有効にする"
+
+#~ msgid "Use %s to open a new composer window"
+#~ msgstr "%s を使って新規作成ウィンドウを開くことができます"
+
+#~ msgid "Please report comments, suggestions and bugs to:"
+#~ msgstr "コメント、提案、バグ報告はこちら:"
+
+#~ msgid "Failed to parse command line options: %s\n"
+#~ msgstr "不明なコマンドラインオプション: %s\n"
+
+#~ msgid "Undo move (Ctrl+Z)"
+#~ msgstr "移動を元に戻す(Ctrl+Z)"
+
+#~ msgid "Close the draft message?"
+#~ msgid_plural "Close all draft messages?"
+#~ msgstr[0] "下書きメッセージを閉じますか?"
+
+#~ msgid "Undo trash (Ctrl+Z)"
+#~ msgstr "ごみ箱から戻す(Ctrl+Z)"
+
+#~ msgid "Undo archive (Ctrl+Z)"
+#~ msgstr "アーカイブから戻す(Ctrl+Z)"
+
+#~ msgid "Undo (Ctrl+Z)"
+#~ msgstr "元に戻す(Ctrl+Z)"
+
+#~ msgid "Move conversation to Trash (Delete, Backspace)"
+#~ msgid_plural "Move conversations to Trash (Delete, Backspace)"
+#~ msgstr[0] "スレッドをごみ箱に移動(Delete, Backspace)"
+
+#~ msgid "Delete conversation (Shift+Delete)"
+#~ msgid_plural "Delete conversations (Shift+Delete)"
+#~ msgstr[0] "スレッドを削除(Shift+Delete)"
+
+#~ msgid "Problem connecting to incoming server for %s"
+#~ msgstr "%s の受信サーバーとの接続時に問題があります"
+
+#~ msgid ""
+#~ "Could not connect to %s, check your Internet access and the server name "
+#~ "and try again"
+#~ msgstr ""
+#~ "%s に接続できなかったため、インターネット接続とサーバー名を確認して再試行"
+#~ "してください"
+
+#~ msgid "Problem connecting to outgoing server for %s"
+#~ msgstr "%s の送信サーバーとの接続時に問題があります"
+
+#~ msgid "Problem communicating with incoming server for %s"
+#~ msgstr "%s の受信サーバーとの通信に問題があります"
+
+#~ msgid ""
+#~ "Network error talking to %s, check your Internet access and try again"
+#~ msgstr ""
+#~ "%s との接続でネットワークエラーが発生したため、インターネット接続を確認し"
+#~ "て再試行してください"
+
+#~ msgid "Problem communicating with outgoing mail server"
+#~ msgstr "送信メールサーバーとの通信に問題があります"
+
+#~ msgid ""
+#~ "Geary did not understand a message from %s or vice versa, please file a "
+#~ "bug report"
+#~ msgstr ""
+#~ "Geary か %s のどちらかがメッセージを理解できないバグに遭遇したため、可能で"
+#~ "したらバグ報告してください"
+
+#~ msgid ""
+#~ "Could not communicate with %s for %s, check the server name and try again "
+#~ "in a moment"
+#~ msgstr ""
+#~ "%2$s の %1$s と通信できなかったため、サーバー名を確認して後ほど再試行して"
+#~ "ください"
+
+#~ msgid "Incoming mail server password required for %s"
+#~ msgstr "%s の受信メールサーバーのパスワードが必要です"
+
+#~ msgid "Messages cannot be received without the correct password."
+#~ msgstr "正しいパスワードがないとメッセージを受信できません。"
+
+#~ msgid "Retry receiving email, you will be prompted for a password"
+#~ msgstr "メール受信の再試行にはパスワードが必要です"
+
+#~ msgid "Outgoing mail server password required for %s"
+#~ msgstr "%s の送信メールサーバーのパスワードが必要です"
+
+#~ msgid "Messages cannot be sent without the correct password."
+#~ msgstr "正しいパスワードがないとメッセージを送信できません。"
+
+#~ msgid "Retry sending queued messages, you will be prompted for a password"
+#~ msgstr "待機メッセージ送信の再試行にはパスワードが必要です"
+
+#~ msgid "Incoming mail server security is not trusted for %s"
+#~ msgstr "%s の受信メールサーバーのセキュリティを信頼していません"
+
+#~ msgid "Messages will not be received until checked."
+#~ msgstr "確認するまでメッセージを受信しません。"
+
+#~ msgid "Check security details"
+#~ msgstr "セキュリティの詳細を確認"
+
+#~ msgid "Outgoing mail server security is not trusted for %s"
+#~ msgstr "%s の送信メールサーバーのセキュリティを信頼していません"
+
+#~ msgid "Messages cannot be sent until checked."
+#~ msgstr "確認するまでメッセージを送信できません。"
+
+#~ msgid "A problem occurred checking mail for %s"
+#~ msgstr "%s のメール確認時に問題が発生しました"
+
+#~ msgid ""
+#~ "Something went wrong, please file a bug report if the problem persists"
+#~ msgstr ""
+#~ "何らかの不具合が発生しているため、問題が解決しない場合はバグ報告してくださ"
+#~ "い"
+
+#~ msgid "A database problem has occurred"
+#~ msgstr "データベースに問題が発生しました"
+
+#~ msgid "Messages for %s must be downloaded again."
+#~ msgstr "%s のメッセージを再ダウンロードする必要があります。"
+
+#~ msgid "Open"
+#~ msgstr "開く"
+
+#~ msgctxt "Default clock format"
+#~ msgid "%l:%M %P"
+#~ msgstr "%p %I:%M"
+
+#~ msgid "%x"
+#~ msgstr "%x"
+
+#~ msgid "_Trash"
+#~ msgstr "ごみ箱(_T)"
+
+#~ msgid "Send New _Message…"
+#~ msgstr "新規メッセージを送信(_M)…"
+
+#~ msgid "Search for messages from"
+#~ msgstr "この差出人からのメッセージを検索"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to search box"
+#~ msgstr "検索ボックスに移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Find next/previous in current conversation"
+#~ msgstr "現在のスレッド内で次/前を検索する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Compose a new message"
+#~ msgstr "新規メッセージを作成する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Archive"
+#~ msgstr "アーカイブに移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Toggle spam"
+#~ msgstr "迷惑メールに指定/解除する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Move the conversation"
+#~ msgstr "スレッドを移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Mark unread"
+#~ msgstr "未読としてマークする"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Additional Shortcuts"
+#~ msgstr "その他のショートカット"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Star"
+#~ msgstr "星を付ける"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Unstar"
+#~ msgstr "星を外す"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Delete"
+#~ msgstr "削除する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to next (older) conversation"
+#~ msgstr "古いスレッドに移動する"
+
+#~ msgctxt "shortcut window"
+#~ msgid "Jump to previous (newer) conversation"
+#~ msgstr "新しいスレッドに移動する"
+
+#~ msgid "Retry"
+#~ msgstr "再試行"
+
+#~ msgid ""
+#~ "Geary encountered a problem connecting to an account.\n"
+#~ "Please check your Internet connection, the server configuration and try "
+#~ "again."
+#~ msgstr ""
+#~ "アカウントへの接続時に問題が発生しました。\n"
+#~ "インターネット接続やサーバー設定を確認して再試行してください。"
+
+#~ msgid ""
+#~ "Copy technical details to clipboard for pasting into an email or bug "
+#~ "report"
+#~ msgstr "バグ報告用の技術的な詳細情報をクリップボードにコピー"
 
 #~ msgid "A_ccounts"
 #~ msgstr "アカウント(_C)"
@@ -3291,15 +3727,9 @@ msgstr "Geary を更新しています…"
 #~ msgid "Archive conversations (A)"
 #~ msgstr "スレッドをアーカイブに移動(A)"
 
-#~ msgid "Mark conversations"
-#~ msgstr "スレッドをマーク"
-
 #~ msgid "Add label to conversations"
 #~ msgstr "スレッドにラベル付け"
 
-#~ msgid "Move conversations"
-#~ msgstr "スレッドを移動"
-
 #~ msgid "Retry connecting now"
 #~ msgstr "今すぐ接続を再試行"
 
@@ -3351,9 +3781,6 @@ msgstr "Geary を更新しています…"
 #~ msgid "Enter your account information to get started."
 #~ msgstr "アカウント情報を入力してください"
 
-#~ msgid "Edit"
-#~ msgstr "編集"
-
 #~ msgid "Preview"
 #~ msgstr "プレビュー"
 
@@ -3679,8 +4106,5 @@ msgstr "Geary を更新しています…"
 #~ msgid "_Right"
 #~ msgstr "右揃え(_R)"
 
-#~ msgid "_Save As..."
-#~ msgstr "名前を付けて保存(_S)..."
-
 #~ msgid "none"
 #~ msgstr "無題"


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