diff --git a/po/ja.po b/po/ja.po
index 30e61029..e2bd66ab 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-calendar master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calendar/issues\n"
-"POT-Creation-Date: 2019-08-25 14:58+0000\n"
+"POT-Creation-Date: 2019-12-06 19:37+0000\n"
 "PO-Revision-Date: 2019-09-08 18:00+0900\n"
 "Last-Translator: sicklylife <translation@sicklylife.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -19,17 +19,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:7
-#: data/org.gnome.Calendar.desktop.in:3 data/ui/quick-add-popover.ui:187
-#: data/ui/window.ui:163 src/main.c:36 src/gui/gcal-application.c:280
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:7
+#: data/org.gnome.Calendar.desktop.in.in:3 src/main.c:35
+#: src/gui/gcal-application.c:277 src/gui/gcal-quick-add-popover.ui:187
+#: src/gui/gcal-window.ui:163
 msgid "Calendar"
 msgstr "カレンダー"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:8
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:8
 msgid "Calendar for GNOME"
 msgstr "GNOME のカレンダー"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:11
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:11
 msgid ""
 "GNOME Calendar is a simple and beautiful calendar application designed to "
 "perfectly fit the GNOME desktop. By reusing the components which the GNOME "
@@ -40,7 +41,7 @@ msgstr ""
 "トを再利用することで、カレンダーが GNOME のエコシステムとシームレスに統合され"
 "ています。"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:16
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:16
 msgid ""
 "We aim to find the perfect balance between nicely crafted features and user-"
 "centred usability. No excess, nothing missing. You’ll feel comfortable using "
@@ -50,24 +51,24 @@ msgstr ""
 "取ることを目指しています。機能としては過不足なく、長年愛用してきたカレンダー"
 "のように心地よく感じることでしょう。"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:27
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:27
 msgid "Week view"
 msgstr "週表示"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:31
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:31
 msgid "Search for events"
 msgstr "イベントの検索"
 
-#: data/appdata/org.gnome.Calendar.appdata.xml.in:35
+#: data/appdata/org.gnome.Calendar.appdata.xml.in.in:35
 msgid "Calendar management"
 msgstr "カレンダー管理"
 
-#: data/org.gnome.Calendar.desktop.in:4
+#: data/org.gnome.Calendar.desktop.in.in:4
 msgid "Access and manage your calendars"
 msgstr "カレンダーへのアクセスと管理"
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-#: data/org.gnome.Calendar.desktop.in:13
+#: data/org.gnome.Calendar.desktop.in.in:13
 msgid "Calendar;Event;Reminder;"
 msgstr "Calendar;Event;Reminder;カレンダー;イベント;リマインダー;"
 
@@ -123,427 +124,8 @@ msgid "Use GNOME night light setting to activate night-mode."
 msgstr ""
 "夜間モードをアクティブにするには GNOME の夜間モード設定を使用してください。"
 
