diff --git a/po/id.po b/po/id.po
index 63173666..3f02b467 100644
--- a/po/id.po
+++ b/po/id.po
@@ -8,8 +8,8 @@ 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-05-01 10:05+0000\n"
-"PO-Revision-Date: 2019-05-03 17:57+0700\n"
+"POT-Creation-Date: 2019-05-09 20:43+0000\n"
+"PO-Revision-Date: 2019-05-10 15:24+0700\n"
 "Last-Translator: Kukuh Syafaat <kukuhsyafaat@gnome.org>\n"
 "Language-Team: Indonesian <gnomed@i15n.org>\n"
 "Language: id\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: 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:164 src/gcal-application.c:281 src/main.c:36
+#: data/ui/window.ui:164 src/main.c:36 src/gui/gcal-application.c:280
 msgid "Calendar"
 msgstr "Kalender"
 
@@ -132,8 +132,13 @@ msgstr "Jungkitkan suara alarm"
 msgid "Remove the alarm"
 msgstr "Hapus alarm"
 
+#: data/ui/calendar-popover.ui:42 data/ui/source-dialog.ui:745
+#: src/gui/gcal-source-dialog.c:856 src/gui/gcal-source-dialog.c:2270
+msgid "Calendar Settings"
+msgstr "Pengaturan Kalender"
+
 #: data/ui/edit-dialog.ui:16 data/ui/source-dialog.ui:762
-#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1185
+#: data/ui/source-dialog.ui:869 src/gui/gcal-source-dialog.c:1157
 msgid "Cancel"
 msgstr "Batal"
 
@@ -141,7 +146,7 @@ msgstr "Batal"
 msgid "Click to select the calendar"
 msgstr "Klik untuk memilih kalender"
 
-#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:373
+#: data/ui/edit-dialog.ui:108 src/gui/gcal-edit-dialog.c:372
 msgid "Done"
 msgstr "Selesai"
 
@@ -366,7 +371,8 @@ msgstr "Tak ditemukan hasil"
 msgid "Try a different search"
 msgstr "Cobalah pencarian lain"
 
-#: data/ui/source-dialog.ui:53 src/gcal-window.c:978 src/gcal-window.c:982
+#: data/ui/source-dialog.ui:53 src/gui/gcal-window.c:700
+#: src/gui/gcal-window.c:704
 msgid "Undo"
 msgstr "Tak jadi"
 
@@ -449,16 +455,11 @@ msgstr ""
 msgid "Calendar Address"
 msgstr "Alamat Kalender"
 
-#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2293
-#: src/gcal-source-dialog.c:2299
+#: data/ui/source-dialog.ui:729 src/gui/gcal-source-dialog.c:2241
+#: src/gui/gcal-source-dialog.c:2247
 msgid "Add Calendar"
 msgstr "Tambah Kalender"
 
-#: data/ui/source-dialog.ui:745 data/ui/window.ui:310
-#: src/gcal-source-dialog.c:885 src/gcal-source-dialog.c:2322
-msgid "Calendar Settings"
-msgstr "Pengaturan Kalender"
-
 #: data/ui/source-dialog.ui:806
 msgid "User"
 msgstr "Pengguna"
@@ -476,7 +477,7 @@ msgid "Connect"
 msgstr "Sambung"
 
 #: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:756
-#: src/views/gcal-week-view.c:271
+#: src/views/gcal-week-view.c:315
 msgid "00:00"
 msgstr "00:00"
 
@@ -484,15 +485,15 @@ msgstr "00:00"
 msgid ":"
 msgstr ":"
 
-#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:427
+#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:474
 msgid "AM"
 msgstr "AM"
 
-#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:427
+#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:474
 msgid "PM"
 msgstr "PM"
 
-#: data/ui/weather-settings.ui:12 data/ui/window.ui:361
+#: data/ui/weather-settings.ui:12 data/ui/window.ui:325
 msgid "_Weather"
 msgstr "_Cuaca"
 
@@ -516,29 +517,34 @@ msgstr "Bulan"
 msgid "Year"
 msgstr "Tahun"
 
