[geary/geary-0.12] Update Japanese translation



commit 0abf7905869bc257f598e6a5aa8ef9fcf0267e41
Author: Ryuta Fujii <translation sicklylife jp>
Date:   Fri Feb 1 17:47:24 2019 +0000

    Update Japanese translation

 po/ja.po | 3560 +++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 2480 insertions(+), 1080 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index b16c361f..2d89f38a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,9 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
-"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
-"POT-Creation-Date: 2013-09-20 12:16-0700\n"
-"PO-Revision-Date: 2013-09-20 19:28+0000\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=geary&keywords=I18N+L10N&component=internationalization\n"
+"POT-Creation-Date: 2017-11-16 05:25+0000\n"
+"PO-Revision-Date: 2019-02-02 02:40+0900\n"
 "Last-Translator: yorbajim <jim yorba org>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/geary/";
 "language/ja_JP/)\n"
@@ -21,1489 +22,2888 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../src/client/accounts/add-edit-page.vala:641
-msgid "        &#8226; Connection error.\n"
-msgstr "        &#8226; 接続エラー\n"
+#. Translators: The application name
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:2
+#: ../desktop/org.gnome.Geary.desktop.in.h:1
+#: ../desktop/geary-autostart.desktop.in.h:1
+#, fuzzy
+#| msgid "Geary Mail"
+msgid "Geary"
+msgstr "Geary Mail"
 
-#: ../../src/client/accounts/add-edit-page.vala:624
-msgid "        &#8226; Email address already added to Geary.\n"
+#. Translators: The development team's name
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:4
+msgid "Geary Development Team"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:628
-msgid "        &#8226; IMAP connection error.\n"
-msgstr "        &#8226; IMAP 接続エラー\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:631
-msgid "        &#8226; IMAP username or password incorrect.\n"
-msgstr "        &#8226; IMAP ユーザー名もしくはパスワードが不正\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:621
-msgid "        &#8226; Invalid account nickname.\n"
-msgstr "        &#8226; アカウントのニックネームが不正\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:634
-msgid "        &#8226; SMTP connection error.\n"
-msgstr "        &#8226; SMTP 接続エラー\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:637
-msgid "        &#8226; SMTP username or password incorrect.\n"
-msgstr "        &#8226; SMTP ユーザー名もしくはパスワードが不正\n"
-
-#: ../../src/client/accounts/add-edit-page.vala:645
-msgid "        &#8226; Username or password incorrect.\n"
-msgstr "        &#8226; ユーザー名もしくはパスワードが不正\n"
+#. Translators: The application's summary / tagline
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:6
+#: ../desktop/org.gnome.Geary.desktop.in.h:4
+#: ../desktop/geary-autostart.desktop.in.h:4
+#: ../src/client/application/geary-application.vala:21
+msgid "Send and receive email"
+msgstr "送受信"
 
-#: ../../src/client/views/conversation-viewer.vala:1203
-msgid " (Invalid?)"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:7
+msgid ""
+"Geary is an email application built around conversations, for the GNOME 3 "
+"desktop. It allows you to read, find and send email with a straightforward, "
+"modern interface."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:972
-#, c-format
-msgid "\"%s\" already attached for delivery."
-msgstr "\"%s\" は既に添付されています"
-
-#: ../../src/client/composer/composer-window.vala:937
-#, c-format
-msgid "\"%s\" could not be found."
-msgstr "\"%s\" は見つかりませんでした"
-
-#: ../../src/client/composer/composer-window.vala:965
-#, c-format
-msgid "\"%s\" could not be opened for reading."
-msgstr "\"%s\" を開くことができませんでした"
-
-#: ../../src/client/composer/composer-window.vala:944
-#, c-format
-msgid "\"%s\" is a folder."
-msgstr "\"%s\" はフォルダーです"
-
-#: ../../src/client/composer/composer-window.vala:951
-#, c-format
-msgid "\"%s\" is an empty file."
-msgstr "\"%s\" は空ファイルです"
-
-#. / 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:182
-#, c-format
-msgid "%A"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:8
+msgid ""
+"Conversations allow you to read a complete discussion without having to find "
+"and click from message to message."
 msgstr ""
 
-#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:91
-msgid "%B %-e, %Y %-H:%M"
-msgstr "%Y年 %B %-e日, %-H:%M"
-
-#. / Verbose datetime format for 12-hour time, i.e. November 8, 2010 8:42 am
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:88
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%Y年 %B %-e日, %-l:%M %P"
-
-#. / Verbose datetime format for the locale default (full month, day and time)
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:94
-msgctxt "Default full date"
-msgid "%B %-e, %Y %-l:%M %P"
-msgstr "%Y年 %B %-e日, %-l:%M %P"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:9
+msgid "Geary’s features include:"
+msgstr ""
 
-#. / Datetime format for 24-hour time, i.e. 16:35
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:71
-msgid "%H:%M"
-msgstr "%H:%M"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:10
+msgid "Quick email account setup"
+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:165
-msgid "%a, %b %-e, %Y at %-l:%M %p"
-msgstr "%Y %b %-e日 (%a), %l:%M %p"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:11
+msgid "Shows related messages together in conversations"
+msgstr ""
 
-#. / Date format for dates within the current year, i.e. Nov 8
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../../src/client/util/util-date.vala:78
-msgid "%b %-e"
-msgstr "%b %-e日"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:12
+msgid "Fast, full text and keyword search"
+msgstr ""
 
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:30
-#, c-format
-msgid "%d message"
-msgid_plural "%d messages"
-msgstr[0] ""
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:13
+msgid "Full-featured HTML and plain text message composer"
+msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:72
-#, c-format
-msgid "%d new message"
-msgid_plural "%d new messages"
-msgstr[0] "%d 件の新着メッセージ"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:14
+#, fuzzy
+#| msgid "Show _notifications for new mail"
+msgid "Desktop notification of new mail"
+msgstr "新着メールに通知を表示(_N)"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:43
-#, c-format
-msgid "%d results"
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:15
+msgid "Compatible with GMail, Yahoo! Mail, Outlook.com and other IMAP servers"
 msgstr ""
 
-#. / Label displaying number of unread email messages in a folder
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:37
-#, c-format
-msgid "%d unread"
-msgid_plural "%d unread"
-msgstr[0] ""
+#. Translators: A screenshot description.
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:17
+#, fuzzy
+#| msgid "Mark conversation"
+msgid "Geary displaying a conversation"
+msgstr "スレッドをマーク"
 
-#: ../../src/client/util/util-date.vala:170
-#, c-format
-msgid "%dh ago"
+#. Translators: A screenshot description.
+#: ../desktop/org.gnome.Geary.appdata.xml.in.h:19
+msgid "Geary showing the rich text composer"
 msgstr ""
 
-#: ../../src/client/util/util-date.vala:167
-#, c-format
-msgid "%dm ago"
-msgstr ""
+#: ../desktop/org.gnome.Geary.desktop.in.h:2
+#: ../desktop/geary-autostart.desktop.in.h:2
+#, fuzzy
+#| msgid "Gmail"
+msgid "Email"
+msgstr "Gmail"
 
-#: ../../src/client/views/conversation-find-bar.vala:222
-#, c-format
-msgid "%i matches"
-msgstr ""
+#: ../desktop/org.gnome.Geary.desktop.in.h:3
+#, fuzzy
+#| msgid "Geary Mail"
+msgid "Geary Email"
+msgstr "Geary Mail"
 
-#: ../../src/client/views/conversation-find-bar.vala:224
-#, c-format
-msgid "%i matches (wrapped)"
+#. Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
+#: ../desktop/org.gnome.Geary.desktop.in.h:6
+msgid "Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;"
 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
-msgid "%l:%M %P"
-msgstr "%l:%M %P"
-
-#. / 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 "%l:%M %P"
+#: ../desktop/org.gnome.Geary.desktop.in.h:7 ../ui/gtk/menus.ui.h:1
+msgid "Compose Message"
+msgstr "メッセージを作成"
 
-#: ../../src/client/notification/libnotify.vala:107
-#, c-format
-msgid ""
-"%s\n"
-"(%d other new message for %s)"
-msgid_plural ""
-"%s\n"
-"(%d other new messages for %s)"
-msgstr[0] ""
+#: ../desktop/geary-autostart.desktop.in.h:3
+msgid "Geary Mail"
+msgstr "Geary Mail"
 
-#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
-#: ../../src/client/composer/composer-window.vala:981
-#, c-format
-msgid "%s (%s)"
+#: ../desktop/geary-autostart.desktop.in.h:5
+msgid "Email;E-mail;Mail;"
 msgstr ""
 
-#: ../../src/client/views/conversation-web-view.vala:289
-#, c-format
-msgid "%s - Conversation Inspector"
-msgstr "%s - スレッド検証"
+#: ../desktop/geary-attach.contract.in.h:1
+#, fuzzy
+#| msgid "Send and receive email"
+msgid "Send by email"
+msgstr "送受信"
 
-#: ../../src/client/notification/libmessagingmenu.vala:75
-#, c-format
-msgid "%s - New Messages"
-msgstr "%s - 新着メッセージ"
+#: ../desktop/geary-attach.contract.in.h:2
+msgid "Send files using Geary"
+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:178
-#, c-format
-msgid "%s wrote:"
-msgstr "%s wrote:"
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:31
+#: ../ui/conversation-email-menus.ui.h:10
+msgid "_Save"
+msgstr "保存(_S)"
 
-#: ../../src/client/notification/libnotify.vala:75
-#, c-format
-msgid "%s, %d new message total"
-msgid_plural "%s, %d new messages total"
-msgstr[0] ""
+#: ../src/client/accounts/account-dialog-add-edit-pane.vala:51
+#: ../src/client/components/stock.vala:22
+msgid "_Add"
+msgstr "追加(_A)"
 
-#. / This string represents the divider between two messages: "n messages" and "n unread",
-#. / shown in the folder list as a tooltip.  Please use your languages conventions for
-#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
-#: ../../src/client/folder-list/folder-list-folder-entry.vala:43
+#. reset/clear widgets
+#: ../src/client/accounts/account-dialog-edit-alternate-emails-pane.vala:120
 #, c-format
-msgid "%s, %s"
+msgid "Additional addresses for %s"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:246
-#, c-format
-msgid "%u conversations selected."
-msgstr "%u 件が選択されています"
+#. Sets min size.
+#: ../src/client/accounts/account-dialog.vala:21
+msgid "Accounts"
+msgstr "アカウント"
 
-#: ../../src/client/views/conversation-viewer.vala:743
-#, c-format
-msgid "%u read messages"
-msgstr "%u 件の既読メッセージ"
+#. Copyright 2016 Software Freedom Conservancy Inc.
+#. *
+#. * This software is licensed under the GNU Lesser General Public License
+#. * (version 2.1 or later).  See the COPYING file in this distribution.
+#.
+#. Page for adding or editing an account.
+#. / Placeholder text indicating that the user should type their first name and last name
+#: ../src/client/accounts/add-edit-page.vala:10
+msgid "First Last"
+msgstr ""
 
-#. / 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"
+#: ../src/client/accounts/add-edit-page.vala:235
+msgid "Welcome to Geary."
+msgstr "Geary へようこそ"
 
-#: ../../src/client/util/util-email.vala:30
-msgid "(no subject)"
-msgstr "(件名なし)"
+#: ../src/client/accounts/add-edit-page.vala:235
+msgid "Enter your account information to get started."
+msgstr "アカウント情報を入力してください"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:211
-msgid "---------- Forwarded message ----------"
-msgstr "---------- 転送されたメッセージ ----------"
+#: ../src/client/accounts/add-edit-page.vala:255
+msgid "2 weeks back"
+msgstr "2週間前"
 
-#: ../../src/client/accounts/add-edit-page.vala:211
+#. IDs are # of days
+#: ../src/client/accounts/add-edit-page.vala:256
 msgid "1 month back"
 msgstr "1ヶ月前"
 
-#: ../../src/client/accounts/add-edit-page.vala:214
-msgid "1 year back"
-msgstr "1年前"
-
-#: ../../src/client/accounts/add-edit-page.vala:210
-msgid "2 weeks back"
-msgstr "2週間前"
-
-#: ../../src/client/accounts/add-edit-page.vala:212
+#: ../src/client/accounts/add-edit-page.vala:257
 msgid "3 months back"
 msgstr "3ヶ月前"
 
-#: ../../src/client/accounts/add-edit-page.vala:213
+#: ../src/client/accounts/add-edit-page.vala:258
 msgid "6 months back"
 msgstr "6ヶ月前"
 
-#: ../../ui/remove_confirm.glade:43
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
-"account?</span> "
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">このアカウントを削除してもよろしいです"
-"か?</span> "
+#: ../src/client/accounts/add-edit-page.vala:259
+msgid "1 year back"
+msgstr "1年前"
 
-#: ../../ui/account_cannot_remove.glade:40
-msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+#: ../src/client/accounts/add-edit-page.vala:260
+#, fuzzy
+#| msgid "1 year back"
+msgid "2 years back"
+msgstr "1年前"
+
+#: ../src/client/accounts/add-edit-page.vala:261
+#, fuzzy
+#| msgid "1 year back"
+msgid "4 years back"
+msgstr "1年前"
+
+#. Separator
+#: ../src/client/accounts/add-edit-page.vala:263
+msgid "Everything"
+msgstr "すべて"
+
+#: ../src/client/accounts/add-edit-page.vala:283
+msgid "Edit"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">アカウントを削除できません</span>"
 
-#: ../../ui/account_cannot_remove.glade:56
-msgid ""
-"A composer window associated with this account is currently open. Send or "
-"discard the message and try again."
+#: ../src/client/accounts/add-edit-page.vala:285
+msgid "Preview"
 msgstr ""
-"アカウントと関連づけられた作成画面が既に開いています. メッセージを送信するか"
-"破棄してからもう一度試してください"
 
-#: ../../src/client/geary-controller.vala:1491
-#, c-format
-msgid "A file named \"%s\" already exists.  Do you want to replace it?"
-msgstr "\"%s\" は既に存在します. 上書きしますか?"
+#: ../src/client/accounts/add-edit-page.vala:751
+msgid "Remem_ber passwords"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:245
-msgid "A_ccounts"
-msgstr "アカウント(_C)"
+#: ../src/client/accounts/add-edit-page.vala:758 ../ui/login.glade.h:7
+msgid "Remem_ber password"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:1227
-#, c-format
-msgid "About %s"
-msgstr "%s について"
+#: ../src/client/accounts/add-edit-page.vala:792
+msgid "Unable to validate:\n"
+msgstr "検証できません: \n"
 