-#: data/ui/alarm-row.ui:34
-msgid "Toggles the sound of the alarm"
-msgstr "アラーム音を切り換え"
-
-#: data/ui/alarm-row.ui:54
-msgid "Remove the alarm"
-msgstr "アラームを削除"
-
-#: data/ui/calendar-management-dialog.ui:42
-msgid "Calendar Settings"
-msgstr "カレンダー設定"
-
-#: data/ui/calendar-popover.ui:43
-msgid "_Synchronize Calendars"
-msgstr "カレンダーを同期(_S)"
-
-#: data/ui/calendar-popover.ui:51
-msgid "Manage Calendars…"
-msgstr "カレンダーを管理…"
-
-#: data/ui/calendar-popover.ui:75
-msgctxt "tooltip"
-msgid "Synchronizing remote calendars…"
-msgstr "リモートのカレンダーと同期中…"
-
-#: data/ui/calendars-page.ui:31 src/gui/gcal-window.c:706
-#: src/gui/gcal-window.c:710
-msgid "Undo"
-msgstr "元に戻す"
-
-#: data/ui/calendars-page.ui:97
-msgid "Add Calendar…"
-msgstr "カレンダーを追加…"
-
-#: data/ui/edit-calendar-page.ui:18
-msgid "Account"
-msgstr "アカウント"
-
-#: data/ui/edit-calendar-page.ui:43
-msgid "Settings"
-msgstr "設定"
-
-#: data/ui/edit-calendar-page.ui:64 data/ui/edit-dialog.ui:232
-msgid "Location"
-msgstr "場所"
-
-#: data/ui/edit-calendar-page.ui:93
-msgid "Calendar name"
-msgstr "カレンダー名"
-
-#: data/ui/edit-calendar-page.ui:121 data/ui/new-calendar-page.ui:65
-msgid "Color"
-msgstr "色"
-
-#: data/ui/edit-calendar-page.ui:155
-msgid "Display calendar"
-msgstr "カレンダーを表示する"
-
-#: data/ui/edit-calendar-page.ui:175
-msgid "Add new events to this calendar by default"
-msgstr "新規作成したイベントをデフォルトでこのカレンダーに追加する"
-
-#: data/ui/edit-calendar-page.ui:190
-msgid "Remove Calendar"
-msgstr "カレンダーを削除"
-
-#: data/ui/edit-dialog.ui:16 data/ui/new-calendar-page.ui:302
-#: data/ui/new-calendar-page.ui:341
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: data/ui/edit-dialog.ui:36
-msgid "Click to select the calendar"
-msgstr "クリックして予定を選択する"
-
-#: data/ui/edit-dialog.ui:108 src/gui/gcal-edit-dialog.c:375
-msgid "Done"
-msgstr "完了"
-
-#: data/ui/edit-dialog.ui:146
-msgid "Title"
-msgstr "タイトル"
-
-#: data/ui/edit-dialog.ui:164
-msgid "Date"
-msgstr "日付"
-
-#: data/ui/edit-dialog.ui:180
-msgid "Repeat"
-msgstr "繰り返し"
-
-#: data/ui/edit-dialog.ui:198
-msgid "Reminders"
-msgstr "リマインダー"
-
-#: data/ui/edit-dialog.ui:216
-msgid "Notes"
-msgstr "メモ"
-
-#: data/ui/edit-dialog.ui:301
-msgid "Time"
-msgstr "時刻"
-
-#: data/ui/edit-dialog.ui:354
-msgid "All Day"
-msgstr "終日"
-
-#: data/ui/edit-dialog.ui:399
-msgid "Add reminder…"
-msgstr "リマインダーを追加…"
-
-#: data/ui/edit-dialog.ui:430
-msgid "No Repeat"
-msgstr "なし"
-
-#: data/ui/edit-dialog.ui:431
-msgid "Daily"
-msgstr "毎日"
-
-#: data/ui/edit-dialog.ui:432
-msgid "Monday – Friday"
-msgstr "月曜日〜金曜日"
-
-#: data/ui/edit-dialog.ui:433
-msgid "Weekly"
-msgstr "毎週"
-
-#: data/ui/edit-dialog.ui:434
-msgid "Monthly"
-msgstr "毎月"
-
-#: data/ui/edit-dialog.ui:435
-msgid "Yearly"
-msgstr "毎年"
-
-#: data/ui/edit-dialog.ui:463
-msgid "Forever"
-msgstr "期限なし"
-
-#: data/ui/edit-dialog.ui:464
-msgid "No. of occurrences"
-msgstr "発生回数"
-
-#: data/ui/edit-dialog.ui:465
-msgid "Until Date"
-msgstr "次の日付まで"
-
-#: data/ui/edit-dialog.ui:560
-msgid "Delete Event"
-msgstr "イベントを削除"
-
-#: data/ui/edit-dialog.ui:599
-msgid "5 minutes"
-msgstr "5 分"
-
-#: data/ui/edit-dialog.ui:608
-msgid "10 minutes"
-msgstr "10 分"
-
-#: data/ui/edit-dialog.ui:617
-msgid "30 minutes"
-msgstr "30 分"
-
-#: data/ui/edit-dialog.ui:626
-msgid "1 hour"
-msgstr "1 時間"
-
-#: data/ui/edit-dialog.ui:634
-msgid "1 day"
-msgstr "1 日"
-
-#: data/ui/edit-dialog.ui:643
-msgid "2 days"
-msgstr "2 日"
-
-#: data/ui/edit-dialog.ui:652
-msgid "3 days"
-msgstr "3 日"
-
-#: data/ui/edit-dialog.ui:661
-msgid "1 week"
-msgstr "1 週間"
-
-#: data/ui/help-overlay.ui:13
-msgctxt "shortcut window"
-msgid "General"
-msgstr "全般"
-
-#: data/ui/help-overlay.ui:17
-msgctxt "shortcut window"
-msgid "New event"
-msgstr "新しいイベントを登録する"
-
-#: data/ui/help-overlay.ui:24
-msgctxt "shortcut window"
-msgid "Close window"
-msgstr "ウィンドウを閉じる"
-
-#: data/ui/help-overlay.ui:31
-msgctxt "shortcut window"
-msgid "Search"
-msgstr "検索する"
-
-#: data/ui/help-overlay.ui:38
-msgctxt "shortcut window"
-msgid "Show help"
-msgstr "ヘルプを表示する"
-
-#: data/ui/help-overlay.ui:45
-msgctxt "shortcut window"
-msgid "Shortcuts"
-msgstr "ショートカット"
-
-#: data/ui/help-overlay.ui:54
-msgctxt "shortcut window"
-msgid "Navigation"
-msgstr "移動"
-
-#: data/ui/help-overlay.ui:58
-msgctxt "shortcut window"
-msgid "Go back"
-msgstr "戻る"
-
-#: data/ui/help-overlay.ui:65
-msgctxt "shortcut window"
-msgid "Go forward"
-msgstr "進む"
-
-#: data/ui/help-overlay.ui:72
-msgctxt "shortcut window"
-msgid "Show today"
-msgstr "今日のカレンダーを表示する"
-
-#: data/ui/help-overlay.ui:79
-msgctxt "shortcut window"
-msgid "Next view"
-msgstr "次の表示モードへ切り替える"
-
-#: data/ui/help-overlay.ui:86
-msgctxt "shortcut window"
-msgid "Previous view"
-msgstr "前の表示モードへ切り替える"
-
-#: data/ui/help-overlay.ui:95
-msgctxt "shortcut window"
-msgid "View"
-msgstr "表示"
-
-#: data/ui/help-overlay.ui:99
-msgctxt "shortcut window"
-msgid "Week view"
-msgstr "週表示"
-
-#: data/ui/help-overlay.ui:106
-msgctxt "shortcut window"
-msgid "Month view"
-msgstr "月表示"
-
-#: data/ui/help-overlay.ui:113
-msgctxt "shortcut window"
-msgid "Year view"
-msgstr "年表示"
-
-#: data/ui/menus.ui:6
-msgid "From Web…"
-msgstr "Web から…"
-
-#: data/ui/menus.ui:10
-msgid "New Local Calendar…"
-msgstr "新しいローカルカレンダー…"
-
-#: data/ui/menus.ui:14
-msgid "From File…"
-msgstr "ファイルから…"
-
-#: data/ui/month-popover.ui:91
-msgid "New Event…"
-msgstr "新しいイベント…"
-
-#: data/ui/new-calendar-page.ui:33 data/ui/new-calendar-page.ui:41
-msgid "Calendar Name"
-msgstr "カレンダー名"
-
-#: data/ui/new-calendar-page.ui:86
-msgid "Import a Calendar"
-msgstr "カレンダーのインポート"
-
-#: data/ui/new-calendar-page.ui:105
-msgid ""
-"Alternatively, enter the web address of an online calendar you want to "
-"import, or open a supported calendar file."
-msgstr ""
-"インポートしたいオンラインカレンダーのウェブアドレスを入力するか、"
-"サポートしているカレンダーファイルを選択してください。"
-
-#: data/ui/new-calendar-page.ui:137
-msgid "Open a File"
-msgstr "ファイルを開く"
-
-#: data/ui/new-calendar-page.ui:158
-msgid "Calendars"
-msgstr "カレンダー"
-
-#: data/ui/new-calendar-page.ui:204
-msgid ""
-"If the calendar belongs to one of your online accounts, you can add it "
-"through the <a href=\"GOA\">online account settings</a>."
-msgstr ""
-"オンラインアカウントのカレンダーであれば、<a href=\"GOA\">オンラインアカウン"
-"ト設定</a>から追加できます。"
-
-#: data/ui/new-calendar-page.ui:240
-msgid "User"
-msgstr "ユーザー"
-
-#: data/ui/new-calendar-page.ui:254
-msgid "Password"
-msgstr "パスワード"
-
-#: data/ui/new-calendar-page.ui:311
-msgid "Connect"
-msgstr "接続"
-
-#: data/ui/new-calendar-page.ui:348 data/ui/quick-add-popover.ui:130
-msgid "Add"
-msgstr "追加"
-
-#: data/ui/quick-add-popover.ui:117
-msgid "Edit Details…"
-msgstr "詳細を編集…"
-
-#: data/ui/search-popover.ui:76
-msgid "No results found"
-msgstr "見つかりませんでした"
-
-#: data/ui/search-popover.ui:92
-msgid "Try a different search"
-msgstr "他のキーワードを試してください"
-
-#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:756
-#: src/views/gcal-week-view.c:315
-msgid "00:00"
-msgstr "00:00"
-
-#: data/ui/time-selector.ui:65
-msgid ":"
-msgstr ":"
-
-#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:474
-msgid "AM"
-msgstr "午前"
-
-#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:474
-msgid "PM"
-msgstr "午後"
-
-#: data/ui/weather-settings.ui:12 data/ui/window.ui:318
-msgid "_Weather"
-msgstr "天気(_W)"
-
-#: data/ui/weather-settings.ui:30
-msgid "Show Weather"
-msgstr "天気を表示する"
-
-#: data/ui/weather-settings.ui:53
-msgid "Automatic Location"
-msgstr "場所を自動で選択する"
-
-#: data/ui/window.ui:43
-msgid "Week"
-msgstr "週"
-
-#: data/ui/window.ui:58
-msgid "Month"
-msgstr "月"
-
-#: data/ui/window.ui:72
-msgid "Year"
-msgstr "年"
-
-#: data/ui/window.ui:169
-msgctxt "tooltip"
-msgid "Add a new event"
-msgstr "新しいイベントを登録する"
-
-#: data/ui/window.ui:180 data/ui/year-view.ui:88 src/views/gcal-year-view.c:279
-#: src/views/gcal-year-view.c:558
-msgid "Today"
-msgstr "今日"
-
-#: data/ui/window.ui:258
-msgid "Manage your calendars"
-msgstr "カレンダーを管理する"
-
-#: data/ui/window.ui:269
-msgctxt "tooltip"
-msgid "Search for events"
-msgstr "イベントの検索"
-
-#: data/ui/window.ui:309
-msgid "_Online Accounts…"
-msgstr "オンラインアカウント(_O)…"
-
-#: data/ui/window.ui:333
-msgid "_Keyboard Shortcuts"
-msgstr "キーボードショートカット(_K)"
-
-#: data/ui/window.ui:342
-msgid "_About Calendar"
-msgstr "カレンダーについて(_A)"
-
-#: data/ui/year-view.ui:133
-msgid "No events"
-msgstr "イベントなし"
-
-#: data/ui/year-view.ui:155
-msgid "Add Event…"
-msgstr "新規イベント"
-
 #. Translators: %1$s is the start date and %2$s is the end date.
