diff --git a/po/ja.po b/po/ja.po
index 2fddb5e6..92205765 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: geary-0.4.1\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/geary/issues\n"
-"POT-Creation-Date: 2019-08-29 23:05+0000\n"
-"PO-Revision-Date: 2019-03-07 19:05+0900\n"
+"POT-Creation-Date: 2019-09-06 01:06+0000\n"
+"PO-Revision-Date: 2019-09-06 23:30+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese (Japan) (https://l10n.gnome.org/module/geary/)\n"
 "Language: ja\n"
@@ -720,10 +720,8 @@ msgstr "GNOME オンラインアカウント"
 #. Translators: This label describes an account
 #. preference.
 #: src/client/accounts/accounts-editor-servers-pane.vala:611
-#, fuzzy
-#| msgid "Save sent email on server"
 msgid "Save draft email on server"
-msgstr "送信メールをサーバーに保存"
+msgstr "下書きメールをサーバーに保存"
 
 #. Translators: This label describes an account
 #. preference.
@@ -753,17 +751,14 @@ msgstr "無題"
 
 #. / Notification title.
 #: src/client/application/application-controller.vala:551
-#, fuzzy, c-format
-#| msgid "A problem occurred sending mail for %s"
+#, c-format
 msgid "A problem occurred sending email for %s"
 msgstr "%s のメール送信時に問題が発生しました"
 
 #. / Notification body
 #: src/client/application/application-controller.vala:555
-#, fuzzy
-#| msgid "You will not be able to send or receive email until re-connected."
 msgid "Email will not be sent until re-connected"
-msgstr "再接続するまでメールの送受信はできません。"
+msgstr "再接続するまでメールを送信しません"
 
 #: src/client/application/application-controller.vala:906
 msgid "Labels"
@@ -944,14 +939,12 @@ msgstr "Geary のウェブサイト"
 #. / Command line option
 #: src/client/application/geary-application.vala:109
 msgid "Print debug logging"
-msgstr ""
+msgstr "デバッグログを表示する"
 
 #. / Command line option
 #: src/client/application/geary-application.vala:112
-#, fuzzy
-#| msgid "Start Geary with hidden main window"
 msgid "Start with the main window hidden (deprecated)"
-msgstr "メインウィンドウを隠して Geary を起動する"
+msgstr "メインウィンドウを隠して起動する (非推奨)"
 
 #. / Command line option
 #: src/client/application/geary-application.vala:115
@@ -965,10 +958,8 @@ msgstr "スレッドのモニタリングを記録する"
 
 #. / Command line option
 #: src/client/application/geary-application.vala:121
-#, fuzzy
-#| msgid "Log network deserialization"
 msgid "Log IMAP network deserialization"
-msgstr "ネットワークのデシリアライズを記録する"
+msgstr "IMAP ネットワークのデシリアライズを記録する"
 
 #. / Command line option. "Normalization" can also be called
 #. / "synchronization".
@@ -997,10 +988,8 @@ msgstr "IMAP のイベントキューを記録する"
 #. / responses are converted into a stream of bytes for
 #. / network transmission
 #: src/client/application/geary-application.vala:141
-#, fuzzy
-#| msgid "Log network serialization"
 msgid "Log IMAP network serialization"
-msgstr "ネットワークのストリームを記録する"
+msgstr "IMAP ネットワークのストリームを記録する"
 
 #. / Command line option
 #: src/client/application/geary-application.vala:144
@@ -1026,11 +1015,8 @@ msgstr "プログラムのバージョンを表示する"
 
 #. / Application runtime information label
 #: src/client/application/geary-application.vala:280
-#, fuzzy
-#| msgid "Mark conversation"
-#| msgid_plural "Mark conversations"
 msgid "Geary version"
-msgstr "スレッドをマーク"
+msgstr ""
 
 #. / Application runtime information label
 #: src/client/application/geary-application.vala:282
@@ -1079,7 +1065,7 @@ msgstr ""
 msgid "Installation prefix"
 msgstr ""
 
-#: src/client/application/geary-application.vala:490
+#: src/client/application/geary-application.vala:510
 #, c-format
 msgid "About %s"
 msgstr "%s について"