-#: ../../src/client/accounts/account-dialog.vala:21
-msgid "Accounts"
-msgstr "アカウント"
+#: ../src/client/accounts/add-edit-page.vala:794
+#, fuzzy
+#| msgid "        &#8226; Invalid account nickname.\n"
+msgid "        • Invalid account nickname.\n"
+msgstr "        &#8226; アカウントのニックネームが不正\n"
 
-#: ../../ui/account_list.glade:71
-msgid "Add account"
+#: ../src/client/accounts/add-edit-page.vala:797
+msgid "        • Email address already added to Geary.\n"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:304
-msgid "Add label"
-msgstr ""
+#: ../src/client/accounts/add-edit-page.vala:801
+#, fuzzy
+#| msgid "        &#8226; IMAP connection error.\n"
+msgid "        • IMAP connection error.\n"
+msgstr "        &#8226; IMAP 接続エラー\n"
 
-#: ../../src/client/geary-controller.vala:57
-msgid "Add label to conversation"
-msgstr "スレッドにラベルを付ける"
+#: ../src/client/accounts/add-edit-page.vala:804
+#, fuzzy
+#| msgid "        &#8226; IMAP username or password incorrect.\n"
+msgid "        • IMAP username or password incorrect.\n"
+msgstr "        &#8226; IMAP ユーザー名もしくはパスワードが不正\n"
 
-#: ../../src/client/geary-controller.vala:58
-msgid "Add label to conversations"
-msgstr "スレッドにラベルを付ける"
+#: ../src/client/accounts/add-edit-page.vala:807
+#, fuzzy
+#| msgid "        &#8226; SMTP connection error.\n"
+msgid "        • SMTP connection error.\n"
+msgstr "        &#8226; SMTP 接続エラー\n"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:39
-msgid "All Mail"
-msgstr "すべてのメール"
+#: ../src/client/accounts/add-edit-page.vala:810
+#, fuzzy
+#| msgid "        &#8226; SMTP username or password incorrect.\n"
+msgid "        • SMTP username or password incorrect.\n"
+msgstr "        &#8226; SMTP ユーザー名もしくはパスワードが不正\n"
 
-#: ../../ui/remove_confirm.glade:58
-msgid ""
-"All email associated with this account will be removed from your computer. "
-"This will not affect email on the server."
-msgstr ""
-"このアカウントに関連づけされた全てのメールは、コンピューターから削除されます."
-"これは、サーバー上のメールには影響を与えません."
+#: ../src/client/accounts/add-edit-page.vala:814
+#, fuzzy
+#| msgid "        &#8226; Connection error.\n"
+msgid "        • Connection error.\n"
+msgstr "        &#8226; 接続エラー\n"
 
-#: ../../src/client/geary-args.vala:24
-msgid "Allow inspection of WebView"
-msgstr "WebView での検証を有効にする"
+#: ../src/client/accounts/add-edit-page.vala:818
+#, fuzzy
+#| msgid "        &#8226; Username or password incorrect.\n"
+msgid "        • Username or password incorrect.\n"
+msgstr "        &#8226; ユーザー名もしくはパスワードが不正\n"
 
-#: ../../src/client/views/conversation-viewer.vala:509
-msgid "Always Show From Sender"
+#: ../src/client/application/geary-application.vala:22
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:54
-msgid "Archive"
+#: ../src/client/application/geary-application.vala:23
+msgid "Copyright 2016-2017 Geary Development Team."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:48
-msgid "Archive conversation (Delete, Backspace, A)"
-msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
-
-#: ../../src/client/geary-controller.vala:49
-msgid "Archive conversations (Delete, Backspace, A)"
-msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
+#: ../src/client/application/geary-application.vala:25
+#, fuzzy
+#| msgid "Visit the Yorba web site"
+msgid "Visit the Geary web site"
+msgstr "Yorba のウェブサイト"
 
-#: ../../src/client/geary-controller.vala:1477
+#: ../src/client/application/geary-application.vala:466
 #, c-format
-msgid "Are you sure you want to open \"%s\"?"
-msgstr "\"%s\" を開きますか?"
+msgid "About %s"
+msgstr "%s について"
 
-#: ../../src/client/geary-controller.vala:1478
-msgid ""
-"Attachments may cause damage to your system if opened.  Only open files from "
-"trusted sources."
+#. 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:470
+msgid "translator-credits"
+msgstr "Minato Kanzaki <pikadcolon gmail com>"
+
+#: ../src/client/application/geary-args.vala:10
+msgid "Start Geary with hidden main window"
 msgstr ""
-"添付ファイルはシステムにダメージを与える恐れがあります. 信頼できる送信元から"
-"のみ開くようにしてください."
 