-#: src/core/gcal-event.c:1862
+#: src/core/gcal-event.c:1878
 #, c-format
 msgid "%1$s — %2$s"
 msgstr "%1$s 〜 %2$s"
@@ -552,28 +134,75 @@ msgstr "%1$s 〜 %2$s"
 #. * Translators: %1$s is the start date, %2$s is the start time,
 #. * %3$s is the end date, and %4$s is the end time.
 #.
-#: src/core/gcal-event.c:1870
+#: src/core/gcal-event.c:1886
 #, c-format
 msgid "%1$s %2$s — %3$s %4$s"
 msgstr "%1$s %2$s 〜 %3$s %4$s"
 
 #. Translators: %1$s is a date, %2$s is the start hour, and %3$s is the end hour
 #. Translators: %1$s is the event name, %2$s is the start hour, and %3$s is the end hour
-#: src/core/gcal-event.c:1886 src/gui/gcal-quick-add-popover.c:470
+#: src/core/gcal-event.c:1902 src/gui/gcal-quick-add-popover.c:470
 #, c-format
 msgid "%1$s, %2$s – %3$s"
 msgstr "%1$s, %2$s〜%3$s"
 
-#: src/gui/calendar-management/gcal-calendars-page.c:358
+#: src/gui/calendar-management/gcal-calendar-management-dialog.ui:42
+msgid "Calendar Settings"
+msgstr "カレンダー設定"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:18
+msgid "Account"
+msgstr "アカウント"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:43
+msgid "Settings"
+msgstr "設定"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:64
+#: src/gui/gcal-edit-dialog.ui:177
+msgid "Location"
+msgstr "場所"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:93
+msgid "Calendar name"
+msgstr "カレンダー名"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:121
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:65
+msgid "Color"
+msgstr "色"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:155
+msgid "Display calendar"
+msgstr "カレンダーを表示する"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:175
+msgid "Add new events to this calendar by default"
+msgstr "新規作成したイベントをデフォルトでこのカレンダーに追加する"
+
+#: src/gui/calendar-management/gcal-edit-calendar-page.ui:190
+msgid "Remove Calendar"
+msgstr "カレンダーを削除"
+
+#: src/gui/calendar-management/gcal-calendars-page.c:359
 msgid "Manage Calendars"
 msgstr "カレンダーの管理"
 
 #. Update notification label