@@ -1087,7 +1073,7 @@ msgstr "%s について"
 #. Translators: add your name and email address to receive
 #. credit in the About dialog For example: Yamada Taro
 #. <yamada.taro@example.com>
-#: src/client/application/geary-application.vala:494
+#: src/client/application/geary-application.vala:514
 msgid "translator-credits"
 msgstr ""
 "masami chikahiro <cmasa.z321@gmail.com>\n"
@@ -1098,17 +1084,16 @@ msgstr ""
 
 #. / Warning printed to the console when a deprecated
 #. / command line option is used.
-#: src/client/application/geary-application.vala:778
+#: src/client/application/geary-application.vala:798
 msgid "The `--hidden` option is deprecated and will be removed in the future."
-msgstr ""
+msgstr "`--hidden` オプションは非推奨です。将来的に削除されます。"
 
 #. / Command line warning, string substitution
 #. / is the given argument
-#: src/client/application/geary-application.vala:810
-#, fuzzy, c-format
-#| msgid "Unrecognized command line option “%s”\n"
+#: src/client/application/geary-application.vala:830
+#, c-format
 msgid "Unrecognised program argument: “%s”"
-msgstr "不明なコマンドラインオプション“%s”\n"
+msgstr "不明な引数です: “%s”"
 
 #: src/client/components/components-inspector.vala:68
 #, fuzzy
@@ -1137,10 +1122,8 @@ msgstr ""
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:210
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:213
 #: ui/problem-details-dialog.ui:42
-#, fuzzy
-#| msgid "_Save As..."
 msgid "Save As"
-msgstr "名前を付けて保存(_S)..."
+msgstr "名前を付けて保存"
 
 #: src/client/components/components-inspector.vala:202
 #: src/client/dialogs/dialogs-problem-details-dialog.vala:214
@@ -1190,23 +1173,16 @@ msgid_plural "Move conversations"
 msgstr[0] "スレッドを移動"
 
 #: src/client/components/main-toolbar.vala:154
-#, fuzzy
-#| msgid "Archive conversation (A)"
-#| msgid_plural "Archive conversations (A)"
 msgid "Archive conversation"
 msgid_plural "Archive conversations"
-msgstr[0] "スレッドをアーカイブに移動(A)"
+msgstr[0] "スレッドをアーカイブに移動"
 
 #: src/client/components/main-toolbar.vala:163
-#, fuzzy
-#| msgid "Move conversations"
 msgid "Move conversation to Trash"
 msgid_plural "Move conversations to Trash"
-msgstr[0] "スレッドを移動"
+msgstr[0] "スレッドをごみ箱に移動"
 
 #: src/client/components/main-toolbar.vala:171
-#, fuzzy
-#| msgid "Delete conversation"
 msgid "Delete conversation"
 msgid_plural "Delete conversations"
 msgstr[0] "スレッドを削除"
@@ -1225,19 +1201,17 @@ msgstr "アカウントの問題"
 #. Translators: Info bar sub-title for a generic account
 #. problem. String substitution is the account name.
 #: src/client/components/main-window-info-bar.vala:48
-#, fuzzy, c-format
-#| msgid "Geary has encountered a problem"
+#, c-format
 msgid "Geary has encountered a problem with %s."
-msgstr "Geary に問題が発生しました"
+msgstr "%s で問題が発生しました。"
 
 #. Translators: Info bar sub-title for a generic
 #. account problem. String substitution is the
 #. account name.
 #: src/client/components/main-window-info-bar.vala:61
-#, fuzzy, c-format
-#| msgid "Geary encountered a problem connecting to an account."
+#, c-format
 msgid "Geary encountered a problem checking mail for %s."
-msgstr "アカウントへの接続時に問題が発生しました。"
+msgstr "%s のメール確認時に問題が発生しました。"
 
 #. Translators: Tooltip label for Retry button
 #: src/client/components/main-window-info-bar.vala:65
@@ -1248,10 +1222,9 @@ msgstr "再接続を試行"
 #. account problem. String substitution is the
 #. account name
 #: src/client/components/main-window-info-bar.vala:73
-#, fuzzy, c-format
-#| msgid "Geary encountered a problem connecting to an account."
+#, c-format
 msgid "Geary encountered a problem sending email for %s."