-#: data/ui/window.ui:167 data/ui/year-view.ui:88 src/views/gcal-year-view.c:279
+#: data/ui/window.ui:170
+msgctxt "tooltip"
+msgid "Add a new event"
+msgstr "Tambah acara baru"
+
+#: data/ui/window.ui:181 data/ui/year-view.ui:88 src/views/gcal-year-view.c:279
 #: src/views/gcal-year-view.c:516
 msgid "Today"
 msgstr "Hari ini"
 
-#: data/ui/window.ui:248
+#: data/ui/window.ui:259
 msgid "Manage your calendars"
 msgstr "Kelola kalender Anda"
 
-#: data/ui/window.ui:265
+#: data/ui/window.ui:276
 msgctxt "tooltip"
 msgid "Search for events"
 msgstr "Cari acara"
 
-#: data/ui/window.ui:352
+#: data/ui/window.ui:316
 msgid "_Synchronize"
 msgstr "_Selaraskan"
 
-#: data/ui/window.ui:376
+#: data/ui/window.ui:340
 msgid "_Keyboard Shortcuts"
 msgstr "Pintasan Papan Ti_k"
 
-#: data/ui/window.ui:385
+#: data/ui/window.ui:349
 msgid "_About Calendar"
 msgstr "Ten_ang Kalender"
 
@@ -550,75 +556,8 @@ msgstr "Tidak ada acara"
 msgid "Add Event…"
 msgstr "Tambah Acara…"
 
-#: src/gcal-application.c:62
-msgid "Quit GNOME Calendar"
-msgstr "Keluar Kalender GNOME"
-
-#: src/gcal-application.c:67
-msgid "Display version number"
-msgstr "Tampilkan nomor versi"
-
-#: src/gcal-application.c:72
-msgid "Enable debug messages"
-msgstr "Aktifkan pesan awakutu"
-
-#: src/gcal-application.c:77
-msgid "Open calendar on the passed date"
-msgstr "Buka kalender pada tanggal yang diberikan"
-
-#: src/gcal-application.c:82
-msgid "Open calendar showing the passed event"
-msgstr "Buka kalender yang menampilkan acara yang telah lewat"
-
-#: src/gcal-application.c:235
-#, c-format
-msgid "Copyright © 2012–%d The Calendar authors"
-msgstr "Hak Cipta © 2012–%d para penulis Kalender"
-
-#: src/gcal-application.c:287
-msgid "translator-credits"
-msgstr ""
-"Andika Triwidada <andika@gmail.com>, 2013, 2016.\n"
-"Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018, 2019."
-
-#: src/gcal-edit-dialog.c:373
-msgid "Save"
-msgstr "Simpan"
-
-#: src/gcal-edit-dialog.c:540
-#, c-format
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d menit sebelumnya"
-msgstr[1] "%d menit sebelumnya"
-
-#: src/gcal-edit-dialog.c:548
-#, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d jam sebelumnya"
-msgstr[1] "%d jam sebelumnya"
-
-#: src/gcal-edit-dialog.c:556
-#, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d hari sebelumnya"
-msgstr[1] "%d hari sebelumnya"
-
-#: src/gcal-edit-dialog.c:564
-#, c-format
-msgid "%d week before"
-msgid_plural "%d weeks before"
-msgstr[0] "%d minggu sebelumnya"
-msgstr[1] "%d minggu sebelumnya"
-
-#: src/gcal-edit-dialog.c:1487 src/gcal-quick-add-popover.c:690
-msgid "Unnamed event"
-msgstr "Acara tanpa nama"
-
 #. Translators: %1$s is the start date and %2$s is the end date.
-#: src/gcal-event.c:1833
+#: src/core/gcal-event.c:1801
 #, c-format
 msgid "%1$s — %2$s"
 msgstr "%1$s — %2$s"
@@ -627,144 +566,211 @@ 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/gcal-event.c:1841
+#: src/core/gcal-event.c:1809
 #, 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/gcal-event.c:1857 src/gcal-quick-add-popover.c:468