-#: src/gui/calendar-management/gcal-calendars-page.c:388
+#: src/gui/calendar-management/gcal-calendars-page.c:389
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "カレンダー <b>%s</b> を削除しました"
 
+#: src/gui/calendar-management/gcal-calendars-page.ui:31
+#: src/gui/gcal-window.c:705 src/gui/gcal-window.c:709
+msgid "Undo"
+msgstr "元に戻す"
+
+#: src/gui/calendar-management/gcal-calendars-page.ui:97
+msgid "Add Calendar…"
+msgstr "カレンダーを追加…"
+
 #: src/gui/calendar-management/gcal-new-calendar-page.c:491
 msgid "New Calendar"
 msgstr "新しいカレンダー"
@@ -582,6 +211,170 @@ msgstr "新しいカレンダー"
 msgid "Calendar files"
 msgstr "カレンダーファイル"
 
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:33
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:41
+msgid "Calendar Name"
+msgstr "カレンダー名"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:86
+msgid "Import a Calendar"
+msgstr "カレンダーのインポート"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:105
+msgid ""
+"Alternatively, enter the web address of an online calendar you want to "
+"import, or open a supported calendar file."
+msgstr ""
+"インポートしたいオンラインカレンダーのウェブアドレスを入力するか、サポートし"
+"ているカレンダーファイルを選択してください。"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:137
+msgid "Open a File"
+msgstr "ファイルを開く"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:158
+msgid "Calendars"
+msgstr "カレンダー"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:204
+msgid ""
+"If the calendar belongs to one of your online accounts, you can add it "
+"through the <a href=\"GOA\">online account settings</a>."
+msgstr ""
+"オンラインアカウントのカレンダーであれば、<a href=\"GOA\">オンラインアカウン"
+"ト設定</a>から追加できます。"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:240
+msgid "User"
+msgstr "ユーザー"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:254
+msgid "Password"
+msgstr "パスワード"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:302
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:341
+#: src/gui/gcal-edit-dialog.ui:17
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:311
+msgid "Connect"
+msgstr "接続"
+
+#: src/gui/calendar-management/gcal-new-calendar-page.ui:348
+#: src/gui/gcal-quick-add-popover.ui:130
+msgid "Add"
+msgstr "追加"
+
+#: src/gui/gcal-alarm-row.c:85
+#, c-format
+msgid "%1$u day, %2$u hour, and %3$u minute before"
+msgid_plural "%1$u day, %2$u hour, and %3$u minutes before"
+msgstr[0] ""
+
+#: src/gui/gcal-alarm-row.c:89
+#, c-format
+msgid "%1$u day, %2$u hours, and %3$u minute before"
+msgid_plural "%1$u day, %2$u hours, and %3$u minutes before"
+msgstr[0] ""
+
+#: src/gui/gcal-alarm-row.c:95
+#, c-format
+msgid "%1$u days, %2$u hour, and %3$u minute before"
+msgid_plural "%1$u days, %2$u hour, and %3$u minutes before"
+msgstr[0] ""
+
+#: src/gui/gcal-alarm-row.c:99
+#, c-format
+msgid "%1$u days, %2$u hours, and %3$u minute before"
+msgid_plural "%1$u days, %2$u hours, and %3$u minutes before"
+msgstr[0] ""
+
+#: src/gui/gcal-alarm-row.c:114
+#, fuzzy, c-format
+#| msgid "%d hour before"
+#| msgid_plural "%d hours before"
+msgid "%1$u day and %2$u hour before"
+msgid_plural "%1$u day and %2$u hours before"
+msgstr[0] "%d 時間前"
+
+#: src/gui/gcal-alarm-row.c:118
+#, fuzzy, c-format
+#| msgid "%d hour before"
+#| msgid_plural "%d hours before"
+msgid "%1$u days and %2$u hour before"
+msgid_plural "%1$u days and %2$u hours before"
+msgstr[0] "%d 時間前"
+
+#: src/gui/gcal-alarm-row.c:134
+#, fuzzy, c-format
+#| msgid "%d minute before"
+#| msgid_plural "%d minutes before"
+msgid "%1$u day and %2$u minute before"
+msgid_plural "%1$u day and %2$u minutes before"
+msgstr[0] "%d 分前"
+
+#: src/gui/gcal-alarm-row.c:138
+#, fuzzy, c-format
+#| msgid "%d minute before"
+#| msgid_plural "%d minutes before"
+msgid "%1$u days and %2$u minute before"
+msgid_plural "%1$u days and %2$u minutes before"
+msgstr[0] "%d 分前"
+
+#: src/gui/gcal-alarm-row.c:148
+#, fuzzy, c-format
+#| msgid "%d day before"
+#| msgid_plural "%d days before"
+msgid "%1$u day before"
+msgid_plural "%1$u days before"
+msgstr[0] "%d 日前"
+
+#: src/gui/gcal-alarm-row.c:166
+#, fuzzy, c-format
+#| msgid "%d minute before"
+#| msgid_plural "%d minutes before"
+msgid "%1$u hour and %2$u minute before"
+msgid_plural "%1$u hour and %2$u minutes before"
+msgstr[0] "%d 分前"
+
+#: src/gui/gcal-alarm-row.c:170
+#, fuzzy, c-format
+#| msgid "%d minute before"
+#| msgid_plural "%d minutes before"
+msgid "%1$u hours and %2$u minute before"
+msgid_plural "%1$u hours and %2$u minutes before"
+msgstr[0] "%d 分前"
+
+#: src/gui/gcal-alarm-row.c:180
+#, fuzzy, c-format
+#| msgid "%d hour before"
+#| msgid_plural "%d hours before"
+msgid "%1$u hour before"
+msgid_plural "%1$u hours before"
+msgstr[0] "%d 時間前"
+
+#: src/gui/gcal-alarm-row.c:192
+#, fuzzy, c-format
+#| msgid "%d minute before"
+#| msgid_plural "%d minutes before"
+msgid "%1$u minute before"
+msgid_plural "%1$u minutes before"
+msgstr[0] "%d 分前"
+
+#: src/gui/gcal-alarm-row.c:199
+msgid "Event start time"
+msgstr ""
+
+#: src/gui/gcal-alarm-row.ui:18
+msgid "Toggles the sound of the alarm"
+msgstr "アラーム音を切り換え"
+
+#: src/gui/gcal-alarm-row.ui:35
+msgid "Remove the alarm"
+msgstr "アラームを削除"
+
 #: src/gui/gcal-application.c:63
 msgid "Quit GNOME Calendar"
 msgstr "GNOME カレンダーを終了"