-msgstr "アカウントへの接続時に問題が発生しました。"
+msgstr "%s のメール送信時に問題が発生しました。"
 
 #. Translators: Tooltip label for Retry button
 #: src/client/components/main-window-info-bar.vala:77
@@ -1267,11 +1240,8 @@ msgstr "Geary に問題が発生しました"
 #. Translators: Info bar sub-title for a generic
 #. application problem.
 #: src/client/components/main-window-info-bar.vala:88
-#, fuzzy
-#| msgid ""
-#| "Please check the technical details and report the problem if it persists."
 msgid "Please report the details if it persists."
-msgstr "問題が解決しない場合は、技術的な詳細情報を確認して報告してください。"
+msgstr "問題が解決しない場合は詳細を報告してください。"
 
 #. Translators: Button label for viewing technical details
 #. for a problem report.
@@ -1564,19 +1534,15 @@ msgstr "言語を検索"
 
 #. / Translators: Context menu item
 #: src/client/conversation-list/conversation-list-view.vala:337
-#, fuzzy
-#| msgid "Move conversations"
 msgid "Move conversation to _Trash"
 msgid_plural "Move conversations to _Trash"
-msgstr[0] "スレッドを移動"
+msgstr[0] "スレッドをごみ箱に移動(_T)"
 
 #. / Translators: Context menu item
 #: src/client/conversation-list/conversation-list-view.vala:347
-#, fuzzy
-#| msgid "Delete conversation"
 msgid "_Delete conversation"
 msgid_plural "_Delete conversations"
-msgstr[0] "スレッドを削除"
+msgstr[0] "スレッドを削除(_D)"
 
 #: src/client/conversation-list/conversation-list-view.vala:356
 #: ui/main-toolbar-menus.ui:5
@@ -1938,24 +1904,18 @@ msgstr "%A"
 #. / 12 hours format for datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:216
-#, fuzzy
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgid "%a, %b %-e, %Y at %l:%M %P"
 msgstr "%Y/%m/%d, %H:%M"
 
 #. / 24 hours format for the datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:220
-#, fuzzy
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgid "%a, %b %-e, %Y at %H:%M"
 msgstr "%Y/%m/%d, %H:%M"
 
 #. / Format for the datetime that a message being replied to was received
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #: src/client/util/util-date.vala:224
-#, fuzzy
-#| msgid "%a, %b %-e, %Y at %-l:%M %p"
 msgid "%a, %b %-e, %Y at %X"
 msgstr "%Y/%m/%d, %H:%M"
 
@@ -2606,19 +2566,13 @@ msgid "Select spell checking languages"
 msgstr "スペルチェックする言語を選択"
 
 #: ui/components-inspector-error-view.ui:33
-#, fuzzy
-#| msgid ""
-#| "If the problem is serious or persists, please copy and send these details "
-#| "to the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing "
-#| "list</a> or file a <a href=\"https://wiki.gnome.org/Apps/Geary/"
-#| "ReportingABug\">new bug report</a>."
 msgid ""
 "If the problem is serious or persists, please save and send these details to "
 "the <a href=\"https://wiki.gnome.org/Apps/Geary/Contact\">mailing list</a> "
 "or attach to a <a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug"
 "\">new bug report</a>."
 msgstr ""
-"問題が深刻な場合や継続して発生している場合は、詳細をコピーして<a href="
+"問題が深刻な場合や継続して発生している場合は、詳細を保存して<a href="
 "\"https://wiki.gnome.org/Apps/Geary/Contact\">メーリングリスト</a>に投稿する"
 "か、<a href=\"https://wiki.gnome.org/Apps/Geary/ReportingABug\">バグとして報"
 "告</a>してください。"
@@ -2643,10 +2597,8 @@ msgstr ""
 #. Tooltip for inspector button
 #. Tooltip for problem report button
 #: ui/components-inspector.ui:37 ui/problem-details-dialog.ui:19
-#, fuzzy
-#| msgid "Search for more languages"
 msgid "Search for matching log entries"
-msgstr "言語を検索"
+msgstr ""
 
 #. Tooltip for inspector button
 #. Tooltip for problem report button