-#: ../../src/client/views/conversation-viewer.vala:614
-msgid "Bcc:"
-msgstr "Bcc:"
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../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
+#, fuzzy, c-format
+#| msgid "Unrecognized command line option \"%s\"\n"
+msgid "Unrecognized command line option “%s”\n"
+msgstr "不明なオプション \"%s\"\n"
+
+#: ../src/client/application/geary-controller.vala:57
+#, fuzzy
+#| msgid "Move conversation"
+msgid "Delete conversation"
+msgstr "スレッドを移動"
+
+#: ../src/client/application/geary-controller.vala:58
+#, fuzzy
+#| msgid "Delete conversation (Delete, Backspace, A)"
+msgid "Delete conversation (Shift+Delete)"
+msgstr "スレッドを削除 (Delete, Backspace, A)"
+
+#: ../src/client/application/geary-controller.vala:59
+#, fuzzy
+#| msgid "Delete conversations (Delete, Backspace, A)"
+msgid "Delete conversations (Shift+Delete)"
+msgstr "スレッドを削除 (Delete, Backspace, A)"
+
+#. This refers to the action ("move email to the trash"), not the Trash folder itself
+#: ../src/client/application/geary-controller.vala:63
+#, fuzzy
+#| msgid "Archive conversations (Delete, Backspace, A)"
+msgid "Move conversation to Trash (Delete, Backspace)"
+msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
+
+#: ../src/client/application/geary-controller.vala:64
+#, fuzzy
+#| msgid "Archive conversations (Delete, Backspace, A)"
+msgid "Move conversations to Trash (Delete, Backspace)"
+msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
+
+#. This refers to the action ("archive an email"), not the Archive folder itself
+#: ../src/client/application/geary-controller.vala:68
+msgid "_Archive"
+msgstr "アーカイブ(_A)"
+
+#: ../src/client/application/geary-controller.vala:69
+#, fuzzy
+#| msgid "Move conversation"
+msgid "Archive conversation (A)"
+msgstr "スレッドを移動"
+
+#: ../src/client/application/geary-controller.vala:70
+#, fuzzy
+#| msgid "Move conversations"
+msgid "Archive conversations (A)"
+msgstr "スレッドを移動"
+
+#: ../src/client/application/geary-controller.vala:73
+msgid "Mark as S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:74
+msgid "Mark as not S_pam"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:76
+#: ../src/client/application/geary-controller.vala:448
+msgid "Mark conversation"
+msgstr "スレッドをマーク"
+
+#: ../src/client/application/geary-controller.vala:77
+msgid "Mark conversations"
+msgstr "スレッドをマーク"
+
+#: ../src/client/application/geary-controller.vala:78
+msgid "Add label to conversation"
+msgstr "スレッドにラベルを付ける"
+
+#: ../src/client/application/geary-controller.vala:79
+msgid "Add label to conversations"
+msgstr "スレッドにラベルを付ける"
+
+#: ../src/client/application/geary-controller.vala:80
+#: ../src/client/application/geary-controller.vala:487
+msgid "Move conversation"
+msgstr "スレッドを移動"
+
+#: ../src/client/application/geary-controller.vala:81
+msgid "Move conversations"
+msgstr "スレッドを移動"
+
+#: ../src/client/application/geary-controller.vala:450
+#, fuzzy
+#| msgid "_Mark as..."
+msgid "_Mark as…"
+msgstr "名前を付けてマーク(_M)"
+
+#: ../src/client/application/geary-controller.vala:456
+msgid "Mark as _Read"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:462
+msgid "Mark as _Unread"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:468
+msgid "_Star"
+msgstr "スター(_S)"
+
+#: ../src/client/application/geary-controller.vala:473
+msgid "U_nstar"
+msgstr "スターをはずす(_N)"
+
+#: ../src/client/application/geary-controller.vala:483
+msgid "Add label"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:484
+msgid "_Label"
+msgstr "ラベル(_L)"
+
+#: ../src/client/application/geary-controller.vala:488
+msgid "_Move"
+msgstr "移動(_M)"
+
+#: ../src/client/application/geary-controller.vala:492
+msgid "Compose new message (Ctrl+N, N)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:496
+#: ../ui/conversation-email-menus.ui.h:1
+msgid "_Reply"
+msgstr "返信(_R)"
+
+#: ../src/client/application/geary-controller.vala:497
+msgid "Reply (Ctrl+R, R)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:501
+msgid "R_eply All"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:502
+msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:507
+#: ../ui/conversation-email-menus.ui.h:3
+msgid "_Forward"
+msgstr "転送(_F)"
+
+#: ../src/client/application/geary-controller.vala:508
+msgid "Forward (Ctrl+L, F)"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:538
+msgid "Empty _Spam…"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:542
+msgid "Empty _Trash…"
+msgstr ""
+
+#. No callback is connected, since we bind the toggle button to the search bar visibility
+#: ../src/client/application/geary-controller.vala:574
+msgid "Toggle search bar"
+msgstr ""
+
+#. No callback is connected, since we bind the toggle button to the find bar visibility
+#: ../src/client/application/geary-controller.vala:579
+msgid "Toggle find bar"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:757
+msgid "Unable to store server trust exception"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:992
+msgid "Your settings are insecure"
+msgstr "設定がセキュアでありません"
+
+#: ../src/client/application/geary-controller.vala:993
+msgid ""
+"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
+"username and password could be read by another person on the network.  Are "
+"you sure you want to do this?"
+msgstr ""
+"IMAP/SMTP の通信に SSL/TLS が指定されていません. ユーザー名やパスワードはネッ"
+"トワーク上の他人に読み取られる可能性があります. よろしいですか?"
+
+#: ../src/client/application/geary-controller.vala:994
+msgid "Co_ntinue"
+msgstr "継続(_N)"
+
+#: ../src/client/application/geary-controller.vala:1041
+msgid "Error connecting to the server"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1042
+msgid ""
+"Geary encountered an error while connecting to the server.  Please try again "
+"in a few moments."
+msgstr ""
+
+#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
+#: ../src/client/application/geary-controller.vala:1079
+#: ../src/client/components/status-bar.vala:29
+msgid "Error sending email"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1080
+msgid ""
+"Geary encountered an error sending an email.  If the problem persists, "
+"please manually delete the email from your Outbox folder."
+msgstr ""
+
+#. Displayed in the space-limited status bar when a message fails to be uploaded
+#. to Sent Mail after being sent.
+#: ../src/client/application/geary-controller.vala:1084
+#: ../src/client/components/status-bar.vala:33
+msgid "Error saving sent mail"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1085
+msgid ""
+"Geary encountered an error saving a sent message to Sent Mail.  The message "
+"will stay in your Outbox folder until you delete it."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1154
+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:1166
+#, c-format
+msgid "Unable to open the database for %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1167
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to corruption of the database file in this directory:\n"
+"\n"
+"%s\n"
+"\n"
+"Geary can rebuild the database and re-synchronize with the server or exit.\n"
+"\n"
+"Rebuilding the database will destroy all local email and its attachments. "
+"<b>The mail on the your server will not be affected.</b>"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1169
+msgid "_Rebuild"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1169
+msgid "E_xit"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1178
+#, c-format
+msgid "Unable to rebuild database for “%s”"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1179
+#, c-format
+msgid ""
+"Error during rebuild:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. some other problem opening the account ... as with other flow path, can't run
+#. Geary today with an account in unopened state, so have to exit
+#: ../src/client/application/geary-controller.vala:1201
+#: ../src/client/application/geary-controller.vala:1211
+#: ../src/client/application/geary-controller.vala:1222
+#, c-format
+msgid "Unable to open local mailbox for %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1202
+#, c-format
+msgid ""
+"There was an error opening the local mail database for this account. This is "
+"possibly due to a file permissions problem.\n"
+"\n"
+"Please check that you have read/write permissions for all files in this "
+"directory:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1212
+msgid ""
+"The version number of the local mail database is formatted for a newer "
+"version of Geary. Unfortunately, the database cannot be “rolled back” to "
+"work with this version of Geary.\n"
+"\n"
+"Please install the latest version of Geary and try again."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:1223
+msgid ""
+"There was an error opening the local account. This is probably due to "
+"connectivity issues.\n"
+"\n"
+"Please check your network connection and restart Geary."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2008
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo move (Ctrl+Z)"
+msgstr "下線(Ctrl+U)"
+
+#: ../src/client/application/geary-controller.vala:2018
+#, fuzzy
+#| msgid "Are you sure you want to open \"%s\"?"
+msgid "Are you sure you want to open these attachments?"
+msgstr "\"%s\" を開きますか?"
+
+#: ../src/client/application/geary-controller.vala:2019
+msgid ""
+"Attachments may cause damage to your system if opened.  Only open files from "
+"trusted sources."
+msgstr ""
+"添付ファイルはシステムにダメージを与える恐れがあります. 信頼できる送信元から"
+"のみ開くようにしてください."
+
+#: ../src/client/application/geary-controller.vala:2020
+#, fuzzy
+#| msgid "Don't _ask me again"
+msgid "Don’t _ask me again"
+msgstr "次回から表示しない(_A)"
+
+#: ../src/client/application/geary-controller.vala:2130
+#, fuzzy, c-format
+#| msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgid "A file named “%s” already exists.  Do you want to replace it?"
+msgstr "\"%s\" は既に存在します. 上書きしますか?"
+
+#: ../src/client/application/geary-controller.vala:2132
+#, fuzzy, c-format
+#| msgid ""
+#| "The file already exists in \"%s\".  Replacing it will overwrite its "
+#| "contents."
+msgid ""
+"The file already exists in “%s”.  Replacing it will overwrite its contents."
+msgstr "\"%s\" は既に存在します. 上書きしますか?"
+
+#: ../src/client/application/geary-controller.vala:2135
+msgid "_Replace"
+msgstr "置換(_R)"
+
+#. Find out what to do with the inline composers.
+#. TODO: Remove this in favor of automatically saving drafts
+#: ../src/client/application/geary-controller.vala:2383
+msgid "Close open draft messages?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2505
+#, c-format
+msgid "Empty all email from your %s folder?"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2506
+msgid "This removes the email from Geary and your email server."
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2507
+#, fuzzy
+#| msgid "\"%s\" could not be found."
+msgid "This cannot be undone."
+msgstr "\"%s\" は見つかりませんでした"
+
+#: ../src/client/application/geary-controller.vala:2508
+#, c-format
+msgid "Empty %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2525
+#, c-format
+msgid "Error emptying %s"
+msgstr ""
+
+#: ../src/client/application/geary-controller.vala:2555
+#, fuzzy
+#| msgid "Do you want to discard the unsaved message?"
+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:2557
+#, fuzzy
+#| msgid "_Delete"
+msgid "Delete"
+msgstr "削除(_D)"
+
+#: ../src/client/application/geary-controller.vala:2589
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo archive (Ctrl+Z)"
+msgstr "下線(Ctrl+U)"
+
+#: ../src/client/application/geary-controller.vala:2604
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo trash (Ctrl+Z)"
+msgstr "下線(Ctrl+U)"
+
+#: ../src/client/application/geary-controller.vala:2658
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo (Ctrl+Z)"
+msgstr "下線(Ctrl+U)"
+
+#: ../src/client/application/geary-controller.vala:2789
+msgid "Failed to open default text editor."
+msgstr "テキストエディターの起動に失敗しました"
+
+#: ../src/client/components/main-window.vala:389
+#, c-format
+msgid "%s (%d)"
+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 ""
+
+#. Search entry.
+#: ../src/client/components/search-bar.vala:23
+msgid "Search all mail in account for keywords (Ctrl+S)"
+msgstr ""
+
+#: ../src/client/components/search-bar.vala:100
+#, c-format
+msgid "Indexing %s account"
+msgstr ""
+
+#: ../src/client/components/search-bar.vala:111
+#: ../src/client/folder-list/folder-list-search-branch.vala:39
+#, c-format
+msgid "Search %s account"
+msgstr ""
+
+#. / Displayed in the space-limited status bar while a message is in the process of being sent.
+#: ../src/client/components/status-bar.vala:26
+msgid "Sending…"
+msgstr ""
+
+#: ../src/client/components/stock.vala:18 ../ui/account_cannot_remove.glade.h:3
+msgid "_OK"
+msgstr ""
+
+#: ../src/client/components/stock.vala:19 ../ui/edit_alternate_emails.glade.h:3
+#: ../ui/password-dialog.glade.h:5 ../ui/remove_confirm.glade.h:5
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+#: ../src/client/components/stock.vala:21 ../ui/gtk/menus.ui.h:6
+msgid "_About"
+msgstr "このアプリケーションについて(_A)"
+
+#: ../src/client/components/stock.vala:23
+msgid "_Close"
+msgstr ""
+
+#: ../src/client/components/stock.vala:24
+msgid "_Discard"
+msgstr ""
+
+#: ../src/client/components/stock.vala:25 ../ui/gtk/menus.ui.h:5
+msgid "_Help"
+msgstr "ヘルプ(_H)"
+
+#: ../src/client/components/stock.vala:26 ../ui/conversation-email-menus.ui.h:9
+msgid "_Open"
+msgstr ""
+
+#: ../src/client/components/stock.vala:27 ../ui/gtk/menus.ui.h:3
+msgid "_Preferences"
+msgstr "設定(_P)"
+
+#: ../src/client/components/stock.vala:28 ../ui/conversation-email-menus.ui.h:7
+msgid "_Print…"
+msgstr ""
+
+#: ../src/client/components/stock.vala:29 ../ui/gtk/menus.ui.h:7
+msgid "_Quit"
+msgstr "終了(_Q)"
+
+#: ../src/client/components/stock.vala:30 ../ui/remove_confirm.glade.h:6
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../src/client/components/stock.vala:32
+msgid "_Keep"
+msgstr ""
+
+#: ../src/client/composer/composer-link-popover.vala:150
+msgid "Link URL is not correctly formatted, e.g. http://example.com";
+msgstr ""
+
+#: ../src/client/composer/composer-link-popover.vala:157
+msgid "Invalid link URL"
+msgstr ""
+
+#: ../src/client/composer/composer-link-popover.vala:157
+#, fuzzy
+#| msgid "Email address:"
+msgid "Invalid email address"
+msgstr "メールアドレス:"
+
+#: ../src/client/composer/composer-widget.vala:154
+msgid "Saved"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:155
+msgid "Saving"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:156
+msgid "Error saving"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:157
+msgid "Press Backspace to delete quote"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:158
+msgid "New Message"
+msgstr "新規メッセージ"
+
+#. Translators: This is list of keywords, separated by pipe ("|")
+#. characters, that suggest an attachment; since this is full-word
+#. checking, include all variants of each word.  No spaces are
+#. allowed.
+#: ../src/client/composer/composer-widget.vala:167
+msgid ""
+"attach|attaching|attaches|attachment|attachments|attached|enclose|enclosed|"
+"enclosing|encloses|enclosure|enclosures"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1122
+#: ../src/client/composer/composer-widget.vala:1141
+msgid "Do you want to discard this message?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1245
+msgid "Send message with an empty subject and body?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1247
+msgid "Send message with an empty subject?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1249
+msgid "Send message with an empty body?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1253
+msgid "Send message without an attachment?"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1515
+#, fuzzy, c-format
+#| msgid "\"%s\" already attached for delivery."
+msgid "“%s” already attached for delivery."
+msgstr "\"%s\" は既に添付されています"
+
+#. / In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
+#. Translators: The first argument will be a
+#. description of the document type, the second will
+#. be a human-friendly size string. For example:
+#. Document (100.9MB)
+#: ../src/client/composer/composer-widget.vala:1523
+#: ../src/client/conversation-viewer/conversation-email.vala:138
+#, c-format
+msgid "%s (%s)"
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1560
+#, fuzzy, c-format
+#| msgid "\"%s\" could not be found."
+msgid "“%s” could not be found."
+msgstr "\"%s\" は見つかりませんでした"
+
+#: ../src/client/composer/composer-widget.vala:1566
+#, fuzzy, c-format
+#| msgid "\"%s\" is a folder."
+msgid "“%s” is a folder."
+msgstr "\"%s\" はフォルダーです"
+
+#: ../src/client/composer/composer-widget.vala:1572
+#, fuzzy, c-format
+#| msgid "\"%s\" is an empty file."
+msgid "“%s” is an empty file."
+msgstr "\"%s\" は空ファイルです"
+
+#: ../src/client/composer/composer-widget.vala:1585
+#, fuzzy, c-format
+#| msgid "\"%s\" could not be opened for reading."
+msgid "“%s” could not be opened for reading."
+msgstr "\"%s\" を開くことができませんでした"
+
+#: ../src/client/composer/composer-widget.vala:1593
+msgid "Cannot add attachment"
+msgstr "添付できません"
+
+#: ../src/client/composer/composer-widget.vala:1645
+#, fuzzy
+#| msgid "To: %s\n"
+msgid "To: "
+msgstr "宛先: %s\n"
+
+#: ../src/client/composer/composer-widget.vala:1648
+msgid "Cc: "
+msgstr ""
+
+#: ../src/client/composer/composer-widget.vala:1651
+#, fuzzy
+#| msgid "Bcc:"
+msgid "Bcc: "
+msgstr "Bcc:"
+
+#: ../src/client/composer/composer-widget.vala:1654
+#, fuzzy
+#| msgid "_Reply"
+msgid "Reply-To: "
+msgstr "返信(_R)"
+
+#: ../src/client/composer/composer-widget.vala:1786
+msgid "Select Color"
+msgstr "色を選択"
+
+#. Displayed in the From dropdown to indicate an "alternate email address"
+#. for an account.  The first printf argument will be the alternate email
+#. address, and the second will be the account's primary email address.
+#: ../src/client/composer/composer-widget.vala:1986
+#, c-format
+msgid "%1$s via %2$s"
+msgstr ""
+
+#. Composer label (with mnemonic underscore) for the account selector
+#. when choosing what address to send a message from.
+#: ../src/client/composer/composer-widget.vala:2028
+#, fuzzy
+#| msgid "From:"
+msgid "_From:"
+msgstr "差出人:"
+
+#. Translators: This is the name of the file chooser filter
+#. when inserting an image in the composer.
+#: ../src/client/composer/composer-widget.vala:2252
+msgid "Images"
+msgstr ""
+
+#: ../src/client/composer/spell-check-popover.vala:117
+msgid "Remove this language from the preferred list"
+msgstr ""
+
+#: ../src/client/composer/spell-check-popover.vala:121
+msgid "Add this language to the preferred list"
+msgstr ""
+
+#: ../src/client/composer/spell-check-popover.vala:217
+msgid "Search for more languages"
+msgstr ""
+
+#: ../src/client/conversation-list/formatted-conversation-data.vala:11
+msgid "Me"
+msgstr "自分"
+
+#. Translators: This is the file type displayed for
+#. attachments with unknown file types.
+#: ../src/client/conversation-viewer/conversation-email.vala:124
+msgid "Unknown"
+msgstr ""
+
+#. Preview headers
+#. Translators: This is displayed in place of the from address
+#. when the message has no from address.
+#: ../src/client/conversation-viewer/conversation-message.vala:331
+msgid "No sender"
+msgstr ""
+
+#. Translators: This separates multiple 'from'
+#. addresses in the header preview for a message.
+#: ../src/client/conversation-viewer/conversation-message.vala:586
+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:707
+msgid "Image"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:72
+#, fuzzy
+#| msgid "No conversations selected."
+msgid "No conversations selected"
+msgstr "メッセージが選択されていません"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:74
+msgid "Selecting a conversation from the list will display it here"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:79
+#, fuzzy
+#| msgid "%u conversations selected."
+msgid "Multiple conversations selected"
+msgstr "%u 件が選択されています"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:81
+msgid "Choosing an action will apply to all selected conversations"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:86
+#: ../src/client/conversation-viewer/conversation-viewer.vala:93
+#, fuzzy
+#| msgid "No conversations selected."
+msgid "No conversations found"
+msgstr "メッセージが選択されていません"
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:88
+msgid "This folder does not contain any conversations"
+msgstr ""
+
+#: ../src/client/conversation-viewer/conversation-viewer.vala:95
+msgid "Your search returned no results, try refining your search terms"
+msgstr ""
+
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
+msgid "Choose a file"
+msgstr "ファイルを選択"
+
+#: ../src/client/dialogs/attachment-dialog.vala:28
+#: ../src/client/dialogs/attachment-dialog.vala:30
+msgid "_Attach"
+msgstr "添付(_A)"
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:33
+#, c-format
+msgid "Untrusted Connection: %s"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:36
+#, c-format
+msgid "The identity of the %s mail server at %s:%u could not be verified."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:44
+msgid ""
+"Selecting “Trust This Server” or “Always Trust This Server” may cause your "
+"username and password to be transmitted insecurely."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:52
+msgid ""
+"Selecting “Don’t Trust This Server” will cause Geary not to access this "
+"server."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:54
+msgid "Geary will not add or update this email account."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:59
+msgid ""
+"Selecting “Don’t Trust This Server” will cause Geary to stop accessing this "
+"account."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:61
+msgid "Geary will exit if you have no other open email accounts."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:66
+msgid ""
+"Contact your system administrator or email service provider if you have any "
+"question about these issues."
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:73
+msgid "The server’s certificate is not signed by a known authority"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:76
+msgid "The server’s identity does not match the identity in the certificate"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:79
+msgid "The server’s certificate has expired"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:82
+msgid "The server’s certificate has not been activated"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:85
+msgid "The server’s certificate has been revoked and is now invalid"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:88
+msgid "The server’s certificate is considered insecure"
+msgstr ""
+
+#: ../src/client/dialogs/certificate-warning-dialog.vala:91
+msgid "An error has occurred processing the server’s certificate"
+msgstr ""
+
+#. We can't keep these in the glade file, because Gnome doesn't want markup in translatable
+#. strings, and Glade doesn't support the "larger" size attribute. See this bug report for
+#. details: https://bugzilla.gnome.org/show_bug.cgi?id=679006
+#: ../src/client/dialogs/password-dialog.vala:16
+#, fuzzy
+#| msgid "Please enter your email password"
+msgid "Geary requires your email password to continue"
+msgstr "パスワードを入力してください"
+
+#. Label displaying total number of email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:32
+#, c-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+
+#. / Label displaying number of unread email messages in a folder
+#: ../src/client/folder-list/folder-list-folder-entry.vala:39
+#, c-format
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] ""
+
+#. / This string represents the divider between two messages: "n messages" and "n unread",
+#. / shown in the folder list as a tooltip.  Please use your languages conventions for
+#. / combining the two, i.e. a comma (",") for English; "6 messages, 3 unread"
+#: ../src/client/folder-list/folder-list-folder-entry.vala:45
+#, c-format
+msgid "%s, %s"
+msgstr ""
+
+#: ../src/client/folder-list/folder-list-inboxes-branch.vala:14
+msgid "Inboxes"
+msgstr "受信トレイ"
+
+#: ../src/client/folder-list/folder-list-search-branch.vala:44
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr[0] ""
+
+#: ../src/client/notification/libmessagingmenu.vala:75
+#, fuzzy, c-format
+#| msgid "%s - New Messages"
+msgid "%s — New Messages"
+msgstr "%s - 新着メッセージ"
+
+#: ../src/client/notification/libnotify.vala:74
+#, c-format
+msgid "%d new message"
+msgid_plural "%d new messages"
+msgstr[0] "%d 件の新着メッセージ"
+
+#: ../src/client/notification/libnotify.vala:77
+#, c-format
+msgid "%s, %d new message total"
+msgid_plural "%s, %d new messages total"
+msgstr[0] ""
+
+#: ../src/client/notification/libnotify.vala:109
+#, c-format
+msgid ""
+"%s\n"
+"(%d other new message for %s)"
+msgid_plural ""
+"%s\n"
+"(%d other new messages for %s)"
+msgstr[0] ""
+
+#: ../src/client/notification/libnotify.vala:165
+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
+msgid "%l:%M %P"
+msgstr "%l:%M %P"
+
+#. / Datetime format for 24-hour time, i.e. 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:71
+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 "%l:%M %P"
+
+#. / Date format for dates within the current year, i.e. Nov 8
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:78
+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
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%Y年 %B %-e日, %-l:%M %P"
+
+#. / Verbose datetime format for 24-hour time, i.e. November 8, 2010 16:35
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:91
+msgid "%B %-e, %Y %-H:%M"
+msgstr "%Y年 %B %-e日, %-H:%M"
+
+#. / Verbose datetime format for the locale default (full month, day and time)
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: ../src/client/util/util-date.vala:94
+msgctxt "Default full date"
+msgid "%B %-e, %Y %-l:%M %P"
+msgstr "%Y年 %B %-e日, %-l:%M %P"
 