@@ -607,45 +400,212 @@ msgstr "指定されたイベントのカレンダーを開く"
 msgid "Copyright © 2012–%d The Calendar authors"
 msgstr "Copyright © 2012–%d The Calendar authors"
 
-#: src/gui/gcal-application.c:286
+#: src/gui/gcal-application.c:288
 msgid "translator-credits"
 msgstr ""
 "松澤 二郎 <jmatsuzawa@gnome.org>\n"
 "Hajime Taira <htaira@redhat.com>\n"
 "sicklylife <translation@sicklylife.jp>"
 
-#: src/gui/gcal-edit-dialog.c:375
+#: src/gui/gcal-calendar-popover.ui:43
+msgid "_Synchronize Calendars"
+msgstr "カレンダーを同期(_S)"
+
+#: src/gui/gcal-calendar-popover.ui:51
+msgid "Manage Calendars…"
+msgstr "カレンダーを管理…"
+
+#: src/gui/gcal-calendar-popover.ui:75
+msgctxt "tooltip"
+msgid "Synchronizing remote calendars…"
+msgstr "リモートのカレンダーと同期中…"
+
+#: src/gui/gcal-edit-dialog.c:374
 msgid "Save"
 msgstr "保存"
 
-#: src/gui/gcal-edit-dialog.c:530
-#, c-format
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d 分前"
+#: src/gui/gcal-edit-dialog.c:374 src/gui/gcal-edit-dialog.ui:109
+msgid "Done"
+msgstr "完了"
 