+#: src/core/gcal-event.c:1825 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/gcal-application.c:63
+msgid "Quit GNOME Calendar"
+msgstr "Keluar Kalender GNOME"
+
+#: src/gui/gcal-application.c:68
+msgid "Display version number"
+msgstr "Tampilkan nomor versi"
+
+#: src/gui/gcal-application.c:73
+msgid "Enable debug messages"
+msgstr "Aktifkan pesan awakutu"
+
+#: src/gui/gcal-application.c:78
+msgid "Open calendar on the passed date"
+msgstr "Buka kalender pada tanggal yang diberikan"
+
+#: src/gui/gcal-application.c:83
+msgid "Open calendar showing the passed event"
+msgstr "Buka kalender yang menampilkan acara yang telah lewat"
+
+#: src/gui/gcal-application.c:234
+#, c-format
+msgid "Copyright © 2012–%d The Calendar authors"
+msgstr "Hak Cipta © 2012–%d para penulis Kalender"
+
+#: src/gui/gcal-application.c:286
+msgid "translator-credits"
+msgstr ""
+"Andika Triwidada <andika@gmail.com>, 2013, 2016.\n"
+"Kukuh Syafaat <kukuhsyafaat@gnome.org>, 2017, 2018, 2019."
+
+#: src/gui/gcal-edit-dialog.c:372
+msgid "Save"
+msgstr "Simpan"
+
+#: src/gui/gcal-edit-dialog.c:539
+#, c-format
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d menit sebelumnya"
+msgstr[1] "%d menit sebelumnya"
+
+#: src/gui/gcal-edit-dialog.c:547
+#, c-format
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d jam sebelumnya"
+msgstr[1] "%d jam sebelumnya"
+
+#: src/gui/gcal-edit-dialog.c:555
+#, c-format
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d hari sebelumnya"
+msgstr[1] "%d hari sebelumnya"
+
+#: src/gui/gcal-edit-dialog.c:563
+#, c-format
+msgid "%d week before"
+msgid_plural "%d weeks before"
+msgstr[0] "%d minggu sebelumnya"
+msgstr[1] "%d minggu sebelumnya"
+
+#: src/gui/gcal-edit-dialog.c:1486 src/gui/gcal-quick-add-popover.c:686
+msgid "Unnamed event"
+msgstr "Acara tanpa nama"
+
 #. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
-#: src/gcal-event-widget.c:428
+#: src/gui/gcal-event-widget.c:428
 #, c-format
 msgid "At %s"
 msgstr "Pada %s"
 
-#: src/gcal-quick-add-popover.c:117
+#: src/gui/gcal-quick-add-popover.c:117
 #, c-format
 msgid "%s (this calendar is read-only)"
 msgstr "%s (kalender ini hanya-baca)"
 
-#: src/gcal-quick-add-popover.c:242
+#: src/gui/gcal-quick-add-popover.c:244
 msgid "from next Monday"
 msgstr "mulai Senin depan"
 
-#: src/gcal-quick-add-popover.c:243
+#: src/gui/gcal-quick-add-popover.c:245
 msgid "from next Tuesday"
 msgstr "mulai Selasa depan"
 
-#: src/gcal-quick-add-popover.c:244
+#: src/gui/gcal-quick-add-popover.c:246
 msgid "from next Wednesday"
 msgstr "mulai Rabu depan"
 
-#: src/gcal-quick-add-popover.c:245
+#: src/gui/gcal-quick-add-popover.c:247
 msgid "from next Thursday"
 msgstr "mulai Kamis depan"
 
-#: src/gcal-quick-add-popover.c:246
+#: src/gui/gcal-quick-add-popover.c:248
 msgid "from next Friday"
 msgstr "mulai Jumat depan"
 
-#: src/gcal-quick-add-popover.c:247
+#: src/gui/gcal-quick-add-popover.c:249
 msgid "from next Saturday"
 msgstr "mulai Sabtu depan"
 
-#: src/gcal-quick-add-popover.c:248
+#: src/gui/gcal-quick-add-popover.c:250
 msgid "from next Sunday"
 msgstr "mulai Minggu depan"
 
-#: src/gcal-quick-add-popover.c:253
+#: src/gui/gcal-quick-add-popover.c:255
 msgid "to next Monday"
 msgstr "sampai Senin depan"
 
-#: src/gcal-quick-add-popover.c:254
+#: src/gui/gcal-quick-add-popover.c:256
 msgid "to next Tuesday"
 msgstr "sampai Selasa depan"
 
-#: src/gcal-quick-add-popover.c:255
+#: src/gui/gcal-quick-add-popover.c:257
 msgid "to next Wednesday"
 msgstr "sampai Rabu depan"
 
