diff --git a/po/gd.po b/po/gd.po
index 8de5ffaa..5b64ef2a 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: gnome-calendar master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "calendar&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2016-06-08 20:00+0000\n"
-"PO-Revision-Date: 2016-06-11 08:03+0100\n"
+"POT-Creation-Date: 2016-09-04 13:49+0000\n"
+"PO-Revision-Date: 2016-09-05 13:48+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -18,9 +18,8 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
 "X-Generator: Virtaal 0.7.1\n"
-"X-Launchpad-Export-Date: 2016-04-20 13:08+0000\n"
-"X-Project-Style: gnome\n"
 "X-DamnedLies-Scope: partial\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:1
 #: ../data/org.gnome.Calendar.desktop.in.in.h:1
@@ -40,10 +39,11 @@ msgid ""
 "perfectly fit the GNOME desktop. By reusing the components which the GNOME "
 "desktop is build on, Calendar nicely integrates with the GNOME ecosystem."
 msgstr ""
-"'S e aplacaid mìosachain àlainn simplidh a tha sa Mhìosachan GNOME a chaidh "
-"a dhealbhachadh ach am freagair i ri deasg GNOME. On a chleachdas i na "
-"dearbh cho-phàirtean leis a chaidh deasg GNOME fhèin a thogail, tha am "
-"Mìosachan 'ga fhilleadh a-steach leis an àrainneachd GNOME gun duilgheadas."
+"'S e aplacaid mìosachain brèagha simplidh a th' ann am Mìosachan GNOME a "
+"chaidh a dhealbhachadh gus freagairt ris an deasg GNOME cho foirfe 's a "
+"ghabhas. On a tha e ag ath-chleachdadh co-phàirtean air a bheil an deasg "
+"GNOME stèidhichte, nì Mìosachan amalachadh ann an àrainneachd GNOME gu "
+"dòigheil."
 
 #: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:4
 msgid ""
@@ -116,45 +116,107 @@ msgstr ""
 "Chaidh na tùsan a chur à comas an turas mu dheireadh a chaidh am mìosachan a "
 "ruith"
 
+#: ../data/ui/alarm-row.ui.h:1
+msgid "Toggles the sound of the alarm"
+msgstr "Toglaichidh seo fuaim na caismeachd"
+
+#: ../data/ui/alarm-row.ui.h:2
+#| msgid "Remove Calendar"
+msgid "Remove the alarm"
+msgstr "Thoir a' chaismeachd air falbh"
+
 #: ../data/ui/edit-dialog.ui.h:1 ../data/ui/source-dialog.ui.h:23
-#: ../src/gcal-source-dialog.c:1114
+#: ../src/gcal-source-dialog.c:1116
 msgid "Cancel"
 msgstr "Sguir dheth"
 
-#: ../data/ui/edit-dialog.ui.h:2 ../src/gcal-edit-dialog.c:429
+#: ../data/ui/edit-dialog.ui.h:2
+msgid "Click to select the event's agenda"
+msgstr "Briog gus clàr-gnothaich an tachartais a thaghadh"
+
+#: ../data/ui/edit-dialog.ui.h:3 ../src/gcal-edit-dialog.c:565
 msgid "Done"
 msgstr "Dèanta"
 
-#: ../data/ui/edit-dialog.ui.h:3
+#: ../data/ui/edit-dialog.ui.h:4
 msgid "Title"
 msgstr "Tiotal"
 
-#: ../data/ui/edit-dialog.ui.h:4
-msgid "Starts"
-msgstr "Àm-tòiseachaidh"
-
 #: ../data/ui/edit-dialog.ui.h:5
-msgid "Ends"
-msgstr "Àm-crìochnachaidh"
+msgid "Date"
+msgstr "Ceann-là"
 
 #: ../data/ui/edit-dialog.ui.h:6
+msgid "Reminders"
+msgstr "Cuimhneachain"
+
+#: ../data/ui/edit-dialog.ui.h:7
 msgid "Notes"
 msgstr "Nòtaichean"
 
-#: ../data/ui/edit-dialog.ui.h:7 ../data/ui/source-dialog.ui.h:17
+#: ../data/ui/edit-dialog.ui.h:8 ../data/ui/source-dialog.ui.h:17
 msgid "Location"
 msgstr "Àite"
 
-#: ../data/ui/edit-dialog.ui.h:8
+#: ../data/ui/edit-dialog.ui.h:9
+msgid "Time"
+msgstr "Àm"
+
+#: ../data/ui/edit-dialog.ui.h:10
 #| msgid "All day"
 msgid "All Day"
 msgstr "Fad an latha"
 