-#: ../../ui/composer.glade:113
-msgid "Bold (Ctrl+B)"
-msgstr "太字(Ctrl+B)"
+#: ../src/client/util/util-date.vala:164
+msgid "Now"
+msgstr ""
 
-#: ../../ui/composer.glade:69
-msgid "C_olor"
-msgstr "色(_O)"
+#: ../src/client/util/util-date.vala:167
+#, c-format
+msgid "%dm ago"
+msgid_plural "%dm ago"
+msgstr[0] ""
 
-#: ../../src/client/composer/composer-window.vala:926
-msgid "Cannot add attachment"
-msgstr "添付できません"
+#: ../src/client/util/util-date.vala:171
+#, c-format
+msgid "%dh ago"
+msgid_plural "%dh ago"
+msgstr[0] ""
 
-#: ../../src/client/views/conversation-viewer.vala:611
-msgid "Cc:"
-msgstr "Cc:"
+#: ../src/client/util/util-date.vala:178
+msgid "Yesterday"
+msgstr ""
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:223
+#. / 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
 #, c-format
-msgid "Cc: %s\n"
+msgid "%A"
 msgstr ""
 
-#: ../../src/client/dialogs/attachment-dialog.vala:18
-msgid "Choose a file"
-msgstr "ファイルを選択"
+#: ../src/client/util/util-email.vala:30
+#: ../src/engine/rfc822/rfc822-message.vala:908
+msgid "(no subject)"
+msgstr "(件名なし)"
 
-#: ../../src/client/geary-controller.vala:553
-msgid "Co_ntinue"
-msgstr "継続(_N)"
+#: ../src/client/util/util-files.vala:16
+msgid "bytes"
+msgstr "バイト"
 
-#: ../../src/client/geary-application.vala:29
-msgid "Compose Message"
-msgstr "メッセージを作成"
+#: ../src/client/util/util-files.vala:19
+msgctxt "Abbreviation for terabyte"
+msgid "TB"
+msgstr "TB"
 
-#: ../../src/client/geary-controller.vala:313
-msgid "Compose new message (Ctrl+N, N)"
-msgstr ""
+#: ../src/client/util/util-files.vala:22
+msgctxt "Abbreviation for gigabyte"
+msgid "GB"
+msgstr "GB"
 
-#: ../../ui/preferences.glade:117
-msgid "Composer"
-msgstr "作成画面"
+#: ../src/client/util/util-files.vala:25
+msgctxt "Abbreviation for megabyte"
+msgid "MB"
+msgstr "MB"
 
-#: ../../src/client/views/conversation-viewer.vala:897
-msgid "Copy _Email Address"
-msgstr "アドレスをコピー(_E)"
+#: ../src/client/util/util-files.vala:28
+msgctxt "Abbreviation for kilobyte"
+msgid "KB"
+msgstr "KB"
 
-#: ../../src/client/views/conversation-viewer.vala:902
-msgid "Copy _Link"
-msgstr "リンクのアドレスをコピー(_L)"
+#: ../src/engine/api/geary-service-provider.vala:52
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+#: ../src/engine/api/geary-service-provider.vala:55
+msgid "Yahoo! Mail"
+msgstr "Yahoo! Mail"
 
-#: ../../ui/composer.glade:21
-msgid "Cu_t"
+#: ../src/engine/api/geary-service-provider.vala:58
+msgid "Outlook.com"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:620
-msgid "Date:"
-msgstr "日時:"
+#: ../src/engine/api/geary-service-provider.vala:61
+msgid "Other"
+msgstr "その他"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:217
-#, c-format
-msgid "Date: %s\n"
-msgstr "日時: %s\n"
+#: ../src/engine/api/geary-service.vala:20
+msgid "IMAP"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:43
-msgid "Delete conversation (Delete, Backspace, A)"
-msgstr "スレッドを削除 (Delete, Backspace, A)"
+#: ../src/engine/api/geary-service.vala:23
+msgid "SMTP"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:44
-msgid "Delete conversations (Delete, Backspace, A)"
-msgstr "スレッドを削除 (Delete, Backspace, A)"
+#: ../src/engine/api/geary-special-folder-type.vala:24
+msgid "Inbox"
+msgstr "受信トレイ"
 
-#: ../../src/client/geary-args.vala:25
-msgid "Display program version"
-msgstr "バージョンを表示"
+#: ../src/engine/api/geary-special-folder-type.vala:27
+msgid "Drafts"
+msgstr "下書き"
 
-#: ../../src/client/composer/composer-window.vala:663
-msgid "Do you want to discard the unsaved message?"
-msgstr "未保存のメッセージを破棄しますか?"
+#: ../src/engine/api/geary-special-folder-type.vala:30
+msgid "Sent Mail"
+msgstr "送信済みメール"
 
-#: ../../src/client/composer/composer-window.vala:666
-msgid "Do you want to discard this message?"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:33
+msgid "Starred"
+msgstr "スター"
 
-#: ../../src/client/geary-controller.vala:1479
-msgid "Don't _ask me again"
-msgstr "次回から表示しない(_A)"
+#: ../src/engine/api/geary-special-folder-type.vala:36
+msgid "Important"
+msgstr "重要"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:27
-msgid "Drafts"
-msgstr "下書き"
+#: ../src/engine/api/geary-special-folder-type.vala:39
+msgid "All Mail"
+msgstr "すべてのメール"
 
-#: ../../ui/composer.glade:419
-msgid "Drop files here"
-msgstr "ここにファイルをドロップ"
+#: ../src/engine/api/geary-special-folder-type.vala:42
+msgid "Spam"
+msgstr "迷惑メール"
 
-#: ../../ui/login.glade:115
-msgid "E_mail address:"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:45
+msgid "Trash"
+msgstr "ごみ箱"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "E_xit"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:48
+msgid "Outbox"
+msgstr "送信トレイ"
 
-#: ../../src/client/views/conversation-viewer.vala:533
-msgid "Edit Draft"
+#: ../src/engine/api/geary-special-folder-type.vala:54
+msgid "Archive"
 msgstr ""
 
-#: ../../ui/account_list.glade:84
-msgid "Edit account"
-msgstr ""
+#: ../src/engine/api/geary-special-folder-type.vala:58 ../ui/login.glade.h:29
+msgid "None"
+msgstr "なし"
 
-#: ../../ui/remove_confirm.glade:94
-msgid "Email address:"
-msgstr "メールアドレス:"
+#. Map of possibly translated search operator names and values
+#. to English/internal names and values. We include the
+#. English version anyway so that when translations provide a
+#. localised version of the operator names but have not also
+#. translated the user manual, the English version in the
+#. manual still works.
+#. Can be typed in the search box like "attachment:file.txt"
+#. to find messages with attachments with a particular name.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:99
+#, fuzzy
+#| msgid "Save A_ttachment..."
+#| msgid_plural "Save All A_ttachments..."
+msgctxt "Search operator"
+msgid "attachment"
+msgstr "添付ファイルを保存(_T)"
+
+#. Can be typed in the search box like
+#. "bcc:johndoe example com" to find messages bcc'd to a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:108
+msgctxt "Search operator"
+msgid "bcc"
+msgstr ""
+
+#. Can be typed in the search box like "body:word" to find
+#. "word" only if it occurs in the body of a message.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:116
+msgctxt "Search operator"
+msgid "body"
+msgstr ""
+
+#. Can be typed in the search box like
+#. "cc:johndoe example com" to find messages cc'd to a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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
+#, fuzzy
+#| msgid "Bcc:"
+msgctxt "Search operator"
+msgid "cc"
+msgstr "Bcc:"
 
-#: ../../src/client/geary-application.vala:28
-msgid "Email;E-mail;Mail;"
-msgstr ""
+#. Can be typed in the search box like
+#. "from:johndoe example com" to find messages from a
+#. particular sender.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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
+msgctxt "Search operator"
+msgid "from"
+msgstr ""
+
+#. Can be typed in the search box like "is:unread" to find
+#. messages that are read, unread, or starred.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. 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
+msgctxt "Search operator"
+msgid "is"
+msgstr ""
+
+#. Can be typed in the search box like "subject:word" to find
+#. "word" only if it occurs in the subject of a message.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary
+#. User Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:150
+#, fuzzy
+#| msgid "Subject:"
+msgctxt "Search operator"
+msgid "subject"
+msgstr "件名:"
 
-#: ../../ui/preferences.glade:131
-msgid "Enable _spell checking"
-msgstr "スペルチェックを有効(_S)"
+#. Can be typed in the search box like
+#. "to:johndoe example com" to find messages received by a
+#. particular person.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:159
+msgctxt "Search operator"
+msgid "to"
+msgstr ""
+
+#. Can be typed in the search box after "to:", "cc:" and
+#. "bcc:" e.g.: "to:me". Matches conversations that are
+#. addressed to the user.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:180
+msgctxt "Search operator value - mail addressed to the user"
+msgid "me"
+msgstr ""
+
+#. Can be typed in the search box after "from:" i.e.:
+#. "from:me". Matches conversations were sent by the user.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:192
+msgctxt "Search operator value - mail sent by the user"
+msgid "me"
+msgstr ""
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:read". Matches conversations that are flagged as read.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:204
+msgctxt "'is:' search operator value"
+msgid "read"
+msgstr ""
+
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:starred". Matches conversations that are flagged as
+#. starred.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:215
+#, fuzzy
+#| msgid "Starred"
+msgctxt "'is:' search operator value"
+msgid "starred"
+msgstr "スター"
 
-#: ../../ui/login.glade:588
-msgid "Encr_yption:"
-msgstr "暗号化(_Y):"
+#. Can be typed in the search box after "is:" i.e.:
+#. "is:unread". Matches conversations that are flagged unread.
+#.
+#. The translated string must be a single word (use '-', '_'
+#. or similar to combine words into one), should be short, and
+#. also match the translation in "search.page" of the Geary User
+#. Guide.
+#: ../src/engine/imap-db/imap-db-account.vala:225
+msgctxt "'is:' search operator value"
+msgid "unread"
+msgstr ""
+
+#. List of general possible folder names to match for the
+#. Draft mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:626
+#, fuzzy
+#| msgid "Drafts"
+msgid "Drafts | Draft"
+msgstr "下書き"
 
-#: ../../ui/login.glade:607
-msgid "Encrypt_ion:"
-msgstr "暗号化(_I):"
+#. List of general possible folder names to match for the
+#. Sent mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:635
+msgid "Sent | Sent Mail | Sent Email | Sent E-Mail"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-msgid "Enter your account information to get started."
-msgstr "アカウント情報を入力してください"
+#. The localised name(s) of the Sent folder name as used
+#. by MS Outlook/Exchange.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:640
+msgctxt "Outlook localised name"
+msgid "Sent Items"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:714
-#, c-format
+#. List of general possible folder names to match for the
+#. Spam mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:650
 msgid ""
-"Error during rebuild:\n"
-"\n"
-"%s"
+"Junk | Spam | Junk Mail | Junk Email | Junk E-Mail | Bulk Mail | Bulk Email "
+"| Bulk E-Mail"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:43
-msgid "Error saving"
+#. List of general possible folder names to match for the
+#. Trash mailbox. Separate names using a vertical bar and
+#. put the most common localized name to the front for the
+#. default. English names do not need to be included.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:660
+msgid "Trash | Rubbish | Rubbish Bin"
 msgstr ""
 
-#. / Displayed in the space-limited status bar when a message fails to be sent due to error.
-#: ../../src/client/geary-controller.vala:625
-#: ../../src/client/ui/status-bar.vala:28
-msgid "Error sending email"
-msgstr ""
+#. The localised name(s) of the Trash folder name as used
+#. by MS Outlook/Exchange.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:665
+#, fuzzy
+#| msgid "_Delete"
+msgctxt "Outlook localised name"
+msgid "Deleted Items"
+msgstr "削除(_D)"
 
-#: ../../src/client/accounts/add-edit-page.vala:216
-msgid "Everything"
-msgstr "すべて"
+#. List of general possible folder names to match for the
+#. Archive mailbox. Separate names using a vertical bar
+#. and put the most common localized name to the front for
+#. the default. English names do not need to be included.
+#: ../src/engine/imap-engine/imap-engine-generic-account.vala:675
+msgid "Archive | Archives"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1897
-msgid "Failed to open default text editor."
-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 %b %-e日 (%a), %l:%M %p"
 
-#: ../../src/client/geary-args.vala:54
+#. / 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 "Failed to parse command line options: %s\n"
-msgstr "不明なコマンドラインオプション: %s\n"
-
-#. / Placeholder text indicating that the user should type their first name and last name
-#: ../../src/client/accounts/add-edit-page.vala:10
-msgid "First Last"
+msgid "On %1$s, %2$s wrote:"
 msgstr ""
 
-#: ../../ui/composer.glade:182
-msgid "Fixed Width"
-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 "%s wrote:"
 
-#: ../../src/client/geary-controller.vala:329
-msgid "Forward (Ctrl+L, F)"
+#. / 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/client/views/conversation-viewer.vala:605
-msgid "From:"
-msgstr "差出人:"
+#: ../src/engine/rfc822/rfc822-utils.vala:278
+msgid "---------- Forwarded message ----------"
+msgstr "---------- 転送されたメッセージ ----------"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:215
+#: ../src/engine/rfc822/rfc822-utils.vala:282
 #, c-format
 msgid "From: %s\n"
 msgstr "差出人: %s\n"
 
-#: ../../src/client/util/util-files.vala:22
-msgctxt "Abbreviation for gigabyte"
-msgid "GB"
-msgstr "GB"
+#: ../src/engine/rfc822/rfc822-utils.vala:283
+#, c-format
+msgid "Subject: %s\n"
+msgstr "件名: %s\n"
 