-#: src/gcal-quick-add-popover.c:256
+#: src/gui/gcal-quick-add-popover.c:258
 msgid "to next Thursday"
 msgstr "sampai Kamis depan"
 
-#: src/gcal-quick-add-popover.c:257
+#: src/gui/gcal-quick-add-popover.c:259
 msgid "to next Friday"
 msgstr "sampai Jumat depan"
 
-#: src/gcal-quick-add-popover.c:258
+#: src/gui/gcal-quick-add-popover.c:260
 msgid "to next Saturday"
 msgstr "sampai Sabtu depan"
 
-#: src/gcal-quick-add-popover.c:259
+#: src/gui/gcal-quick-add-popover.c:261
 msgid "to next Sunday"
 msgstr "sampai Minggu depan"
 
-#: src/gcal-quick-add-popover.c:264
+#: src/gui/gcal-quick-add-popover.c:266
 msgid "January"
 msgstr "Januari"
 
-#: src/gcal-quick-add-popover.c:265
+#: src/gui/gcal-quick-add-popover.c:267
 msgid "February"
 msgstr "Februari"
 
-#: src/gcal-quick-add-popover.c:266
+#: src/gui/gcal-quick-add-popover.c:268
 msgid "March"
 msgstr "Maret"
 
-#: src/gcal-quick-add-popover.c:267
+#: src/gui/gcal-quick-add-popover.c:269
 msgid "April"
 msgstr "April"
 
-#: src/gcal-quick-add-popover.c:268
+#: src/gui/gcal-quick-add-popover.c:270
 msgid "May"
 msgstr "Mei"
 
-#: src/gcal-quick-add-popover.c:269
+#: src/gui/gcal-quick-add-popover.c:271
 msgid "June"
 msgstr "Juni"
 
-#: src/gcal-quick-add-popover.c:270
+#: src/gui/gcal-quick-add-popover.c:272
 msgid "July"
 msgstr "Juli"
 
-#: src/gcal-quick-add-popover.c:271
+#: src/gui/gcal-quick-add-popover.c:273
 msgid "August"
 msgstr "Agustus"
 
-#: src/gcal-quick-add-popover.c:272
+#: src/gui/gcal-quick-add-popover.c:274
 msgid "September"
 msgstr "September"
 
-#: src/gcal-quick-add-popover.c:273
+#: src/gui/gcal-quick-add-popover.c:275
 msgid "October"
 msgstr "Oktober"
 
-#: src/gcal-quick-add-popover.c:274
+#: src/gui/gcal-quick-add-popover.c:276
 msgid "November"
 msgstr "November"
 
-#: src/gcal-quick-add-popover.c:275
+#: src/gui/gcal-quick-add-popover.c:277
 msgid "December"
 msgstr "Desember"
 
-#: src/gcal-quick-add-popover.c:284
+#: src/gui/gcal-quick-add-popover.c:286
 #, c-format
 msgid "from Today"
 msgstr "mulai Hari ini"
 
-#: src/gcal-quick-add-popover.c:288
+#: src/gui/gcal-quick-add-popover.c:290
 #, c-format
 msgid "from Tomorrow"
 msgstr "mulai Besok"
 
-#: src/gcal-quick-add-popover.c:292
+#: src/gui/gcal-quick-add-popover.c:294
 #, c-format
 msgid "from Yesterday"
 msgstr "mulai Kemarin"
@@ -773,22 +779,22 @@ msgstr "mulai Kemarin"
 #. * this is the format string for representing a date consisting of a month
 #. * name and a date of month.
 #.
-#: src/gcal-quick-add-popover.c:310
+#: src/gui/gcal-quick-add-popover.c:312
 #, c-format
 msgid "from %1$s %2$s"
 msgstr "mulai %1$s %2$s"
 
-#: src/gcal-quick-add-popover.c:321
+#: src/gui/gcal-quick-add-popover.c:323
 #, c-format
 msgid "to Today"
 msgstr "sampai Hari ini"
 
-#: src/gcal-quick-add-popover.c:325
+#: src/gui/gcal-quick-add-popover.c:327
 #, c-format
 msgid "to Tomorrow"
 msgstr "sampai Besok"
 