@@ -2657,35 +2609,24 @@ msgstr ""
 #. Tooltip for inspector button
 #. Tooltip for problem report button
 #: ui/components-inspector.ui:84 ui/problem-details-dialog.ui:62
-#, fuzzy
-#| msgid "Copy to Clipboard"
 msgid "Copy to clipboard"
-msgstr "クリップボードにコピー"
+msgstr ""
 
 #: ui/conversation-contact-popover.ui:146
-#, fuzzy
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
 msgid "New Conversation…"
-msgstr "スレッドを移動"
+msgstr ""
 
 #: ui/conversation-contact-popover.ui:159
-#, fuzzy
-#| msgid "Copy Email _Address"
 msgid "Copy Email Address"
-msgstr "メールアドレスをコピー(_A)"
+msgstr "メールアドレスをコピー"
 
 #: ui/conversation-contact-popover.ui:182
-#, fuzzy
-#| msgid "Save and Close"
 msgid "Save in Contacts…"
-msgstr "保存して閉じる"
+msgstr ""
 
 #: ui/conversation-contact-popover.ui:195
-#, fuzzy
-#| msgid "Move conversations"
 msgid "Show Conversations"
-msgstr "スレッドを移動"
+msgstr "スレッドを表示"
 
 #: ui/conversation-contact-popover.ui:208
 msgid "Open in Contacts"
@@ -2697,17 +2638,13 @@ msgstr ""
 
 #. Title label on contact popover
 #: ui/conversation-contact-popover.ui:264
-#, fuzzy
-#| msgid "Invalid email address"
 msgid "Deceptive email address"
-msgstr "無効なメールアドレス"
+msgstr ""
 
 #. Contact popover label
 #: ui/conversation-contact-popover.ui:294
-#, fuzzy
-#| msgid "Email addresses"
 msgid "This email address is:"
-msgstr "メールアドレス"
+msgstr ""
 
 #. Contact popover label
 #: ui/conversation-contact-popover.ui:319
@@ -2794,18 +2731,13 @@ msgstr "ここから未読としてマーク(_H)"
 #. Translators: Menu item to move a single, specific message
 #. to the trash folder
 #: ui/conversation-email-menus.ui:50
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move to trash"
 msgid "Move message to _Trash"
-msgstr "ごみ箱に移動する"
+msgstr "メッセージをごみ箱に移動(_T)"
 
 #. Translators: Menu item to delete a single, specific message
 #: ui/conversation-email-menus.ui:57
-#, fuzzy
-#| msgid "_Delete…"
 msgid "_Delete message…"
-msgstr "削除(_D)…"
+msgstr "メッセージを削除(_D)…"
 
 #. Translators: Menu item to view the source for a message
 #: ui/conversation-email-menus.ui:69
@@ -2825,11 +2757,8 @@ msgid "Copy Link _Address"
 msgstr "リンクのアドレスをコピー(_A)"
 
 #: ui/conversation-message-menus.ui:17
-#, fuzzy
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
 msgid "_New Conversation…"
-msgstr "スレッドを移動"
+msgstr "新しいスレッド(_N)…"
 
 #: ui/conversation-message-menus.ui:21
 msgid "Copy Email _Address"
@@ -2946,20 +2875,14 @@ msgid "Actions"
 msgstr "アクション"
 
 #: ui/gtk/help-overlay.ui:17
-#, fuzzy
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
 msgctxt "shortcut window"
 msgid "New conversation"
-msgstr "スレッドを移動"
+msgstr "新しいスレッド"
 
 #: ui/gtk/help-overlay.ui:24
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Reply to sender "
 msgctxt "shortcut window"
 msgid "Reply to sender"
-msgstr "送信者に返信する "
+msgstr "送信者に返信する"
 
 #: ui/gtk/help-overlay.ui:31 ui/gtk/help-overlay.ui:282
 msgctxt "shortcut window"
@@ -2972,64 +2895,44 @@ msgid "Forward"
 msgstr "転送する"
 
 #: ui/gtk/help-overlay.ui:45 ui/gtk/help-overlay.ui:296
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Mark read"
 msgctxt "shortcut window"
 msgid "Un-mark/mark read"