-#: ../data/ui/edit-dialog.ui.h:9
+#: ../data/ui/edit-dialog.ui.h:11
+#| msgid "Add Event…"
+msgid "Add reminder…"
+msgstr "Cuir cuimhneachan ris…"
+
+#: ../data/ui/edit-dialog.ui.h:12
 #| msgid "Delete event"
 msgid "Delete Event"
 msgstr "Sguab às an tachartas"
 
+#: ../data/ui/edit-dialog.ui.h:13
+#| msgid "minutes"
+msgid "5 minutes"
+msgstr "5 mionaidean"
+
+#: ../data/ui/edit-dialog.ui.h:14
+#| msgid "minutes"
+msgid "10 minutes"
+msgstr "10 mionaidean"
+
+#: ../data/ui/edit-dialog.ui.h:15
+#| msgid "minutes"
+msgid "30 minutes"
+msgstr "Leth-uair a thìde"
+
+#: ../data/ui/edit-dialog.ui.h:16
+#| msgid "hours"
+msgid "1 hour"
+msgstr "Uair a thìde"
+
+#: ../data/ui/edit-dialog.ui.h:17
+#| msgid "All day"
+msgid "1 day"
+msgstr "Latha"
+
+#: ../data/ui/edit-dialog.ui.h:18
+#| msgid "days"
+msgid "2 days"
+msgstr "2 latha"
+
+#: ../data/ui/edit-dialog.ui.h:19
+#| msgid "days"
+msgid "3 days"
+msgstr "3 làithean"
+
+#: ../data/ui/edit-dialog.ui.h:20
+#| msgid "weeks"
+msgid "1 week"
+msgstr "Seachdain"
+
 #: ../data/ui/help-overlay.ui.h:1
 msgctxt "shortcut window"
 msgid "General"
@@ -198,7 +260,7 @@ msgstr "Air ais"
 #: ../data/ui/help-overlay.ui.h:9
 msgctxt "shortcut window"
 msgid "Go forward"
-msgstr "Gluais air adhart"
+msgstr "Air adhart"
 
 #: ../data/ui/help-overlay.ui.h:10
 msgctxt "shortcut window"
@@ -239,7 +301,6 @@ msgid "_Search…"
 msgstr "_Lorg…"
 
 #: ../data/ui/menus.ui.h:3
-#, fuzzy
 #| msgid "Calendars"
 msgid "_Calendars…"
 msgstr "_Mìosachain…"
@@ -288,8 +349,8 @@ msgstr "Cha deach toradh a lorg"
 msgid "Try a different search"
 msgstr "Feuch lorg eile"
 
-#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1130
-#: ../src/gcal-window.c:1134
+#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1123
+#: ../src/gcal-window.c:1127
 msgid "Undo"
 msgstr "Neo-dhèan"
 
@@ -371,8 +432,8 @@ msgstr ""
 msgid "Calendar Address"
 msgstr "Seòladh a' mhìosachain"
 
-#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2197
-#: ../src/gcal-source-dialog.c:2203
+#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2202
+#: ../src/gcal-source-dialog.c:2208
 msgid "Add Calendar"
 msgstr "Cuir mìosachan ris"
 
@@ -404,11 +465,11 @@ msgstr "m"
 msgid "PM"
 msgstr "f"
 
-#: ../data/ui/window.ui.h:1 ../src/gcal-date-selector.c:364
+#: ../data/ui/window.ui.h:1
 msgid "Month"
 msgstr "Mìos"
 
-#: ../data/ui/window.ui.h:2 ../src/gcal-date-selector.c:366
+#: ../data/ui/window.ui.h:2
 msgid "Year"
 msgstr "Bliadhna"
 
@@ -421,8 +482,8 @@ msgstr "An-diugh"
 msgid "Manage your calendars"
 msgstr "Stiùirich na mìosachain agad"
 
-#: ../data/ui/window.ui.h:7 ../src/gcal-source-dialog.c:814
-#: ../src/gcal-source-dialog.c:2226
+#: ../data/ui/window.ui.h:7 ../src/gcal-source-dialog.c:817
+#: ../src/gcal-source-dialog.c:2231
 msgid "Calendar Settings"
 msgstr "Roghainnean a' mhìosachain"
 
@@ -430,7 +491,7 @@ msgstr "Roghainnean a' mhìosachain"
 msgid "No events"
 msgstr "Chan eil tachartas ann"
 