-#: src/gcal-quick-add-popover.c:329
+#: src/gui/gcal-quick-add-popover.c:331
 #, c-format
 msgid "to Yesterday"
 msgstr "sampai Kemarin"
@@ -797,172 +803,172 @@ msgstr "sampai Kemarin"
 #. * this is the format string for representing a date consisting of a month
 #. * name and a date of month.
 #.
-#: src/gcal-quick-add-popover.c:347
+#: src/gui/gcal-quick-add-popover.c:349
 #, c-format
 msgid "to %1$s %2$s"
 msgstr "sampai %1$s %2$s"
 
 #. Translators: %1$s is the start date (e.g. "from Today") and %2$s is the end date (e.g. "to Tomorrow")
-#: src/gcal-quick-add-popover.c:354
+#: src/gui/gcal-quick-add-popover.c:356
 #, c-format
 msgid "New Event %1$s %2$s"
 msgstr "Acara Baru %1$s %2$s"
 
-#: src/gcal-quick-add-popover.c:371
+#: src/gui/gcal-quick-add-popover.c:373
 #, c-format
 msgid "New Event Today"
 msgstr "Acara Baru Hari Ini"
 
-#: src/gcal-quick-add-popover.c:375
+#: src/gui/gcal-quick-add-popover.c:377
 #, c-format
 msgid "New Event Tomorrow"
 msgstr "Acara Baru Besok"
 
-#: src/gcal-quick-add-popover.c:379
+#: src/gui/gcal-quick-add-popover.c:381
 #, c-format
 msgid "New Event Yesterday"
 msgstr "Acara Baru Kemarin"
 
-#: src/gcal-quick-add-popover.c:385
+#: src/gui/gcal-quick-add-popover.c:387
 msgid "New Event next Monday"
 msgstr "Acara Baru Senin depan"
 
-#: src/gcal-quick-add-popover.c:386
+#: src/gui/gcal-quick-add-popover.c:388
 msgid "New Event next Tuesday"
 msgstr "Acara Baru Selasa depan"
 
-#: src/gcal-quick-add-popover.c:387
+#: src/gui/gcal-quick-add-popover.c:389
 msgid "New Event next Wednesday"
 msgstr "Acara Baru Rabu depan"
 
-#: src/gcal-quick-add-popover.c:388
+#: src/gui/gcal-quick-add-popover.c:390
 msgid "New Event next Thursday"
 msgstr "Acara Baru Kamis depan"
 
-#: src/gcal-quick-add-popover.c:389
+#: src/gui/gcal-quick-add-popover.c:391
 msgid "New Event next Friday"
 msgstr "Acara Baru Jumat depan"
 
-#: src/gcal-quick-add-popover.c:390
+#: src/gui/gcal-quick-add-popover.c:392
 msgid "New Event next Saturday"
 msgstr "Acara Baru Sabtu depan"
 
-#: src/gcal-quick-add-popover.c:391
+#: src/gui/gcal-quick-add-popover.c:393
 msgid "New Event next Sunday"
 msgstr "Acara Baru Minggu depan"
 
 #. Translators: %d is the numeric day of month
-#: src/gcal-quick-add-popover.c:403
+#: src/gui/gcal-quick-add-popover.c:405
 #, c-format
 msgid "New Event on January %d"
 msgstr "Acara Baru pada %d Januari"
 
-#: src/gcal-quick-add-popover.c:404
+#: src/gui/gcal-quick-add-popover.c:406
 #, c-format
 msgid "New Event on February %d"
 msgstr "Acara Baru pada %d Februari"
 
-#: src/gcal-quick-add-popover.c:405
+#: src/gui/gcal-quick-add-popover.c:407
 #, c-format
 msgid "New Event on March %d"
 msgstr "Acara Baru pada %d Maret"
 
-#: src/gcal-quick-add-popover.c:406
+#: src/gui/gcal-quick-add-popover.c:408
 #, c-format
 msgid "New Event on April %d"
 msgstr "Acara Baru pada %d April"
 
-#: src/gcal-quick-add-popover.c:407
+#: src/gui/gcal-quick-add-popover.c:409
 #, c-format
 msgid "New Event on May %d"
 msgstr "Acara Baru pada %d Mei"
 