-msgstr "既読としてマークする"
+msgstr "既読マークを付ける/外す"
 
 #: ui/gtk/help-overlay.ui:52 ui/gtk/help-overlay.ui:303
 msgctxt "shortcut window"
 msgid "Mark/un-mark starred"
-msgstr ""
+msgstr "星を付ける/外す"
 
 #: ui/gtk/help-overlay.ui:59 ui/gtk/help-overlay.ui:310
-#, fuzzy
-#| msgid "Archive conversation (A)"
-#| msgid_plural "Archive conversations (A)"
 msgctxt "shortcut window"
 msgid "Archive conversation"
-msgstr "スレッドをアーカイブに移動(A)"
+msgstr "スレッドをアーカイブに移動する"
 
 #: ui/gtk/help-overlay.ui:66 ui/gtk/help-overlay.ui:317
-#, fuzzy
-#| msgid "Move conversation"
-#| msgid_plural "Move conversations"
 msgctxt "shortcut window"
 msgid "Move conversation"
-msgstr "スレッドを移動"
+msgstr "スレッドを移動する"
 
 #: ui/gtk/help-overlay.ui:73 ui/gtk/help-overlay.ui:324
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Label the conversation"
 msgctxt "shortcut window"
 msgid "Label conversation"
 msgstr "スレッドにラベルを付ける"
 
 #: ui/gtk/help-overlay.ui:80
-#, fuzzy
-#| msgid "Mark conversation"
-#| msgid_plural "Mark conversations"
 msgctxt "shortcut window"
 msgid "Trash conversation"
-msgstr "スレッドをマーク"
+msgstr "スレッドをごみ箱に移動する"
 
 #: ui/gtk/help-overlay.ui:87 ui/gtk/help-overlay.ui:331
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move to trash"
 msgctxt "shortcut window"
 msgid "Move to Spam"
-msgstr "ごみ箱に移動する"
+msgstr "迷惑メールに移動する"
 
 #: ui/gtk/help-overlay.ui:95
-#, fuzzy
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Delete conversation"
-msgstr "スレッドを削除"
+msgstr "スレッドを削除する"
 
 #: ui/gtk/help-overlay.ui:104
 msgctxt "shortcut window"
@@ -3037,11 +2940,9 @@ msgid "Search"
 msgstr "検索"
 
 #: ui/gtk/help-overlay.ui:108
-#, fuzzy
-#| msgid "Mark conversations"
 msgctxt "shortcut window"
 msgid "Search for conversations"
-msgstr "スレッドをマーク"
+msgstr "スレッドを検索する"
 
 #: ui/gtk/help-overlay.ui:115
 msgctxt "shortcut window"
@@ -3049,8 +2950,6 @@ msgid "Find in current conversation"
 msgstr "現在のスレッド内を検索する"
 
 #: ui/gtk/help-overlay.ui:141
-#, fuzzy
-#| msgid "Undo"
 msgctxt "shortcut window"
 msgid "Undo"
 msgstr "元に戻す"
@@ -3058,12 +2957,12 @@ msgstr "元に戻す"
 #: ui/gtk/help-overlay.ui:145
 msgctxt "shortcut window"
 msgid "Undo the last action"
-msgstr ""
+msgstr "最後のアクションを元に戻す"
 
 #: ui/gtk/help-overlay.ui:152
 msgctxt "shortcut window"
 msgid "Redo the last action"
-msgstr ""
+msgstr "最後のアクションをやり直す"
 
 #: ui/gtk/help-overlay.ui:161
 msgctxt "shortcut window"
@@ -3101,12 +3000,9 @@ msgid "Show keyboard shortcuts"
 msgstr "キーボードショートカットを表示する"
 
 #: ui/gtk/help-overlay.ui:206
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Close composer window"
 msgctxt "shortcut window"
 msgid "Close current window"
-msgstr "作成ウィンドウを閉じる"
+msgstr "現在のウィンドウを閉じる"
 
 #: ui/gtk/help-overlay.ui:213
 msgctxt "shortcut window"
@@ -3116,61 +3012,42 @@ msgstr "アプリケーションを終了する"
 #: ui/gtk/help-overlay.ui:222
 msgctxt "shortcut window"
 msgid "Keyboard navigation"
-msgstr ""
+msgstr "キーボードナビゲーション"
 
 #: ui/gtk/help-overlay.ui:226
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
 msgid "Focus the next pane"