-#: ../../src/client/geary-application.vala:25
-msgid "Geary Mail"
-msgstr "Geary Mail"
+#: ../src/engine/rfc822/rfc822-utils.vala:284
+#, c-format
+msgid "Date: %s\n"
+msgstr "日時: %s\n"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:287
+#, c-format
+msgid "To: %s\n"
+msgstr "宛先: %s\n"
+
+#: ../src/engine/rfc822/rfc822-utils.vala:290
+#, c-format
+msgid "Cc: %s\n"
+msgstr ""
+
+#: ../ui/account_cannot_remove.glade.h:1
+msgid "<span weight=\"bold\" size=\"larger\">Cannot remove account</span> "
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">アカウントを削除できません</span>"
 
-#: ../../src/client/geary-controller.vala:626
+#: ../ui/account_cannot_remove.glade.h:2
 msgid ""
-"Geary encountered an error sending an email.  If the problem persists, "
-"please manually delete the email from your Outbox folder."
+"A composer window associated with this account is currently open. Send or "
+"discard the message and try again."
 msgstr ""
+"アカウントと関連づけられた作成画面が既に開いています. メッセージを送信するか"
+"破棄してからもう一度試してください"
 
-#: ../../ui/password-dialog.glade:315
-msgid "General"
+#: ../ui/account_list.glade.h:1
+msgid "Add account"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:52
-msgid "Gmail"
-msgstr "Gmail"
+#: ../ui/account_list.glade.h:2
+msgid "Edit account"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:133
-msgid "IMAP Credentials"
-msgstr "IMAP 証明書"
+#: ../ui/account_list.glade.h:3
+msgid "Remove account"
+msgstr ""
 
-#: ../../ui/login.glade:572
-msgid "IMAP password"
+#: ../ui/account_spinner.glade.h:1
+msgid "Please wait while Geary validates your account."
+msgstr "アカウントを検証しています..."
+
+#: ../ui/certificate_warning_dialog.glade.h:1
+msgid "Untrusted Connection"
 msgstr ""
 
-#: ../../ui/login.glade:286 ../../ui/password-dialog.glade:334
-msgid "IMAP settings"
-msgstr "IMAP 設定"
+#: ../ui/certificate_warning_dialog.glade.h:2
+msgid "_Always Trust This Server"
+msgstr ""
 
-#: ../../ui/login.glade:556
-msgid "IMAP username"
+#: ../ui/certificate_warning_dialog.glade.h:3
+msgid "_Trust This Server"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:36
-msgid "Important"
-msgstr "重要"
+#: ../ui/certificate_warning_dialog.glade.h:4
+msgid "_Don’t Trust This Server"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:24
-msgid "Inbox"
-msgstr "受信トレイ"
+#: ../ui/composer-headerbar.ui.h:1
+#, fuzzy
+#| msgid "Italic (Ctrl+I)"
+msgid "Detach (Ctrl+D)"
+msgstr "斜体(Ctrl+I)"
 
-#: ../../src/client/folder-list/folder-list-inboxes-branch.vala:14
-msgid "Inboxes"
-msgstr "受信トレイ"
+#: ../ui/composer-headerbar.ui.h:2
+#, fuzzy
+#| msgid "_Attach File"
+msgid "Attach File (Ctrl+T)"
+msgstr "ファイルを添付(_A)"
 
-#: ../../src/client/ui/main-toolbar.vala:163
-#, c-format
-msgid "Indexing %s account"
+#: ../ui/composer-headerbar.ui.h:3
+msgid "Include Original Attachments"
 msgstr ""
 
-#: ../../ui/composer.glade:120
-msgid "Italic (Ctrl+I)"
-msgstr "斜体(Ctrl+I)"
+#: ../ui/composer-headerbar.ui.h:4
+#, fuzzy
+#| msgid "Bold (Ctrl+B)"
+msgid "Send (Ctrl+Enter)"
+msgstr "太字(Ctrl+B)"
 
-#: ../../src/client/util/util-files.vala:28
-msgctxt "Abbreviation for kilobyte"
-msgid "KB"
-msgstr "KB"
+#: ../ui/composer-headerbar.ui.h:5
+msgid "_Send"
+msgstr "送信(_S)"
 
-#: ../../src/client/geary-controller.vala:689
-msgid "Labels"
-msgstr "ラベル"
+#: ../ui/composer-headerbar.ui.h:6
+msgid "Discard and Close"
+msgstr ""
 
-#: ../../ui/composer.glade:151
-msgid "Lar_ge"
+#: ../ui/composer-headerbar.ui.h:7
+msgid "Save and Close"
 msgstr ""
 
-#: ../../ui/composer.glade:152
-msgid "Large"
-msgstr "大"
+#. Note that this button and the Update button will never be shown at the same time to the user.
+#: ../ui/composer-link-popover.ui.h:2
+msgid "Insert the new link with this URL"
+msgstr ""
 
-#: ../../ui/composer.glade:62
-msgid "Link (Ctrl+L)"
-msgstr "リンク(Ctrl+L)"
+#: ../ui/composer-link-popover.ui.h:3
+msgid "Link URL"
+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/geary-args.vala:16
-msgid "Log IMAP replay queue"
-msgstr "IMAP のイベントキューを記録"
+#. Note that this button and the Insert button will never be shown at the same time to the user.
+#: ../ui/composer-link-popover.ui.h:5
+msgid "Update this link’s URL"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:11
-msgid "Log conversation monitoring"
-msgstr "会話の監視を記録"
+#: ../ui/composer-link-popover.ui.h:6
+msgid "Delete this link"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:21
-msgid "Log database queries (generates lots of messages)"
-msgstr "データベースクエリを記録 (多くのメッセージを生成します)"
+#: ../ui/composer-link-popover.ui.h:7
+msgid "Open this link"
+msgstr ""
 
-#. / "Normalization" can also be called "synchronization"
-#: ../../src/client/geary-args.vala:23
-msgid "Log folder normalization"
-msgstr "フォルダーの同期を記録"
+#: ../ui/composer-menus.ui.h:1
+msgid "S_ans Serif"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:13
-msgid "Log network activity"
-msgstr "ネットワーク情報を記録"
+#: ../ui/composer-menus.ui.h:2
+msgid "S_erif"
+msgstr ""
+
+#: ../ui/composer-menus.ui.h:3
+msgid "_Fixed Width"
+msgstr ""
+
+#: ../ui/composer-menus.ui.h:4
+msgid "_Small"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:12
-msgid "Log network deserialization"
+#: ../ui/composer-menus.ui.h:5
+msgid "_Medium"
 msgstr ""
 
-#. / Serialization is how commands and responses are converted into a stream of bytes for
-#. / network transmission
-#: ../../src/client/geary-args.vala:19
-msgid "Log network serialization"
-msgstr "ネットワークのストリームを記録"
+#: ../ui/composer-menus.ui.h:6
+msgid "Lar_ge"
+msgstr ""
 
-#: ../../src/client/geary-args.vala:20
-msgid "Log periodic activity"
-msgstr "定期的な行動を記録"
+#: ../ui/composer-menus.ui.h:7
+msgid "C_olor"
+msgstr "色(_O)"
 
-#: ../../src/client/util/util-files.vala:25
-msgctxt "Abbreviation for megabyte"
-msgid "MB"
-msgstr "MB"
+#: ../ui/composer-menus.ui.h:8
+msgid "_Rich Text"
+msgstr ""
 
-#: ../../src/client/geary-application.vala:26
-msgid "Mail Client"
-msgstr "メールクライアント"
+#: ../ui/composer-menus.ui.h:9
+msgid "Show Extended Fields"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1479
-msgid "Mark Unread From _Here"
+#: ../ui/composer-menus.ui.h:10
+msgid "_Undo"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:52
-msgid "Mark as S_pam"
+#: ../ui/composer-menus.ui.h:11
+msgid "_Redo"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:277
-msgid "Mark as _Read"
+#: ../ui/composer-menus.ui.h:12
+msgid "Cu_t"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:283
-msgid "Mark as _Unread"
+#: ../ui/composer-menus.ui.h:13 ../ui/conversation-message-menus.ui.h:7
+msgid "_Copy"
+msgstr "コピー(_C)"
+
+#: ../ui/composer-menus.ui.h:14
+msgid "_Paste"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:53
-msgid "Mark as not S_pam"
+#: ../ui/composer-menus.ui.h:15
+msgctxt "Clipboard paste with rich text"
+msgid "Paste _With Formatting"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:55
-#: ../../src/client/geary-controller.vala:269
-msgid "Mark conversation"
-msgstr "スレッドをマーク"
+#: ../ui/composer-menus.ui.h:16
+msgid "Select _All"
+msgstr "すべて選択(_A)"
 
-#: ../../src/client/geary-controller.vala:56
-msgid "Mark conversations"
-msgstr "スレッドをマーク"
+#: ../ui/composer-menus.ui.h:17 ../ui/conversation-message-menus.ui.h:9
+#, fuzzy
+#| msgid "_Inspect"
+msgid "_Inspect…"
+msgstr "検証(_I)"
 
-#: ../../src/client/views/formatted-conversation-data.vala:11
-msgid "Me"
-msgstr "自分"
+#. Address(es) e-mail is to be sent to
+#: ../ui/composer-widget.ui.h:2
+#, fuzzy
+#| msgid "To:"
+msgid "_To"
+msgstr "宛先:"
+
+#: ../ui/composer-widget.ui.h:3
+#, fuzzy
+#| msgid "Cc:"
+msgid "_Cc"
+msgstr "Cc:"
 
-#: ../../ui/composer.glade:158
-msgid "Medium"
-msgstr "中"
+#: ../ui/composer-widget.ui.h:4
+#, fuzzy
+#| msgid "Subject:"
+msgid "_Subject"
+msgstr "件名:"
 
-#: ../../ui/composer.glade:75
-msgid "More options"
+#: ../ui/composer-widget.ui.h:5
+msgid "_Bcc"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:59
-#: ../../src/client/geary-controller.vala:308
-msgid "Move conversation"
-msgstr "スレッドを移動"
+#: ../ui/composer-widget.ui.h:6
+#, fuzzy
+#| msgid "_Reply"
+msgid "_Reply-To"
+msgstr "返信(_R)"
 
-#: ../../src/client/geary-controller.vala:60
-msgid "Move conversations"
-msgstr "スレッドを移動"
+#. Geary account mail will be sent from
+#: ../ui/composer-widget.ui.h:8
+#, fuzzy
+#| msgid "From:"
+msgid "From"
+msgstr "差出人:"
 
-#: ../../ui/login.glade:176
-msgid "N_ame:"
-msgstr "名前(_A):"
+#: ../ui/composer-widget.ui.h:9
+msgid "Drop files here"
+msgstr "ここにファイルをドロップ"
 
-#: ../../ui/login.glade:230
-msgid "N_ickname:"
-msgstr "ニックネーム(_I):"
+#: ../ui/composer-widget.ui.h:10
+msgid "To add them as attachments"
+msgstr "添付ファイルとして追加"
 
-#: ../../src/client/composer/composer-window.vala:40
-msgid "New Message"
-msgstr "新規メッセージ"
+#: ../ui/composer-widget.ui.h:11
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Undo last edit (Ctrl+Z)"
+msgstr "下線(Ctrl+U)"
 
-#: ../../ui/remove_confirm.glade:80
-msgid "Nickname:"
-msgstr "ニックネーム:"
+#: ../ui/composer-widget.ui.h:12
+msgid "Redo last edit  (Ctrl+Shift+Z)"
+msgstr ""
 