-#: src/gcal-quick-add-popover.c:408
+#: src/gui/gcal-quick-add-popover.c:410
 #, c-format
 msgid "New Event on June %d"
 msgstr "Acara Baru pada %d Juni"
 
-#: src/gcal-quick-add-popover.c:409
+#: src/gui/gcal-quick-add-popover.c:411
 #, c-format
 msgid "New Event on July %d"
 msgstr "Acara Baru pada %d Juli"
 
-#: src/gcal-quick-add-popover.c:410
+#: src/gui/gcal-quick-add-popover.c:412
 #, c-format
 msgid "New Event on August %d"
 msgstr "Acara Baru pada %d Agustus"
 
-#: src/gcal-quick-add-popover.c:411
+#: src/gui/gcal-quick-add-popover.c:413
 #, c-format
 msgid "New Event on September %d"
 msgstr "Acara Baru pada %d September"
 
-#: src/gcal-quick-add-popover.c:412
+#: src/gui/gcal-quick-add-popover.c:414
 #, c-format
 msgid "New Event on October %d"
 msgstr "Acara Baru pada %d Oktober"
 
-#: src/gcal-quick-add-popover.c:413
+#: src/gui/gcal-quick-add-popover.c:415
 #, c-format
 msgid "New Event on November %d"
 msgstr "Acara Baru pada %d November"
 
-#: src/gcal-quick-add-popover.c:414
+#: src/gui/gcal-quick-add-popover.c:416
 #, c-format
 msgid "New Event on December %d"
 msgstr "Acara Baru pada %d Desember"
 
 #. Dialog
-#: src/gcal-source-dialog.c:1182
+#: src/gui/gcal-source-dialog.c:1154
 msgid "Select a calendar file"
 msgstr "Pilih sebuah berkas kalender"
 
-#: src/gcal-source-dialog.c:1186
+#: src/gui/gcal-source-dialog.c:1158
 msgid "Open"
 msgstr "Buka"
 
-#: src/gcal-source-dialog.c:1193
+#: src/gui/gcal-source-dialog.c:1165
 msgid "Calendar files"
 msgstr "Berkas kalender"
 
 #. update the source properties
-#: src/gcal-source-dialog.c:1227
+#: src/gui/gcal-source-dialog.c:1199
 msgid "Unnamed Calendar"
 msgstr "Kalender Tanpa Nama"
 
 #. Update notification label
-#: src/gcal-source-dialog.c:1843
+#: src/gui/gcal-source-dialog.c:1792
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "Kalender <b>%s</b> dihapus"
 
-#: src/gcal-source-dialog.c:1892 src/gcal-source-dialog.c:1948
+#: src/gui/gcal-source-dialog.c:1840 src/gui/gcal-source-dialog.c:1896
 msgid "Off"
 msgstr "Mati"
 
-#: src/gcal-source-dialog.c:1892 src/gcal-source-dialog.c:1948
+#: src/gui/gcal-source-dialog.c:1840 src/gui/gcal-source-dialog.c:1896
 msgid "On"
 msgstr "Nyala"
 
-#: src/gcal-source-dialog.c:1947
+#: src/gui/gcal-source-dialog.c:1895
 msgid "Expired"
 msgstr "Kedaluwarsa"
 
-#: src/gcal-time-selector.c:83
+#: src/gui/gcal-time-selector.c:83
 #, c-format
 msgid "%s AM"
 msgstr "%s AM"
 
-#: src/gcal-time-selector.c:85
+#: src/gui/gcal-time-selector.c:85
 #, c-format
 msgid "%s PM"
 msgstr "%s PM"
 
-#: src/gcal-window.c:978
+#: src/gui/gcal-window.c:700
 msgid "Another event deleted"
 msgstr "Acara lain dihapus"
 
-#: src/gcal-window.c:982
+#: src/gui/gcal-window.c:704
 msgid "Event deleted"
 msgstr "Acara dihapus"
 
@@ -990,7 +996,7 @@ msgstr "A_cara berikutnya"
 msgid "_All events"
 msgstr "Semu_a acara"
 
-#: src/views/gcal-week-grid.c:753 src/views/gcal-week-view.c:268
+#: src/views/gcal-week-grid.c:753 src/views/gcal-week-view.c:312
 msgid "00 AM"
 msgstr "00 AM"