-msgstr "フォーカスを次/前のペインに移動する"
+msgstr "フォーカスを次のペインに移動する"
 
 #: ui/gtk/help-overlay.ui:233
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
 msgid "Focus the previous pane"
-msgstr "フォーカスを次/前のペインに移動する"
+msgstr "フォーカスを前のペインに移動する"
 
 #: ui/gtk/help-overlay.ui:240
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to conversation list"
 msgctxt "shortcut window"
 msgid "Focus the conversation list"
 msgstr "スレッドリストにフォーカスを移動する"
 
 #: ui/gtk/help-overlay.ui:247
-#, fuzzy
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Select the conversation down"
-msgstr "スレッドを削除"
+msgstr ""
 
 #: ui/gtk/help-overlay.ui:254
-#, fuzzy
-#| msgid "Delete conversation"
 msgctxt "shortcut window"
 msgid "Select the conversation up"
-msgstr "スレッドを削除"
+msgstr ""
 
 #: ui/gtk/help-overlay.ui:261
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Move focus to the next/previous pane"
 msgctxt "shortcut window"
 msgid "Focus next/previous message"
-msgstr "フォーカスを次/前のペインに移動する"
+msgstr "フォーカスを次/前のメッセージに移動する"
 
 #: ui/gtk/help-overlay.ui:271
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Show keyboard shortcuts"
 msgctxt "shortcut window"
 msgid "Single-key shortcuts"
-msgstr "キーボードショートカットを表示する"
+msgstr ""
 
 #: ui/gtk/help-overlay.ui:275
 msgctxt "shortcut window"
@@ -3202,8 +3079,6 @@ msgid "Detach composer window"
 msgstr "作成ウィンドウを分離する"
 
 #: ui/gtk/help-overlay.ui:385
-#, fuzzy
-#| msgid "Edit"
 msgctxt "shortcut window"
 msgid "Editing"
 msgstr "編集"
@@ -3211,19 +3086,17 @@ msgstr "編集"
 #: ui/gtk/help-overlay.ui:390
 msgctxt "shortcut window"
 msgid "Move selection to the clipboard"
-msgstr ""
+msgstr "選択範囲をクリップボードに移動する"
 
 #: ui/gtk/help-overlay.ui:397
-#, fuzzy
-#| msgid "Copy to Clipboard"
 msgctxt "shortcut window"
 msgid "Copy selection to clipboard"
-msgstr "クリップボードにコピー"
+msgstr "選択範囲をクリップボードにコピーする"
 
 #: ui/gtk/help-overlay.ui:404
 msgctxt "shortcut window"
 msgid "Paste from the clipboard"
-msgstr ""
+msgstr "クリップボードから貼り付ける"
 
 #: ui/gtk/help-overlay.ui:411
 msgctxt "shortcut window"
@@ -3236,20 +3109,14 @@ msgid "Unquote text"
 msgstr "テキストの引用を解除する"
 
 #: ui/gtk/help-overlay.ui:427
-#, fuzzy
-#| msgctxt "shortcut window"
-#| msgid "Rich text mode"
 msgctxt "shortcut window"
 msgid "Rich text editing"
-msgstr "リッチテキストモード"
+msgstr "リッチテキスト編集"
 
 #: ui/gtk/help-overlay.ui:431
-#, fuzzy
-#| msgctxt "Clipboard paste as plain text"
-#| msgid "Paste _Without Formatting"
 msgctxt "shortcut window"
 msgid "Paste without formatting"
-msgstr "書式なしで貼り付け(_W)"
+msgstr "書式なしで貼り付ける"
 
 #: ui/gtk/help-overlay.ui:438
 msgctxt "shortcut window"
@@ -3277,11 +3144,9 @@ msgid "Remove formatting"
 msgstr "書式を削除する"
 
 #: ui/gtk/help-overlay.ui:473
-#, fuzzy
-#| msgid "Insert an image (Ctrl+G)"
 msgctxt "shortcut window"
 msgid "Insert an image"
-msgstr "画像を挿入(Ctrl+G)"
+msgstr "画像を挿入する"
 
 #: ui/gtk/help-overlay.ui:480
 msgctxt "shortcut window"