-#: src/gui/gcal-edit-dialog.c:538
+#. Translators: %A is the weekday name (e.g. Sunday, Monday, etc)
+#: src/gui/gcal-edit-dialog.c:416
 #, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d 時間前"
+msgid "Last %A"
+msgstr ""
 
-#: src/gui/gcal-edit-dialog.c:546
+#: src/gui/gcal-edit-dialog.c:420
+#, fuzzy
+#| msgid "to Yesterday"
+msgid "Yesterday"
+msgstr "昨日まで"
+
+#: src/gui/gcal-edit-dialog.c:424 src/gui/gcal-window.ui:180
+#: src/views/gcal-year-view.c:279 src/views/gcal-year-view.c:557
+#: src/views/gcal-year-view.ui:88
+msgid "Today"
+msgstr "今日"
+
+#: src/gui/gcal-edit-dialog.c:428
+#, fuzzy
+#| msgid "to Tomorrow"
+msgid "Tomorrow"
+msgstr "明日まで"
+
+#. Translators: %A is the weekday name (e.g. Sunday, Monday, etc)
+#: src/gui/gcal-edit-dialog.c:438
 #, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d 日前"
+msgid "This %A"
+msgstr ""
 
-#: src/gui/gcal-edit-dialog.c:554
-#, c-format
-msgid "%d week before"
-msgid_plural "%d weeks before"
-msgstr[0] "%d 週前"
+#.
+#. * Translators: %1$s is the formatted date (e.g. Today, Sunday, or even 2019-10-11) and %2$s is the
+#. * formatted time (e.g. 03:14 PM, or 21:29)
+#.
+#: src/gui/gcal-edit-dialog.c:468
+#, fuzzy, c-format
+#| msgid "to %1$s %2$s"
+msgid "%1$s, %2$s"
+msgstr "%1$s%2$s日まで"
 
-#: src/gui/gcal-edit-dialog.c:1477 src/gui/gcal-quick-add-popover.c:687
+#: src/gui/gcal-edit-dialog.c:1512 src/gui/gcal-quick-add-popover.c:687
 msgid "Unnamed event"
 msgstr "イベント名称未設定"
 
+#: src/gui/gcal-edit-dialog.ui:37
+msgid "Click to select the calendar"
+msgstr "クリックして予定を選択する"
+
+#: src/gui/gcal-edit-dialog.ui:156
+msgid "Title"
+msgstr "タイトル"
+
+#: src/gui/gcal-edit-dialog.ui:205
+msgid "Schedule"
+msgstr ""
+
+#: src/gui/gcal-edit-dialog.ui:226
+msgid "All Day"
+msgstr "終日"
+
+#: src/gui/gcal-edit-dialog.ui:247
+msgid "Starts"
+msgstr "開始"
+
+#: src/gui/gcal-edit-dialog.ui:254 src/gui/gcal-edit-dialog.ui:302
+msgid "Check this out!"
+msgstr ""
+
+#: src/gui/gcal-edit-dialog.ui:295
+msgid "Ends"
+msgstr "終了"
+
+#: src/gui/gcal-edit-dialog.ui:343
+msgid "Repeat"
+msgstr "繰り返し"
+
+#: src/gui/gcal-edit-dialog.ui:354
+msgid "No Repeat"
+msgstr "なし"
+
+#: src/gui/gcal-edit-dialog.ui:355
+msgid "Daily"
+msgstr "毎日"
+
+#: src/gui/gcal-edit-dialog.ui:356
+msgid "Monday – Friday"
+msgstr "月曜日〜金曜日"
+
+#: src/gui/gcal-edit-dialog.ui:357
+msgid "Weekly"
+msgstr "毎週"
+
+#: src/gui/gcal-edit-dialog.ui:358
+msgid "Monthly"
+msgstr "毎月"
+
+#: src/gui/gcal-edit-dialog.ui:359
+msgid "Yearly"
+msgstr "毎年"
+
+#: src/gui/gcal-edit-dialog.ui:372
+#, fuzzy
+#| msgid "Repeat"
+msgid "End Repeat"
+msgstr "繰り返し"
+
+#: src/gui/gcal-edit-dialog.ui:382
+msgid "Forever"
+msgstr "期限なし"
+
+#: src/gui/gcal-edit-dialog.ui:383
+msgid "No. of occurrences"
+msgstr "発生回数"
+
+#: src/gui/gcal-edit-dialog.ui:384
+msgid "Until Date"
+msgstr "次の日付まで"
+
+#: src/gui/gcal-edit-dialog.ui:397
+#, fuzzy
+#| msgid "No. of occurrences"
+msgid "Number of Occurrences"
+msgstr "発生回数"
+
+#: src/gui/gcal-edit-dialog.ui:415
+msgid "End Repeat Date"
+msgstr ""
+
+#: src/gui/gcal-edit-dialog.ui:438
+msgid "Reminders"
+msgstr "リマインダー"
+
+#: src/gui/gcal-edit-dialog.ui:474
+#, fuzzy
+#| msgid "Add reminder…"
+msgid "Add a Reminder…"
+msgstr "リマインダーを追加…"
+
+#: src/gui/gcal-edit-dialog.ui:495
+msgid "Notes"
+msgstr "メモ"
+
+#: src/gui/gcal-edit-dialog.ui:539
+msgid "Delete Event"
+msgstr "イベントを削除"
+
+#: src/gui/gcal-edit-dialog.ui:573
+msgid "5 minutes"
+msgstr "5 分"
+
+#: src/gui/gcal-edit-dialog.ui:582
+msgid "10 minutes"
+msgstr "10 分"
+
+#: src/gui/gcal-edit-dialog.ui:591
+msgid "30 minutes"
+msgstr "30 分"
+
+#: src/gui/gcal-edit-dialog.ui:600
+msgid "1 hour"
+msgstr "1 時間"
+
+#: src/gui/gcal-edit-dialog.ui:608
+msgid "1 day"
+msgstr "1 日"
+
+#: src/gui/gcal-edit-dialog.ui:617
+msgid "2 days"
+msgstr "2 日"
+
+#: src/gui/gcal-edit-dialog.ui:626
+msgid "3 days"
+msgstr "3 日"
+
+#: src/gui/gcal-edit-dialog.ui:635
+msgid "1 week"
+msgstr "1 週間"
+
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
 #: src/gui/gcal-event-widget.c:428
 #, c-format