-#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:1010
+#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:1037
 msgid "Add Event…"
 msgstr "Cuir tachartas ris…"
 
@@ -453,39 +514,70 @@ msgstr "- Stiùireadh a' mhìosachain"
 #: ../src/gcal-application.c:471
 #, c-format
 msgid "Copyright © %d The Calendar authors"
-msgstr "Còir-lethbhreac © %d Ùghdaran a' mhìosachain"
+msgstr "Còir-lethbhreac © %d ùghdaran a' Mhìosachain"
 
 #: ../src/gcal-application.c:477
 #, c-format
 msgid "Copyright © %d–%d The Calendar authors"
-msgstr "Còir-lethbhreac © %d-%d Ùghdaran a' mhìosachain"
+msgstr "Còir-lethbhreac © %d-%d ùghdaran a' Mhìosachain"
 
 #: ../src/gcal-application.c:490
 msgid "translator-credits"
-msgstr ""
-"GunChleoc fios@foramnagaidhlig.net\n"
-"\n"
-"Launchpad Contributions:\n"
-"  GunChleoc https://launchpad.net/~gunchleoc"
+msgstr "GunChleoc fios@foramnagaidhlig.net"
 
-#: ../src/gcal-date-selector.c:362
-msgid "Day"
-msgstr "Latha"
-
-#: ../src/gcal-edit-dialog.c:429
+#: ../src/gcal-edit-dialog.c:565
 msgid "Save"
 msgstr "Sàbhail"
 
-#: ../src/gcal-edit-dialog.c:627 ../src/gcal-quick-add-popover.c:422
+#: ../src/gcal-edit-dialog.c:837
+#, c-format
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d mhionaid roimhe"
+msgstr[1] "%d mhionaid roimhe"
+msgstr[2] "%d mionaidean roimhe"
+msgstr[3] "%d mionaid roimhe"
+
+#: ../src/gcal-edit-dialog.c:845
+#, c-format
+#| msgid "before"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d uair a thìde roimhe"
+msgstr[1] "%d uair a thìde roimhe"
+msgstr[2] "%d uairean a thìde roimhe"
+msgstr[3] "%d uair a thìde roimhe"
+
+#: ../src/gcal-edit-dialog.c:853
+#, c-format
+#| msgid "before"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d latha roimhe"
+msgstr[1] "%d latha roimhe"
+msgstr[2] "%d làithean roimhe"
+msgstr[3] "%d latha roimhe"
+
+#: ../src/gcal-edit-dialog.c:861
+#, c-format
+#| msgid "before"
+msgid "%d week before"
+msgid_plural "%d weeks before"
+msgstr[0] "%d seachdain roimhe"
+msgstr[1] "%d sheachdain roimhe"
+msgstr[2] "%d seachdainean roimhe"
+msgstr[3] "%d seachdain roimhe"
+
+#: ../src/gcal-edit-dialog.c:1080 ../src/gcal-quick-add-popover.c:424
 msgid "Unnamed event"
 msgstr "Tachartas gun ainm"
 
-#: ../src/gcal-month-view.c:1248
+#: ../src/gcal-month-view.c:1275
 msgid "Other events"
 msgstr "Tachartasan eile"
 
 #. TODO: Warning: in some languages this string can be too long and may overlap with the number
-#: ../src/gcal-month-view.c:1710
+#: ../src/gcal-month-view.c:1737
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
@@ -494,22 +586,22 @@ msgstr[1] "%d thachartas eile"
 msgstr[2] "%d tachartasan eile"
 msgstr[3] "%d tachartas eile"
 
-#: ../src/gcal-quick-add-popover.c:113
+#: ../src/gcal-quick-add-popover.c:115
 #, c-format
 msgid "%s (this calendar is read-only)"
 msgstr "%s (tha am mìosachan seo ri leughadh a-mhàin)"
 
-#: ../src/gcal-quick-add-popover.c:223 ../src/gcal-quick-add-popover.c:241
+#: ../src/gcal-quick-add-popover.c:225 ../src/gcal-quick-add-popover.c:243
 msgctxt "event date format"
 msgid "%B %d"
 msgstr "%d %B"
 
-#: ../src/gcal-quick-add-popover.c:243
+#: ../src/gcal-quick-add-popover.c:245
 #, c-format
 msgid "New Event from %s to %s"
 msgstr "Tachartas ùr o %s gu %s"
 