-#: ../../ui/login.glade:661
-msgid "No authentication re_quired"
-msgstr "認証は必要とされていません(_Q)"
+#: ../ui/composer-widget.ui.h:13
+msgid "Bold (Ctrl+B)"
+msgstr "太字(Ctrl+B)"
+
+#: ../ui/composer-widget.ui.h:14
+msgid "Italic (Ctrl+I)"
+msgstr "斜体(Ctrl+I)"
+
+#: ../ui/composer-widget.ui.h:15
+msgid "Underline (Ctrl+U)"
+msgstr "下線(Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:275
-msgid "No conversations in folder."
+#: ../ui/composer-widget.ui.h:16
+msgid "Strikethrough (Ctrl+K)"
+msgstr "取り消し線(Ctrl+K)"
+
+#: ../ui/composer-widget.ui.h:17
+msgid "Quote text  (Ctrl+])"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:244
-msgid "No conversations selected."
-msgstr "メッセージが選択されていません"
+#: ../ui/composer-widget.ui.h:18
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Unquote text  (Ctrl+[)"
+msgstr "下線(Ctrl+U)"
 
-#: ../../src/client/views/conversation-viewer.vala:273
-msgid "No search results found."
+#: ../ui/composer-widget.ui.h:19
+msgid "Insert or update selection link (Ctrl+L)"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:128
-#: ../../src/engine/api/geary-special-folder-type.vala:58
-msgid "None"
-msgstr "なし"
+#: ../ui/composer-widget.ui.h:20
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgid "Insert an image (Ctrl+G)"
+msgstr "下線(Ctrl+U)"
 
-#: ../../ui/preferences.glade:158
-msgid "Notifications"
-msgstr "通知"
+#: ../ui/composer-widget.ui.h:21
+#, fuzzy
+#| msgid "Remove formatting (Ctrl+Space)"
+msgid "Remove selection formatting (Ctrl+Space)"
+msgstr "書式をリセット(Ctrl+Space)"
 
-#: ../../src/client/util/util-date.vala:164
-msgid "Now"
+#: ../ui/composer-widget.ui.h:22
+#, fuzzy
+#| msgid "Enable _spell checking"
+msgid "Select spell checking languages"
+msgstr "スペルチェックを有効(_S)"
+
+#: ../ui/conversation-email.ui.h:1
+#, fuzzy
+#| msgid "Save All A_ttachments..."
+msgid "Save all attachments"
+msgstr "全ての添付ファイルを保存(_T)"
+
+#. Note: The application will never show this button at the same time as unstar_button, one will always be 
hidden.
+#: ../ui/conversation-email.ui.h:3
+msgid "Mark this message as starred"
 msgstr ""
 
-#. / The quoted header for a message being replied to.
-#. / %1$s will be substituted for the date, and %2$s will be substituted for
-#. / the original sender.
-#: ../../src/engine/rfc822/rfc822-utils.vala:171
-#, c-format
-msgid "On %1$s, %2$s wrote:"
+#. Note: The application will never show this button at the same time as star_button, one will always be 
hidden.
+#: ../ui/conversation-email.ui.h:5
+msgid "Mark this message as not starred"
 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:184
-#, c-format
-msgid "On %s:"
+#: ../ui/conversation-email.ui.h:6
+msgid "Display the message menu"
 msgstr ""
 
-#: ../../src/client/notification/libnotify.vala:160
-msgid "Open"
-msgstr "開く"
+#: ../ui/conversation-email.ui.h:7
+#, fuzzy
+#| msgid "Cannot add attachment"
+msgid "Open selected attachments"
+msgstr "添付できません"
 
-#: ../../src/engine/api/geary-service-provider.vala:61
-msgid "Other"
-msgstr "その他"
+#: ../ui/conversation-email.ui.h:8
+#, fuzzy
+#| msgid "Save All A_ttachments..."
+msgid "Save selected attachments"
+msgstr "全ての添付ファイルを保存(_T)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:48
-msgid "Outbox"
-msgstr "送信トレイ"
+#: ../ui/conversation-email.ui.h:9
+#, fuzzy
+#| msgid "Save All A_ttachments..."
+msgid "Select all attachments"
+msgstr "全ての添付ファイルを保存(_T)"
 
-#: ../../src/engine/api/geary-service-provider.vala:58
-msgid "Outlook.com"
+#: ../ui/conversation-email.ui.h:10
+msgid "Edit Draft"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:10
-msgid "Output debugging information"
-msgstr "デバッグ情報を出力"
+#: ../ui/conversation-email.ui.h:11
+#, fuzzy
+#| msgid "%u read messages"
+msgid "Draft message"
+msgstr "%u 件の既読メッセージ"
 
-#: ../../ui/login.glade:337
-msgid "P_ort:"
-msgstr "ポート(_O):"
+#: ../ui/conversation-email.ui.h:12
+msgid "This message has not yet been sent."
+msgstr ""
 
-#: ../../ui/login.glade:474
-msgid "Pass_word:"
-msgstr "パスワード(_W):"
+#: ../ui/conversation-email.ui.h:13
+msgid "Message not saved"
+msgstr ""
 
-#: ../../ui/login.glade:101
-msgid "Password"
+#: ../ui/conversation-email.ui.h:14
+msgid "This message was sent, but has not been saved to your account."
 msgstr ""
 
-#: ../../ui/password-dialog.glade:196
-msgid "Password:"
-msgstr "パスワード:"
+#: ../ui/conversation-email-menus.ui.h:2
+msgid "Reply to _All"
+msgstr "全員に返信(_A)"
 
-#: ../../ui/composer.glade:102
-msgid "Paste _With Formatting"
+#: ../ui/conversation-email-menus.ui.h:4
+#, fuzzy
+#| msgid "_Mark as Read"
+msgid "_Mark Read"
+msgstr "既読としてマーク(_M)"
+
+#: ../ui/conversation-email-menus.ui.h:5
+#, fuzzy
+#| msgid "_Mark as Unread"
+msgid "_Mark Unread"
+msgstr "未読としてマーク(_M)"
+
+#: ../ui/conversation-email-menus.ui.h:6
+msgid "Mark Unread From _Here"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:16
-msgid "Please enter your email password"
-msgstr "パスワードを入力してください"
+#: ../ui/conversation-email-menus.ui.h:8
+msgid "_View Source"
+msgstr "ソースを表示(_V)"
 
-#: ../../src/client/geary-args.vala:47
-msgid "Please report comments, suggestions and bugs to:"
-msgstr "コメント・提案、バグ報告はこちら:"
+#: ../ui/conversation-email-menus.ui.h:11
+#, fuzzy
+#| msgid "_Save"
+msgid "_Save All"
+msgstr "保存(_S)"
 
-#: ../../ui/account_spinner.glade:41
-msgid "Please wait while Geary validates your account."
-msgstr "アカウントを検証しています..."
+#: ../ui/conversation-message-menus.ui.h:1
+#, fuzzy
+#| msgid "Copy _Link"
+msgid "_Open Link"
+msgstr "リンクのアドレスをコピー(_L)"
 
-#: ../../ui/login.glade:421
-msgid "Por_t:"
-msgstr "ポート(_T):"
+#: ../ui/conversation-message-menus.ui.h:2
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy Link _Address"
+msgstr "アドレスをコピー(_E)"
 
-#: ../../ui/password-dialog.glade:367 ../../ui/password-dialog.glade:470
-msgid "Port:"
-msgstr "ポート:"
+#: ../ui/conversation-message-menus.ui.h:3
+#, fuzzy
+#| msgid "New Message"
+msgid "Send New _Message…"
+msgstr "新規メッセージ"
 
-#: ../../ui/composer.glade:81
-msgid "Quote text  (Ctrl+])"
-msgstr ""
+#: ../ui/conversation-message-menus.ui.h:4
+#, fuzzy
+#| msgid "Copy _Email Address"
+msgid "Copy Email _Address"
+msgstr "アドレスをコピー(_E)"
 
-#: ../../src/client/geary-controller.vala:322
-msgid "R_eply All"
+#: ../ui/conversation-message-menus.ui.h:5
+msgid "Save _Image As…"
 msgstr ""
 
-#: ../../ui/preferences.glade:55
-msgid "Reading"
-msgstr "表示画面"
-
-#: ../../ui/password-dialog.glade:274
-msgid "Real name:"
-msgstr "本名:"
+#: ../ui/conversation-message-menus.ui.h:6
+#, fuzzy
+#| msgid "Select _All"
+msgid "_Select All"
+msgstr "すべて選択(_A)"
 
-#: ../../src/client/accounts/add-edit-page.vala:590
-msgid "Remem_ber password"
+#: ../ui/conversation-message-menus.ui.h:8
+msgid "Search for messages from"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:583
-msgid "Remem_ber passwords"
+#: ../ui/conversation-message.ui.h:1
+msgid "From <email>"
 msgstr ""
 
-#: ../../ui/account_list.glade:97
-msgid "Remove account"
+#: ../ui/conversation-message.ui.h:2
+msgid "1/1/1970\t"
 msgstr ""
 
-#: ../../ui/composer.glade:95
-msgid "Remove formatting (Ctrl+Space)"
-msgstr "書式をリセット(Ctrl+Space)"
-
-#: ../../src/client/geary-controller.vala:318
-msgid "Reply (Ctrl+R, R)"
+#: ../ui/conversation-message.ui.h:3
+msgid "Preview body text."
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:323
-msgid "Reply all (Ctrl+Shift+R, Shift+R)"
+#: ../ui/conversation-message.ui.h:4
+msgid "Sent by:"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1452
-msgid "Reply to _All"
+#: ../ui/conversation-message.ui.h:5
+#, fuzzy
+#| msgid "Reply to _All"
+msgid "Reply to:"
 msgstr "全員に返信(_A)"
 
-#: ../../ui/password-dialog.glade:163
-msgid "SMTP Credentials"
-msgstr "SMTP 証明書"
+#: ../ui/conversation-message.ui.h:6
+#, fuzzy
+#| msgid "Subject:"
+msgid "Subject"
+msgstr "件名:"
 
-#: ../../ui/login.glade:507
-msgid "SMTP password"
-msgstr ""
+#: ../ui/conversation-message.ui.h:7
+msgid "To:"
+msgstr "宛先:"
 
-#: ../../ui/login.glade:439 ../../ui/password-dialog.glade:437
-msgid "SMTP settings"
-msgstr "SMTP 設定"
+#: ../ui/conversation-message.ui.h:8
+msgid "Cc:"
+msgstr "Cc:"
 
-#: ../../ui/login.glade:491
-msgid "SMTP username"
+#: ../ui/conversation-message.ui.h:9
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: ../ui/conversation-message.ui.h:10
+msgid "Show Images"
 msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:124
-msgid "SSL"
-msgstr "SSL"
+#: ../ui/conversation-message.ui.h:11
+msgid "Always Show From Sender"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:382 ../../ui/password-dialog.glade:485
-msgid "SSL/TLS encryption:"
-msgstr "SSL/TLS 暗号化:"
+#: ../ui/conversation-message.ui.h:12
+msgid "Remote images not shown"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:126
-msgid "STARTTLS"
-msgstr "STARTTLS"
+#: ../ui/conversation-message.ui.h:13
+msgid "Only show remote images from senders you trust."
+msgstr ""
 
-#: ../../ui/composer.glade:169
-msgid "S_ans Serif"
+#: ../ui/conversation-message.ui.h:14
+msgid "But actually goes to:"
 msgstr ""
 
-#: ../../ui/composer.glade:175
-msgid "S_erif"
+#: ../ui/conversation-message.ui.h:15
+msgid "The link appears to go to:"
 msgstr ""
 
-#: ../../ui/login.glade:160
-msgid "S_ervice:"
+#: ../ui/conversation-message.ui.h:16
+msgid "Deceptive link found"
 msgstr ""
 
-#: ../../ui/composer.glade:170
-msgid "Sans Serif"
-msgstr "ゴシック体"
+#: ../ui/conversation-message.ui.h:17
+msgid "The email sender may be leading you to the wrong web site."
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1437
-msgid "Save A_ttachment..."
-msgid_plural "Save All A_ttachments..."
-msgstr[0] "添付ファイルを保存(_T)"
+#: ../ui/conversation-message.ui.h:18
+msgid "If unsure, contact the sender and ask before continuing."
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1400
-msgid "Save All A_ttachments..."
-msgstr "全ての添付ファイルを保存(_T)"
+#: ../ui/conversation-viewer.ui.h:1
+#, fuzzy
+#| msgid "Mark conversation"
+msgid "Find in conversation"
+msgstr "スレッドをマーク"
 
-#: ../../src/client/composer/composer-window.vala:41
-msgid "Saved"
+#: ../ui/conversation-viewer.ui.h:2
+msgid "Find the previous occurrence of the search string."
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:42
-msgid "Saving"
+#: ../ui/conversation-viewer.ui.h:3
+msgid "Find the next occurrence of the search string."
 msgstr ""
 
-#: ../../ui/login.glade:304
-msgid "Se_rver:"
-msgstr "サーバー(_R):"
+#: ../ui/edit_alternate_emails.glade.h:1
+#, fuzzy
+#| msgid "Email address:"
+msgid "Remove email address"
+msgstr "メールアドレス:"
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:38
-#: ../../src/client/ui/main-toolbar.vala:10
-#: ../../src/engine/api/geary-special-folder-type.vala:51
-msgid "Search"
+#: ../ui/edit_alternate_emails.glade.h:2
+msgid ""
+"Some email services require additional addresses be configured on the "
+"server.  Contact your email provider for more information."
 msgstr ""
 
-#: ../../src/client/folder-list/folder-list-search-branch.vala:39
-#: ../../src/client/ui/main-toolbar.vala:170
-#, c-format
-msgid "Search %s account"
+#: ../ui/edit_alternate_emails.glade.h:4
+msgid "_Update"
 msgstr ""
 
-#: ../../src/client/ui/main-toolbar.vala:76
-msgid "Search all mail in account for keywords (Ctrl+S)"
+#: ../ui/find_bar.glade.h:1
+msgid "Find:"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:1243
-msgid "Select Color"
-msgstr "色を選択"
+#: ../ui/find_bar.glade.h:2
+msgid "_Previous"
+msgstr ""
 
-#: ../../src/client/ui/stock.vala:32
-#: ../../src/client/views/conversation-viewer.vala:916
-msgid "Select _All"
-msgstr "すべて選択(_A)"
+#: ../ui/find_bar.glade.h:3
+msgid "_Next"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:910
-msgid "Select _Message"
+#: ../ui/find_bar.glade.h:4
+msgid "_Case sensitive"
 msgstr ""
 
-#: ../../src/client/geary-application.vala:27
-msgid "Send and receive email"
-msgstr "送受信"
+#: ../ui/find_bar.glade.h:5
+#, fuzzy
+#| msgid "Labels"
+msgid "label"
+msgstr "ラベル"
 
-#: ../../src/client/composer/composer-window.vala:747
-msgid "Send message with an empty body?"
-msgstr ""
+#: ../ui/gtk/help-overlay.ui.h:1
+#, fuzzy
+#| msgid "%s - Conversation Inspector"
+msgid "Conversation Shortcuts"
+msgstr "%s - スレッド検証"
 
-#: ../../src/client/composer/composer-window.vala:743
-msgid "Send message with an empty subject and body?"
+#: ../ui/gtk/help-overlay.ui.h:2
+msgctxt "shortcut window"
+msgid "General"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:745
-msgid "Send message with an empty subject?"
+#: ../ui/gtk/help-overlay.ui.h:3
+msgctxt "shortcut window"
+msgid "Move focus to the next/previous pane"
 msgstr ""
 
-#: ../../src/client/composer/composer-window.vala:749
-msgid "Send message without an attachment?"
-msgstr ""
+#: ../ui/gtk/help-overlay.ui.h:4
+#, fuzzy
+#| msgid "Move conversations"
+msgctxt "shortcut window"
+msgid "Move focus to conversation list"
+msgstr "スレッドを移動"
 
-#. / Displayed in the space-limited status bar while a message is in the process of being sent.
-#: ../../src/client/ui/status-bar.vala:25
-msgid "Sending..."
+#: ../ui/gtk/help-overlay.ui.h:5
+msgctxt "shortcut window"
+msgid "Detach composer window"
 msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:30
-msgid "Sent Mail"
-msgstr "送信済みメール"
-
-#: ../../ui/login.glade:404
-msgid "Ser_ver:"
-msgstr "サーバー(_V):"
+#: ../ui/gtk/help-overlay.ui.h:6
+msgctxt "shortcut window"
+msgid "Close composer window"
+msgstr ""
 
-#: ../../ui/composer.glade:176
-msgid "Serif"
-msgstr "明朝体"
+#: ../ui/gtk/help-overlay.ui.h:7
+msgctxt "shortcut window"
+msgid "Show keyboard shortcuts"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:352 ../../ui/password-dialog.glade:455
-msgid "Server:"
-msgstr "サーバー:"
+#: ../ui/gtk/help-overlay.ui.h:8
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr ""
 
-#: ../../ui/password-dialog.glade:259
-msgid "Service:"
-msgstr "メールサービス:"
+#: ../ui/gtk/help-overlay.ui.h:9
+msgctxt "shortcut window"
+msgid "Quit the application"
+msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "Show Images"
+#: ../ui/gtk/help-overlay.ui.h:10
+msgctxt "shortcut window"
+msgid "Search"
 msgstr ""
 
-#: ../../ui/preferences.glade:193
-msgid "Show _notifications for new mail"
-msgstr "新着メールに通知を表示(_N)"
+#: ../ui/gtk/help-overlay.ui.h:11
+msgctxt "shortcut window"
+msgid "Jump to search box"
+msgstr ""
 
-#: ../../ui/composer.glade:164
-msgid "Small"
-msgstr "小"
+#: ../ui/gtk/help-overlay.ui.h:12
+#, fuzzy
+#| msgid "Add label to conversation"
+msgctxt "shortcut window"
+msgid "Find in current conversation"
+msgstr "スレッドにラベルを付ける"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:42
-msgid "Spam"
-msgstr "迷惑メール"
+#: ../ui/gtk/help-overlay.ui.h:13
+msgctxt "shortcut window"
+msgid "Find next/previous in current conversation"
+msgstr ""
 
-#: ../../src/engine/api/geary-special-folder-type.vala:33
-msgid "Starred"
-msgstr "スター"
+#: ../ui/gtk/help-overlay.ui.h:14
+#, fuzzy
+#| msgid "Notifications"
+msgctxt "shortcut window"
+msgid "Actions"
+msgstr "通知"
 
-#: ../../ui/login.glade:761
-msgid "Storage"
-msgstr "ストレージ"
+#: ../ui/gtk/help-overlay.ui.h:15
+#, fuzzy
+#| msgid "Compose Message"
+msgctxt "shortcut window"
+msgid "Compose a new message"
+msgstr "メッセージを作成"
 
-#: ../../ui/composer.glade:134
-msgid "Strikethrough (Ctrl+K)"
-msgstr "取り消し線(Ctrl+K)"
+#: ../ui/gtk/help-overlay.ui.h:16
+#, fuzzy
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to sender "
+msgstr "全員に返信(_A)"
 
-#: ../../src/client/views/conversation-viewer.vala:617
-msgid "Subject:"
-msgstr "件名:"
+#: ../ui/gtk/help-overlay.ui.h:17
+#, fuzzy
+#| msgid "Reply to _All"
+msgctxt "shortcut window"
+msgid "Reply to all"
+msgstr "全員に返信(_A)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:216
-#, c-format
-msgid "Subject: %s\n"
-msgstr "件名: %s\n"
+#: ../ui/gtk/help-overlay.ui.h:18
+#, fuzzy
+#| msgid "_Forward"
+msgctxt "shortcut window"
+msgid "Forward"
+msgstr "転送(_F)"
 
-#: ../../src/client/util/util-files.vala:19
-msgctxt "Abbreviation for terabyte"
-msgid "TB"
-msgstr "TB"
+#: ../ui/gtk/help-overlay.ui.h:19
+#, fuzzy
+#| msgid "_Archive"
+msgctxt "shortcut window"
+msgid "Archive"
+msgstr "アーカイブ(_A)"
 
-#: ../../src/client/geary-controller.vala:1493
-#, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
-msgstr "\"%s\" は既に存在します. 上書きしますか?"
+#: ../ui/gtk/help-overlay.ui.h:20
+msgctxt "shortcut window"
+msgid "Move to trash"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:747
-msgid ""
-"The version number of the local mail database is formatted for a newer "
-"version of Geary. Unfortunately, the database cannot be \"rolled back\" to "
-"work with this version of Geary.\n"
-"\n"
-"Please install the latest version of Geary and try again."
+#: ../ui/gtk/help-overlay.ui.h:21
+msgctxt "shortcut window"
+msgid "Toggle spam"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:758
-msgid ""
-"There was an error opening the local account. This is probably due to "
-"connectivity issues.\n"
-"\n"
-"Please check your network connection and restart Geary."
+#: ../ui/gtk/help-overlay.ui.h:22
+#, fuzzy
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "Move the conversation"
+msgstr "スレッドを移動"
+
+#: ../ui/gtk/help-overlay.ui.h:23
+#, fuzzy
+#| msgid "Add label to conversation"
+msgctxt "shortcut window"
+msgid "Label the conversation"
+msgstr "スレッドにラベルを付ける"
+
+#: ../ui/gtk/help-overlay.ui.h:24
+#, fuzzy
+#| msgid "_Mark as Unread"
+msgctxt "shortcut window"
+msgid "Mark read"
+msgstr "未読としてマーク(_M)"
+
+#: ../ui/gtk/help-overlay.ui.h:25
+#, fuzzy
+#| msgid "_Mark as Unread"
+msgctxt "shortcut window"
+msgid "Mark unread"
+msgstr "未読としてマーク(_M)"
+
+#: ../ui/gtk/help-overlay.ui.h:26
+msgctxt "shortcut window"
+msgid "View"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:737
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to a file permissions problem.\n"
-"\n"
-"Please check that you have read/write permissions for all files in this "
-"directory:\n"
-"\n"
-"%s"
+#: ../ui/gtk/help-overlay.ui.h:27
+msgctxt "shortcut window"
+msgid "Zoom in"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:702
-#, c-format
-msgid ""
-"There was an error opening the local mail database for this account. This is "
-"possibly due to corruption of the database file in this directory:\n"
-"\n"
-"%s\n"
-"\n"
-"Geary can rebuild the database and re-synchronize with the server or exit.\n"
-"\n"
-"Rebuilding the database will destroy all local email and its attachments. "
-"<b>The mail on the your server will not be affected.</b>"
+#: ../ui/gtk/help-overlay.ui.h:28
+msgctxt "shortcut window"
+msgid "Zoom out"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:1147
-msgid "This link appears to go to"
+#: ../ui/gtk/help-overlay.ui.h:29
+msgctxt "shortcut window"
+msgid "Reset zoom"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:508
-msgid "This message contains remote images."
+#: ../ui/gtk/help-overlay.ui.h:30
+msgctxt "shortcut window"
+msgid "Additional Shortcuts"
 msgstr ""
 
-#: ../../ui/composer.glade:435
-msgid "To add them as attachments"
-msgstr "添付ファイルとして追加"
+#: ../ui/gtk/help-overlay.ui.h:31
+#, fuzzy
+#| msgid "_Star"
+msgctxt "shortcut window"
+msgid "Star"
+msgstr "スター(_S)"
 
-#: ../../src/client/views/conversation-viewer.vala:608
-msgid "To:"
-msgstr "宛先:"
+#: ../ui/gtk/help-overlay.ui.h:32
+#, fuzzy
+#| msgid "U_nstar"
+msgctxt "shortcut window"
+msgid "Unstar"
+msgstr "スターをはずす(_N)"
 
-#: ../../src/engine/rfc822/rfc822-utils.vala:220
-#, c-format
-msgid "To: %s\n"
-msgstr "宛先: %s\n"
+#: ../ui/gtk/help-overlay.ui.h:33
+#, fuzzy
+#| msgid "_Delete"
+msgctxt "shortcut window"
+msgid "Delete"
+msgstr "削除(_D)"
 
-#: ../../src/engine/api/geary-special-folder-type.vala:45
-msgid "Trash"
-msgstr "ごみ箱"
+#: ../ui/gtk/help-overlay.ui.h:34
+#, fuzzy
+#| msgid "Move conversation"
+msgctxt "shortcut window"
+msgid "Jump to next (older) conversation"
+msgstr "スレッドを移動"
 
-#: ../../src/client/geary-controller.vala:294
-msgid "U_nstar"
-msgstr "スターをはずす(_N)"
+#: ../ui/gtk/help-overlay.ui.h:35
+msgctxt "shortcut window"
+msgid "Jump to previous (newer) conversation"
+msgstr ""
 
-#: ../../src/client/dialogs/password-dialog.vala:17
-msgid "Unable to login to email server"
-msgstr "ログインに失敗しました"
+#: ../ui/gtk/help-overlay.ui.h:36
+#, fuzzy
+#| msgid "Composer"
+msgid "Composer Shortcuts"
+msgstr "作成画面"
 
-#: ../../src/client/geary-controller.vala:736
-#: ../../src/client/geary-controller.vala:746
-#: ../../src/client/geary-controller.vala:757
-#, c-format
-msgid "Unable to open local mailbox for %s"
+#: ../ui/gtk/help-overlay.ui.h:37
+msgctxt "shortcut window"
+msgid "Quote text"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:701
-#, c-format
-msgid "Unable to open the database for %s"
+#: ../ui/gtk/help-overlay.ui.h:38
+msgctxt "shortcut window"
+msgid "Unquote text"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:713
-#, c-format
-msgid "Unable to rebuild database for \"%s\""
+#: ../ui/gtk/help-overlay.ui.h:39
+#, fuzzy
+#| msgid "_Send"
+msgctxt "shortcut window"
+msgid "Send"
+msgstr "送信(_S)"
+
+#: ../ui/gtk/help-overlay.ui.h:40
+#, fuzzy
+#| msgid "Cannot add attachment"
+msgctxt "shortcut window"
+msgid "Add attachment"
+msgstr "添付できません"
+
+#: ../ui/gtk/help-overlay.ui.h:41
+msgctxt "shortcut window"
+msgid "Rich text mode"
 msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:619
-msgid "Unable to validate:\n"
-msgstr "検証できません: \n"
+#: ../ui/gtk/help-overlay.ui.h:42
+msgctxt "shortcut window"
+msgid "Bold text"
+msgstr ""
 
-#: ../../ui/composer.glade:127
-msgid "Underline (Ctrl+U)"
+#: ../ui/gtk/help-overlay.ui.h:43
+msgctxt "shortcut window"
+msgid "Italicize text"
+msgstr ""
+
+#: ../ui/gtk/help-overlay.ui.h:44
+#, fuzzy
+#| msgid "Underline (Ctrl+U)"
+msgctxt "shortcut window"
+msgid "Underline text"
 msgstr "下線(Ctrl+U)"
 
-#: ../../ui/composer.glade:88
-msgid "Unquote text (Ctrl+[)"
+#: ../ui/gtk/help-overlay.ui.h:45
+msgctxt "shortcut window"
+msgid "Strike text"
 msgstr ""
 
-#: ../../src/client/geary-args.vala:65
-#, c-format
-msgid "Unrecognized command line option \"%s\"\n"
-msgstr "不明なオプション \"%s\"\n"
+#: ../ui/gtk/help-overlay.ui.h:46
+msgctxt "shortcut window"
+msgid "Insert a link"
+msgstr ""
 
-#: ../../ui/login.glade:457
-msgid "User_name:"
-msgstr "ユーザー名(_N):"
+#: ../ui/gtk/help-overlay.ui.h:47
+#, fuzzy
+#| msgid "Remove formatting (Ctrl+Space)"
+msgctxt "shortcut window"
+msgid "Remove formatting"
+msgstr "書式をリセット(Ctrl+Space)"
 
-#: ../../ui/password-dialog.glade:70 ../../ui/password-dialog.glade:181
-msgid "Username:"
-msgstr "ユーザー名:"
+#: ../ui/gtk/menus.ui.h:2
+msgid "A_ccounts"
+msgstr "アカウント(_C)"
 
-#: ../../src/client/geary-application.vala:19
-msgid "Visit the Yorba web site"
-msgstr "Yorba のウェブサイト"
+#: ../ui/gtk/menus.ui.h:4
+msgid "_Keyboard Shortcuts"
+msgstr ""
 
-#: ../../src/client/accounts/add-edit-page.vala:190
-#, c-format
-msgid "Welcome to Geary."
-msgstr "Geary へようこそ"
+#: ../ui/login.glade.h:1
+msgid "email example com"
+msgstr ""
 
-#: ../../ui/login.glade:252
-msgid "Work, Home, etc."
+#: ../ui/login.glade.h:2 ../ui/password-dialog.glade.h:3
+msgid "Password"
 msgstr ""
 
-#: ../../src/engine/api/geary-service-provider.vala:55
-msgid "Yahoo! Mail"
-msgstr "Yahoo! Mail"
+#: ../ui/login.glade.h:3
+#, fuzzy
+#| msgid "Email address:"
+msgid "E_mail address"
+msgstr "メールアドレス:"
 
-#: ../../src/client/util/util-date.vala:177
-msgid "Yesterday"
-msgstr ""
+#: ../ui/login.glade.h:4
+#, fuzzy
+#| msgid "_Password:"
+msgid "_Password"
+msgstr "パスワード(_P):"
 
-#: ../../src/client/geary-controller.vala:552
-msgid ""
-"Your IMAP and/or SMTP settings do not specify SSL or TLS.  This means your "
-"username and password could be read by another person on the network.  Are "
-"you sure you want to do this?"
-msgstr ""
-"IMAP/SMTP の通信に SSL/TLS が指定されていません. ユーザー名やパスワードはネッ"
-"トワーク上の他人に読み取られる可能性があります. よろしいですか?"
+#: ../ui/login.glade.h:5
+#, fuzzy
+#| msgid "Service:"
+msgid "S_ervice"
+msgstr "メールサービス:"
 
-#: ../../src/client/geary-controller.vala:551
-msgid "Your settings are insecure"
-msgstr "設定がセキュアでありません"
+#: ../ui/login.glade.h:6
+#, fuzzy
+#| msgid "N_ame:"
+msgid "N_ame"
+msgstr "名前(_A):"
 
-#: ../../src/client/geary-controller.vala:258
-#: ../../src/client/ui/stock.vala:21
-msgid "_About"
-msgstr "このアプリケーションについて(_A)"
+#: ../ui/login.glade.h:8
+#, fuzzy
+#| msgid "N_ickname:"
+msgid "N_ickname"
+msgstr "ニックネーム(_I):"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:22
-msgid "_Add"
-msgstr "追加(_A)"
+#: ../ui/login.glade.h:9
+msgid "Work, Home, etc."
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:47
-msgid "_Archive"
-msgstr "アーカイブ(_A)"
+#: ../ui/login.glade.h:10
+#, fuzzy
+#| msgid "Sent Mail"
+msgid "_Save sent mail"
+msgstr "送信済みメール"
 
-#: ../../src/client/dialogs/attachment-dialog.vala:23
-msgid "_Attach"
-msgstr "添付(_A)"
+#: ../ui/login.glade.h:11
+msgid "Addi_tional email addresses…"
+msgstr ""
 
-#: ../../ui/composer.glade:525
-msgid "_Attach File"
-msgstr "ファイルを添付(_A)"
+#: ../ui/login.glade.h:12
+msgid "IMAP settings"
+msgstr "IMAP 設定"
 
-#: ../../ui/preferences.glade:69
-msgid "_Automatically select next message"
-msgstr "自動的に次のメッセージを選択(_A)"
+#: ../ui/login.glade.h:13
+#, fuzzy
+#| msgid "Se_rver:"
+msgid "Se_rver"
+msgstr "サーバー(_R):"
 
-#: ../../src/client/ui/stock.vala:19
-msgid "_Cancel"
-msgstr "キャンセル(_C)"
+#: ../ui/login.glade.h:14
+msgid "imap.example.com"
+msgstr ""
 
-#: ../../ui/composer.glade:52
-msgid "_Center"
-msgstr "中央揃え(_C)"
+#: ../ui/login.glade.h:15
+#, fuzzy
+#| msgid "P_ort:"
+msgid "P_ort"
+msgstr "ポート(_O):"
 
-#: ../../src/client/ui/stock.vala:23
-msgid "_Close"
+#: ../ui/login.glade.h:16
+msgid "smtp.example.com"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:889
-msgid "_Copy"
-msgstr "コピー(_C)"
+#: ../ui/login.glade.h:17
+#, fuzzy
+#| msgid "Ser_ver:"
+msgid "Ser_ver"
+msgstr "サーバー(_V):"
 
-#: ../../src/client/geary-controller.vala:42
-msgid "_Delete"
-msgstr "削除(_D)"
+#: ../ui/login.glade.h:18
+#, fuzzy
+#| msgid "Por_t:"
+msgid "Por_t"
+msgstr "ポート(_T):"
+
+#: ../ui/login.glade.h:19
+msgid "SMTP settings"
+msgstr "SMTP 設定"
 
-#: ../../ui/password-dialog.glade:548
-msgid "_Details"
-msgstr "詳細(_D)"
+#: ../ui/login.glade.h:20
+#, fuzzy
+#| msgid "User_name:"
+msgid "User_name"
+msgstr "ユーザー名(_N):"
 
-#: ../../src/client/ui/stock.vala:24
-msgid "_Discard"
-msgstr ""
+#: ../ui/login.glade.h:21
+#, fuzzy
+#| msgid "Pass_word:"
+msgid "Pass_word"
+msgstr "パスワード(_W):"
 
-#: ../../ui/preferences.glade:90
-msgid "_Display conversation preview"
+#: ../ui/login.glade.h:22
+msgid "SMTP username"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:262
-msgid "_Donate"
+#: ../ui/login.glade.h:23
+msgid "SMTP password"
 msgstr ""
 
-#: ../../ui/login.glade:782
-msgid "_Download mail:"
-msgstr "メールをダウンロード(_D):"
+#: ../ui/login.glade.h:24
+#, fuzzy
+#| msgid "_Username:"
+msgid "_Username"
+msgstr "ユーザー名(_U):"
 
-#: ../../ui/composer.glade:181
-msgid "_Fixed Width"
+#: ../ui/login.glade.h:25
+msgid "IMAP username"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:328
-#: ../../src/client/views/conversation-viewer.vala:1457
-msgid "_Forward"
-msgstr "転送(_F)"
-
-#: ../../src/client/geary-controller.vala:254
-#: ../../src/client/ui/stock.vala:25
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: ../../ui/composer.glade:542
-msgid "_Include Original Attachments"
+#: ../ui/login.glade.h:26
+msgid "IMAP password"
 msgstr ""
 
-#: ../../src/client/views/conversation-viewer.vala:922
-msgid "_Inspect"
-msgstr "検証(_I)"
+#: ../ui/login.glade.h:27
+#, fuzzy
+#| msgid "Encr_yption:"
+msgid "Encr_yption"
+msgstr "暗号化(_Y):"
 
-#: ../../ui/composer.glade:57
-msgid "_Justify"
-msgstr "両端揃え(_J)"
+#: ../ui/login.glade.h:28
+#, fuzzy
+#| msgid "Encrypt_ion:"
+msgid "Encrypt_ion"
+msgstr "暗号化(_I):"
 
-#: ../../src/client/ui/stock.vala:33
-msgid "_Keep"
+#: ../ui/login.glade.h:30
+msgid "SSL/TLS"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:305
-msgid "_Label"
-msgstr "ラベル(_L)"
+#: ../ui/login.glade.h:31
+msgid "STARTTLS"
+msgstr "STARTTLS"
 
-#: ../../ui/composer.glade:42
-msgid "_Left"
-msgstr "左揃え(_L)"
+#: ../ui/login.glade.h:32
+msgid "No authentication re_quired"
+msgstr "認証は必要とされていません(_Q)"
 
-#: ../../src/client/views/conversation-viewer.vala:1469
-msgid "_Mark as Read"
-msgstr "既読としてマーク(_M)"
+#: ../ui/login.glade.h:33
+#, fuzzy
+#| msgid "IMAP Credentials"
+msgid "Use IMAP cre_dentials"
+msgstr "IMAP 証明書"
 
-#: ../../src/client/views/conversation-viewer.vala:1473
-msgid "_Mark as Unread"
-msgstr "未読としてマーク(_M)"
+#: ../ui/login.glade.h:34
+msgid "Composer"
+msgstr "作成画面"
 
-#: ../../src/client/geary-controller.vala:271
-msgid "_Mark as..."
-msgstr "名前を付けてマーク(_M)"
+#: ../ui/login.glade.h:35
+msgid "Save dra_fts on server"
+msgstr ""
 
-#: ../../ui/composer.glade:157
-msgid "_Medium"
+#: ../ui/login.glade.h:36
+msgid "Si_gn emails (HTML allowed):"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:309
-msgid "_Move"
-msgstr "移動(_M)"
+#: ../ui/login.glade.h:37
+msgid "Storage"
+msgstr "ストレージ"
 
-#: ../../src/client/ui/stock.vala:18
-msgid "_OK"
+#: ../ui/login.glade.h:38
+#, fuzzy
+#| msgid "_Download mail:"
+msgid "_Download mail"
+msgstr "メールをダウンロード(_D):"
+
+#: ../ui/main-toolbar.ui.h:1
+msgid "Empty Spam or Trash folders"
 msgstr ""
 
-#: ../../src/client/ui/stock.vala:26
-msgid "_Open"
+#: ../ui/password-dialog.glade.h:1
+msgid "SMTP Credentials"
+msgstr "SMTP 証明書"
+
+#: ../ui/password-dialog.glade.h:2
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "ユーザー名:"
+
+#: ../ui/password-dialog.glade.h:4
+#, fuzzy
+#| msgid "_Remember passwords"
+msgid "_Remember password"
+msgstr "パスワードを保存(_R)"
+
+#: ../ui/password-dialog.glade.h:6
+msgid "_Authenticate"
 msgstr ""
 
-#: ../../ui/login.glade:131 ../../ui/login.glade:539
-#: ../../ui/password-dialog.glade:85
-msgid "_Password:"
-msgstr "パスワード(_P):"
+#: ../ui/preferences-dialog.ui.h:1
+msgid "Reading"
+msgstr "表示画面"
 
-#: ../../ui/composer.glade:35
-msgid "_Paste"
+#: ../ui/preferences-dialog.ui.h:2
+msgid "_Automatically select next message"
+msgstr "自動的に次のメッセージを選択(_A)"
+
+#: ../ui/preferences-dialog.ui.h:3
+msgid "_Display conversation preview"
+msgstr ""
+
+#: ../ui/preferences-dialog.ui.h:4
+msgid "Use _three pane view"
 msgstr ""
 
-#: ../../ui/preferences.glade:172
+#: ../ui/preferences-dialog.ui.h:5
+msgid "Notifications"
+msgstr "通知"
+
+#: ../ui/preferences-dialog.ui.h:6
 msgid "_Play notification sounds"
 msgstr "通知音を再生(_P)"
 
-#: ../../src/client/geary-controller.vala:250
-#: ../../src/client/ui/stock.vala:27
-msgid "_Preferences"
-msgstr "設定(_P)"
+#: ../ui/preferences-dialog.ui.h:7
+msgid "Show _notifications for new mail"
+msgstr "新着メールに通知を表示(_N)"
+
+#: ../ui/preferences-dialog.ui.h:8
+#, fuzzy
+#| msgid "Show _notifications for new mail"
+msgid "Always _watch for new mail"
+msgstr "新着メールに通知を表示(_N)"
 
-#: ../../src/client/ui/stock.vala:28
-msgid "_Print..."
+#: ../ui/preferences-dialog.ui.h:9
+msgid "Geary will run in the background and notify of new mail"
 msgstr ""
 
-#: ../../src/client/geary-controller.vala:266
-#: ../../src/client/ui/stock.vala:29
-msgid "_Quit"
-msgstr "終了(_Q)"
+#: ../ui/preferences-dialog.ui.h:10
+#, fuzzy
+#| msgid "_Preferences"
+msgid "Preferences"
+msgstr "設定(_P)"
 
-#: ../../src/client/geary-controller.vala:704
-msgid "_Rebuild"
+#: ../ui/remove_confirm.glade.h:1
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Are you sure you want to remove this "
+"account?</span> "
 msgstr ""
+"<span weight=\"bold\" size=\"larger\">このアカウントを削除してもよろしいです"
+"か?</span> "
 
-#: ../../ui/composer.glade:14
-msgid "_Redo"
+#: ../ui/remove_confirm.glade.h:2
+msgid ""
+"All email associated with this account will be removed from your computer. "
+"This will not affect email on the server."
 msgstr ""
+"このアカウントに関連づけされた全てのメールは、コンピューターから削除されます."
+"これは、サーバー上のメールには影響を与えません."
 
-#: ../../ui/password-dialog.glade:561
-msgid "_Remember passwords"
-msgstr "パスワードを保存(_R)"
+#: ../ui/remove_confirm.glade.h:3
+msgid "Nickname:"
+msgstr "ニックネーム:"
 
-#: ../../src/client/ui/stock.vala:30
-msgid "_Remove"
-msgstr "削除(_R)"
+#: ../ui/remove_confirm.glade.h:4
+msgid "Email address:"
+msgstr "メールアドレス:"
 
-#: ../../src/client/geary-controller.vala:1496
-msgid "_Replace"
-msgstr "置換(_R)"
+#: ../ui/upgrade_dialog.glade.h:1
+msgid "Geary update in progress…"
+msgstr ""
 
-#: ../../src/client/geary-controller.vala:317
-#: ../../src/client/views/conversation-viewer.vala:1447
-msgid "_Reply"
-msgstr "返信(_R)"
+#~ msgid "Archive conversation (Delete, Backspace, A)"
+#~ msgstr "スレッドをアーカイブ (Delete, Backspace, A)"
 
-#: ../../ui/composer.glade:141
-msgid "_Rich Text"
-msgstr ""
+#~ msgid "Copyright 2011-2013 Yorba Foundation"
+#~ msgstr "Copyright 2011-2013 Yorba Foundation"
 
-#: ../../ui/composer.glade:47
-msgid "_Right"
-msgstr "右揃え(_R)"
+#~ msgid "Date:"
+#~ msgstr "日時:"
 
-#: ../../src/client/accounts/account-dialog-add-edit-pane.vala:48
-#: ../../src/client/ui/stock.vala:31
-msgid "_Save"
-msgstr "保存(_S)"
+#~ msgid "Large"
+#~ msgstr "大"
 
-#: ../../src/client/views/conversation-viewer.vala:1395
-msgid "_Save As..."
-msgstr "名前を付けて保存(_S)..."
+#~ msgid "Link (Ctrl+L)"
+#~ msgstr "リンク(Ctrl+L)"
 
-#: ../../src/client/views/conversation-viewer.vala:1414
-msgid "_Save Image As..."
-msgstr ""
+#~ msgid "Mail Client"
+#~ msgstr "メールクライアント"
 
-#: ../../ui/composer.glade:594
-msgid "_Send"
-msgstr "送信(_S)"
+#~ msgid "Medium"
+#~ msgstr "中"
 
-#: ../../ui/composer.glade:163
-msgid "_Small"
-msgstr ""
+#~ msgid "Password:"
+#~ msgstr "パスワード:"
 
-#: ../../src/client/geary-controller.vala:289
-msgid "_Star"
-msgstr "スター(_S)"
+#~ msgid "Port:"
+#~ msgstr "ポート:"
 
-#: ../../ui/composer.glade:7
-msgid "_Undo"
-msgstr ""
+#~ msgid "Real name:"
+#~ msgstr "本名:"
 
-#: ../../ui/login.glade:522
-msgid "_Username:"
-msgstr "ユーザー名(_U):"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#: ../../src/client/views/conversation-viewer.vala:1494
-msgid "_View Source"
-msgstr "ソースを表示(_V)"
+#~ msgid "SSL/TLS encryption:"
+#~ msgstr "SSL/TLS 暗号化:"
 
-#. / A list of keywords, separated by pipe ("|") characters, that suggest an attachment
-#: ../../src/client/composer/composer-window.vala:90
-msgid "attach|enclosed|enclosing|cover letter"
-msgstr ""
+#~ msgid "Sans Serif"
+#~ msgstr "ゴシック体"
 
-#: ../../src/client/views/conversation-viewer.vala:1148
-msgid "but actually goes to"
-msgstr ""
+#~ msgid "Serif"
+#~ msgstr "明朝体"
 
-#: ../../src/client/util/util-files.vala:16
-msgid "bytes"
-msgstr "バイト"
+#~ msgid "Server:"
+#~ msgstr "サーバー:"
 
-#. / Placeholder filename for attachments with no filename.
-#: ../../src/client/views/conversation-viewer.vala:1799
-#: ../../src/engine/rfc822/rfc822-utils.vala:327
-msgid "none"
-msgstr "無題"
+#~ msgid "Small"
+#~ msgstr "小"
 
-#: ../../src/client/views/conversation-find-bar.vala:226
-msgid "not found"
-msgstr ""
+#~ msgid "Unable to login to email server"
+#~ msgstr "ログインに失敗しました"
 
-#. / Translators: add your name and email address to receive credit in the About dialog
-#. / For example: Yamada Taro <yamada taro example com>
-#: ../../src/client/geary-controller.vala:1230
-msgid "translator-credits"
-msgstr "Minato Kanzaki <pikadcolon gmail com>"
+#~ msgid "_Center"
+#~ msgstr "中央揃え(_C)"
+
+#~ msgid "_Details"
+#~ msgstr "詳細(_D)"
+
+#~ msgid "_Justify"
+#~ msgstr "両端揃え(_J)"
+
+#~ msgid "_Left"
+#~ msgstr "左揃え(_L)"
+
+#~ 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]