@@ -919,26 +879,154 @@ msgstr "11月%d日の新規イベント"
 msgid "New Event on December %d"
 msgstr "12月%d日の新規イベント"
 
-#: src/gui/gcal-time-selector.c:83
-#, c-format
-msgid "%s AM"
-msgstr "午前%s"
+#: src/gui/gcal-quick-add-popover.ui:117
+msgid "Edit Details…"
+msgstr "詳細を編集…"
 
-#: src/gui/gcal-time-selector.c:85
-#, c-format
-msgid "%s PM"
-msgstr "午後%s"
+#: src/gui/gcal-time-selector.ui:22
+msgid ":"
+msgstr ":"
+
+#: src/gui/gcal-time-selector.ui:47 src/views/gcal-week-view.c:475
+msgid "AM"
+msgstr "午前"
+
+#: src/gui/gcal-time-selector.ui:48 src/views/gcal-week-view.c:475
+msgid "PM"
+msgstr "午後"
 
 # 表示方法: "Event deleted"通知表示中にイベントをもうひとつ削除する
-#: src/gui/gcal-window.c:706
+#: src/gui/gcal-window.c:705
 msgid "Another event deleted"
 msgstr "他のイベントも削除しました"
 
-#: src/gui/gcal-window.c:710
+#: src/gui/gcal-window.c:709
 msgid "Event deleted"
 msgstr "イベントを削除しました"
 
-#: src/utils/gcal-utils.c:942
+#: src/gui/gcal-window.ui:43
+msgid "Week"
+msgstr "週"
+
+#: src/gui/gcal-window.ui:58
+msgid "Month"
+msgstr "月"
+
+#: src/gui/gcal-window.ui:72
+msgid "Year"
+msgstr "年"
+
+#: src/gui/gcal-window.ui:169
+msgctxt "tooltip"
+msgid "Add a new event"
+msgstr "新しいイベントを登録する"
+
+#: src/gui/gcal-window.ui:258
+msgid "Manage your calendars"
+msgstr "カレンダーを管理する"
+
+#: src/gui/gcal-window.ui:269
+msgctxt "tooltip"
+msgid "Search for events"
+msgstr "イベントの検索"
+
+#: src/gui/gcal-window.ui:309
+msgid "_Online Accounts…"
+msgstr "オンラインアカウント(_O)…"
+
+#: src/gui/gcal-window.ui:318 src/weather/gcal-weather-settings.ui:12
+msgid "_Weather"
+msgstr "天気(_W)"
+
+#: src/gui/gcal-window.ui:333
+msgid "_Keyboard Shortcuts"
+msgstr "キーボードショートカット(_K)"
+
+#: src/gui/gcal-window.ui:342
+msgid "_About Calendar"
+msgstr "カレンダーについて(_A)"
+
+#: src/help-overlay.ui:13
+msgctxt "shortcut window"
+msgid "General"
+msgstr "全般"
+
+#: src/help-overlay.ui:17
+msgctxt "shortcut window"
+msgid "New event"
+msgstr "新しいイベントを登録する"
+
+#: src/help-overlay.ui:24
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "ウィンドウを閉じる"
+
+#: src/help-overlay.ui:31
+msgctxt "shortcut window"
+msgid "Search"
+msgstr "検索する"
+
+#: src/help-overlay.ui:38
+msgctxt "shortcut window"
+msgid "Show help"
+msgstr "ヘルプを表示する"
+
+#: src/help-overlay.ui:45
+msgctxt "shortcut window"
+msgid "Shortcuts"
+msgstr "ショートカット"
+
+#: src/help-overlay.ui:54
+msgctxt "shortcut window"
+msgid "Navigation"
+msgstr "移動"
+
+#: src/help-overlay.ui:58
+msgctxt "shortcut window"
+msgid "Go back"
+msgstr "戻る"
+
+#: src/help-overlay.ui:65
+msgctxt "shortcut window"
+msgid "Go forward"
+msgstr "進む"
+
+#: src/help-overlay.ui:72
+msgctxt "shortcut window"
+msgid "Show today"
+msgstr "今日のカレンダーを表示する"
+
+#: src/help-overlay.ui:79
+msgctxt "shortcut window"
+msgid "Next view"
+msgstr "次の表示モードへ切り替える"
+
+#: src/help-overlay.ui:86
+msgctxt "shortcut window"
+msgid "Previous view"
+msgstr "前の表示モードへ切り替える"
+
+#: src/help-overlay.ui:95
+msgctxt "shortcut window"
+msgid "View"
+msgstr "表示"
+
+#: src/help-overlay.ui:99
+msgctxt "shortcut window"
+msgid "Week view"
+msgstr "週表示"
+
+#: src/help-overlay.ui:106
+msgctxt "shortcut window"
+msgid "Month view"
+msgstr "月表示"
+
+#: src/help-overlay.ui:113
+msgctxt "shortcut window"
+msgid "Year view"
+msgstr "年表示"
+
+#: src/utils/gcal-utils.c:958
 msgid ""
 "The event you are trying to modify is recurring. The changes you have "
 "selected should be applied to:"