-#: ../src/gcal-quick-add-popover.c:249
+#: ../src/gcal-quick-add-popover.c:251
 #, c-format
 msgid "New Event on %s"
 msgstr "Tachartas ùr %s"
@@ -523,34 +615,34 @@ msgid "Use the entry above to search for events."
 msgstr "Cleachd an t-innteart gu h-àrd gus tachartasan a lorg."
 
 #. Dialog
-#: ../src/gcal-source-dialog.c:1111
+#: ../src/gcal-source-dialog.c:1113
 msgid "Select a calendar file"
 msgstr "Tagh faidhle mìosachain"
 
-#: ../src/gcal-source-dialog.c:1115
+#: ../src/gcal-source-dialog.c:1117
 msgid "Open"
 msgstr "Fosgail"
 
-#: ../src/gcal-source-dialog.c:1122
+#: ../src/gcal-source-dialog.c:1124
 msgid "Calendar files"
 msgstr "Faidhlichean mìosachain"
 
 #. update the source properties
-#: ../src/gcal-source-dialog.c:1164
+#: ../src/gcal-source-dialog.c:1166
 msgid "Unnamed Calendar"
 msgstr "Mìosachan gun ainm"
 
 #. Update notification label
-#: ../src/gcal-source-dialog.c:1764
+#: ../src/gcal-source-dialog.c:1766
 #, c-format
 msgid "Calendar <b>%s</b> removed"
 msgstr "Chaidh am mìosachan <b>%s</b> a thoirt air falbh"
 
-#: ../src/gcal-source-dialog.c:1967 ../src/gcal-source-dialog.c:2021
+#: ../src/gcal-source-dialog.c:1969 ../src/gcal-source-dialog.c:2025
 msgid "Off"
 msgstr "Dheth"
 
-#: ../src/gcal-source-dialog.c:1967 ../src/gcal-source-dialog.c:2021
+#: ../src/gcal-source-dialog.c:1969 ../src/gcal-source-dialog.c:2025
 msgid "On"
 msgstr "Air"
 
@@ -576,10 +668,73 @@ msgstr "Meadhan-latha"
 msgid "00:00 PM"
 msgstr "00:00f"
 
-#: ../src/gcal-window.c:1130
+#: ../src/gcal-window.c:1123
 msgid "Another event deleted"
 msgstr "Chaidh tachartas eile a sguabadh às"
 
-#: ../src/gcal-window.c:1134
+#: ../src/gcal-window.c:1127
 msgid "Event deleted"
 msgstr "Chaidh an tachartas a sguabadh às"
+
+#~ msgid "Starts"
+#~ msgstr "Àm-tòiseachaidh"
+
+#~ msgid "Ends"
+#~ msgstr "Àm-crìochnachaidh"
+
+#~ msgid "Day"
+#~ msgstr "Latha"
+
+#~ msgid "Create"
+#~ msgstr "Cruthaich"
+
+#~ msgid "%.2d:%.2d AM"
+#~ msgstr "%.2d:%.2dm"
+
+#~ msgid "%.2d:%.2d PM"
+#~ msgstr "%.2d:%.2df"
+
+#~ msgid "Unable to initialize GtkClutter"
+#~ msgstr "Cha deach leinn GtkClutter a thòiseachadh"
+
+#~ msgid "Weeks"
+#~ msgstr "Seachdainean"
+
+#~ msgid "Months"
+#~ msgstr "Mìosan"
+
+#~ msgid "Years"
+#~ msgstr "Bliadhnaichean"
+
+#~ msgid "Change the date"
+#~ msgstr "Atharraich an ceann-latha"
+
+#~ msgid "More details"
+#~ msgstr "Barrachd fiosrachaidh"
+
+#~ msgid "What (e.g. Alien Invasion)"
+#~ msgstr "Dè (can Am Mòd)"
+
+#~ msgid "Email"
+#~ msgstr "Post-d"
+
+#~ msgid "WWW 99 - WWW 99"
+#~ msgstr "WWW 99 - WWW 99"
+
+#~ msgid "Change the time"
+#~ msgstr "Atharraich an t-àm"
+
+#~ msgid "Week"
+#~ msgstr "Seachdain"
+
+#~ msgid "List"
+#~ msgstr "Liosta"
+
+#~ msgid "Back"
+#~ msgstr "Air ais"
+
+#~ msgid "Edit"
+#~ msgstr "Deasaich"
+
+#~ msgid "Year %d"
+#~ msgstr "Bliadhna %d"