@@ -946,26 +1034,34 @@ msgstr ""
 "変更しようとしているイベントが繰り返し発生しています。 選択した変更は、次の項"
 "目に適用する必要があります:"
 
-#: src/utils/gcal-utils.c:945
+#: src/utils/gcal-utils.c:961
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/utils/gcal-utils.c:947
+#: src/utils/gcal-utils.c:963
 msgid "_Only This Event"
 msgstr "このイベントのみ(_O)"
 
-#: src/utils/gcal-utils.c:954
+#: src/utils/gcal-utils.c:970
 msgid "_Subsequent events"
 msgstr "このイベント以降(_S)"
 
-#: src/utils/gcal-utils.c:956
+#: src/utils/gcal-utils.c:972
 msgid "_All events"
 msgstr "すべてのイベント(_A)"
 
-#: src/views/gcal-week-grid.c:753 src/views/gcal-week-view.c:312
+#: src/views/gcal-month-popover.ui:91
+msgid "New Event…"
+msgstr "新しいイベント…"
+
+#: src/views/gcal-week-grid.c:753 src/views/gcal-week-view.c:313
 msgid "00 AM"
 msgstr "午前0時"
 
+#: src/views/gcal-week-grid.c:756 src/views/gcal-week-view.c:316
+msgid "00:00"
+msgstr "00:00"
+
 #: src/views/gcal-week-header.c:462
 #, c-format
 msgid "Other event"
@@ -987,10 +1083,57 @@ msgstr "%-m月%-d日…"
 #. Translators: This is a date format in the sidebar of the year
 #. * view when there is only one specified day selected.
 #. Translators: This is a date format in the sidebar of the year view.
-#: src/views/gcal-year-view.c:294 src/views/gcal-year-view.c:561
+#: src/views/gcal-year-view.c:294 src/views/gcal-year-view.c:560
 msgid "%B %d"
 msgstr "%-m月%-d日"
 
+#: src/views/gcal-year-view.ui:133
+msgid "No events"
+msgstr "イベントなし"
+
+#: src/views/gcal-year-view.ui:155
+msgid "Add Event…"
+msgstr "新規イベント"
+
+#: src/weather/gcal-weather-settings.ui:30
+msgid "Show Weather"
+msgstr "天気を表示する"
+
+#: src/weather/gcal-weather-settings.ui:53
+msgid "Automatic Location"
+msgstr "場所を自動で選択する"
+
+#~ msgid "Date"
+#~ msgstr "日付"
+
+#~ msgid "Time"
+#~ msgstr "時刻"
+
+#~ msgid "From Web…"
+#~ msgstr "Web から…"
+
+#~ msgid "New Local Calendar…"
+#~ msgstr "新しいローカルカレンダー…"
+
+#~ msgid "From File…"
+#~ msgstr "ファイルから…"
+
+#~ msgid "No results found"
+#~ msgstr "見つかりませんでした"
+
+#~ msgid "Try a different search"
+#~ msgstr "他のキーワードを試してください"
+
+#~ msgid "%d week before"
+#~ msgid_plural "%d weeks before"
+#~ msgstr[0] "%d 週前"
+
+#~ msgid "%s AM"
+#~ msgstr "午前%s"
+
+#~ msgid "%s PM"
+#~ msgstr "午後%s"
+
 #~ msgid "org.gnome.Calendar"
 #~ msgstr "org.gnome.Calendar"
 
@@ -1066,12 +1209,6 @@ msgstr "%-m月%-d日"
 #~ msgid "Sources disabled last time Calendar ran"
 #~ msgstr "無効なソースの前回のカレンダー同期"
 
-#~ msgid "Starts"
-#~ msgstr "開始"
-
-#~ msgid "Ends"
-#~ msgstr "終了"
-
 #~ msgid "_Search…"
 #~ msgstr "検索(_S)…"