diff --git a/po/gd.po b/po/gd.po
index ef198bb4..efb6599c 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -1,14 +1,13 @@
 # Scottish Gaelic translation for gnome-calendar.
 # Copyright (C) 2015 gnome-calendar's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-calendar package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016.
+# GunChleoc <fios@foramnagaidhlig.net>, 2015, 2016, 2017.
 msgid ""
 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-09-04 13:49+0000\n"
-"PO-Revision-Date: 2016-09-05 13:48+0100\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-calendar/issues\n"
+"POT-Creation-Date: 2017-12-12 01:12+0000\n"
+"PO-Revision-Date: 2017-12-14 10:53+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -21,515 +20,618 @@ msgstr ""
 "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
-#: ../data/org.gnome.Calendar.search-provider.ini.in.in.h:1
-#: ../data/ui/quick-add-popover.ui.h:3 ../data/ui/window.ui.h:3
-#: ../src/gcal-application.c:483
+#: 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:187 src/gcal-application.c:529
 msgid "Calendar"
 msgstr "Am mìosachan"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:2
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:8
 msgid "Calendar for GNOME"
 msgstr "Mìosachan airson GNOME"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:3
+#: data/appdata/org.gnome.Calendar.appdata.xml.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 "
 "desktop is build on, Calendar nicely integrates with the GNOME ecosystem."
 msgstr ""
-"'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 "
+"’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
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:16
+#| msgid ""
+#| "We aim to find the perfect balance between nicely crafted features and "
+#| "user-centred usability. No excess, no lacks. You'll feel comfortable "
+#| "using Calendar, like you've been using it for ages!"
 msgid ""
 "We aim to find the perfect balance between nicely crafted features and user-"
-"centred usability. No excess, no lacks. You'll feel comfortable using "
-"Calendar, like you've been using it for ages!"
+"centred usability. No excess, no lacks. You’ll feel comfortable using "
+"Calendar, like you’ve been using it for ages!"
 msgstr ""
 "Tha sinn ag amas am meidh as fhearr a lorg eadar gleusan air an dèanamh gu "
-"math agus an so-chleachdadh. Gun leisgeul, gun dìth. Bidh thu cofhurtail a' "
+"math agus an so-chleachdadh. Gun leisgeul, gun dìth. Bidh thu cofhurtail a’ "
 "cleachdadh Mìosachan mar an robh thu air a chleachdadh fad linntean mar-thà!"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:5
-#: ../data/ui/window.ui.h:6
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:27
+#| msgctxt "shortcut window"
+#| msgid "Next view"
+msgid "Week view"
+msgstr "Sealladh seachdaineach"
+
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:31
 msgid "Search for events"
 msgstr "Lorg tachartasan"
 
-#: ../data/appdata/org.gnome.Calendar.appdata.xml.in.h:6
+#: data/appdata/org.gnome.Calendar.appdata.xml.in:35
 msgid "Calendar management"
-msgstr "Stiùireadh a' mhìosachain"
+msgstr "Stiùireadh a’ mhìosachain"
 
-#: ../data/org.gnome.Calendar.desktop.in.in.h:2
-msgid "Access, and manage calendar"
-msgstr "Inntrig is stiùirich am mìosachan"
+#: data/org.gnome.Calendar.desktop.in:4
+#| msgid "Access, and manage calendar"
+msgid "Access and manage your calendars"
+msgstr "Inntrig is stiùirich na mìosachain agad"
 
-#: ../data/org.gnome.Calendar.desktop.in.in.h:3
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: data/org.gnome.Calendar.desktop.in:7
+#| msgid "Unnamed Calendar"
+msgid "org.gnome.Calendar"
+msgstr "org.gnome.Calendar"
+
+#. 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
 msgid "Calendar;Event;Reminder;"
 msgstr "Calendar;Event;Reminder;mìosachan;tachartas;cuimhneachan;"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:1
+#: data/org.gnome.calendar.gschema.xml:6
 msgid "Window maximized"
 msgstr "Làn-mheud air an uinneag"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:2
+#: data/org.gnome.calendar.gschema.xml:7
 msgid "Window maximized state"
 msgstr "Staid làn-mheud na h-uinneige"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:3
+#: data/org.gnome.calendar.gschema.xml:11
 msgid "Window size"
 msgstr "Meud na h-uinneige"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:4
+#: data/org.gnome.calendar.gschema.xml:12
 msgid "Window size (width and height)."
-msgstr "Meud na h-uinneige (leud 's àirde)."
+msgstr "Meud na h-uinneige (leud ’s àirde)."
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:5
+#: data/org.gnome.calendar.gschema.xml:16
 msgid "Window position"
 msgstr "Ionad na h-uinneige"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:6
+#: data/org.gnome.calendar.gschema.xml:17
 msgid "Window position (x and y)."
 msgstr "Ionad na h-uinneige (x is y)."
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:7
+#: data/org.gnome.calendar.gschema.xml:21
 msgid "Type of the active view"
 msgstr "Seòrsa an t-seallaidh ghnìomhaich"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:8
+#: data/org.gnome.calendar.gschema.xml:22
 msgid "Type of the active window view, default value is: monthly view"
 msgstr ""
-"Seòrsa uinneag an t-seallaidh ghnìomhaich, 's e sealladh mìosail an tha san "
+"Seòrsa uinneag an t-seallaidh ghnìomhaich, ’s e sealladh mìosail an tha san "
 "t-sealladh tùsail"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:9
-msgid "List of the disabled sources"
-msgstr "Liosta nan tùsan a tha à comas"
+#: data/org.gnome.calendar.gschema.xml:26
+msgid "Weather Service Configuration"
+msgstr "Rèiteachadh air seirbheis na h-aimsire"
 
-#: ../data/org.gnome.calendar.gschema.xml.in.h:10
-msgid "Sources disabled last time Calendar ran"
+#: data/org.gnome.calendar.gschema.xml:27
+msgid ""
+"Whether weather reports are shown, automatic locations are used and a "
+"location-name"
 msgstr ""
-"Chaidh na tùsan a chur à comas an turas mu dheireadh a chaidh am mìosachan a "
-"ruith"
+"Co-dhiù an dèid aithris na h-aimsire a shealltainn ’s a thèid ionadan fèin-"
+"obrachail ’s ainm ionaid a chleachdadh gus nach dèid"
 
-#: ../data/ui/alarm-row.ui.h:1
+#: data/ui/alarm-row.ui:34
 msgid "Toggles the sound of the alarm"
 msgstr "Toglaichidh seo fuaim na caismeachd"
 
-#: ../data/ui/alarm-row.ui.h:2
-#| msgid "Remove Calendar"
+#: data/ui/alarm-row.ui:54
 msgid "Remove the alarm"
-msgstr "Thoir a' chaismeachd air falbh"
+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:1116
+#: data/ui/edit-dialog.ui:16 data/ui/source-dialog.ui:762
+#: data/ui/source-dialog.ui:869 src/gcal-source-dialog.c:1161
 msgid "Cancel"
 msgstr "Sguir dheth"
 
-#: ../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:36
+#| msgid "Click to select the event's agenda"
+msgid "Click to select the calendar"
+msgstr "Briog gus am mìosachan a thaghadh"
 
-#: ../data/ui/edit-dialog.ui.h:3 ../src/gcal-edit-dialog.c:565
+#: data/ui/edit-dialog.ui:108 src/gcal-edit-dialog.c:275
 msgid "Done"
 msgstr "Dèanta"
 
-#: ../data/ui/edit-dialog.ui.h:4
+#: data/ui/edit-dialog.ui:146
 msgid "Title"
 msgstr "Tiotal"
 
-#: ../data/ui/edit-dialog.ui.h:5
+#: data/ui/edit-dialog.ui:164
 msgid "Date"
 msgstr "Ceann-là"
 
-#: ../data/ui/edit-dialog.ui.h:6
+#: data/ui/edit-dialog.ui:180
+msgid "Repeat"
+msgstr "Tachair a-rithist"
+
+#: data/ui/edit-dialog.ui:198
 msgid "Reminders"
 msgstr "Cuimhneachain"
 
-#: ../data/ui/edit-dialog.ui.h:7
+#: data/ui/edit-dialog.ui:216
 msgid "Notes"
 msgstr "Nòtaichean"
 
-#: ../data/ui/edit-dialog.ui.h:8 ../data/ui/source-dialog.ui.h:17
+#: data/ui/edit-dialog.ui:232 data/ui/source-dialog.ui:563
 msgid "Location"
 msgstr "Àite"
 
-#: ../data/ui/edit-dialog.ui.h:9
+#: data/ui/edit-dialog.ui:301
 msgid "Time"
 msgstr "Àm"
 
-#: ../data/ui/edit-dialog.ui.h:10
-#| msgid "All day"
+#: data/ui/edit-dialog.ui:354
 msgid "All Day"
 msgstr "Fad an latha"
 
-#: ../data/ui/edit-dialog.ui.h:11
-#| msgid "Add Event…"
+#: data/ui/edit-dialog.ui:399
 msgid "Add reminder…"
 msgstr "Cuir cuimhneachan ris…"
 
-#: ../data/ui/edit-dialog.ui.h:12
-#| msgid "Delete event"
+#: data/ui/edit-dialog.ui:430
+msgid "No Repeat"
+msgstr "Aon turas a-màin"
+
+#: data/ui/edit-dialog.ui:431
+msgid "Daily"
+msgstr "Gach latha"
+
+#: data/ui/edit-dialog.ui:432
+msgid "Monday – Friday"
+msgstr "DiLuain – DihAoine"
+
+#: data/ui/edit-dialog.ui:433
+#| msgid "Week"
+msgid "Weekly"
+msgstr "Gach seachdain"
+
+#: data/ui/edit-dialog.ui:434
+#| msgid "Month"
+msgid "Monthly"
+msgstr "Gach mìos"
+
+#: data/ui/edit-dialog.ui:435
+#| msgid "Year"
+msgid "Yearly"
+msgstr "Gach bliadhna"
+
+#: data/ui/edit-dialog.ui:463
+msgid "Forever"
+msgstr "Gu buan"
+
+#: data/ui/edit-dialog.ui:464
+msgid "No. of occurrences"
+msgstr "Co mheud turas"
+
+#: data/ui/edit-dialog.ui:465
+msgid "Until Date"
+msgstr "Gu ruige ceann-là"
+
+#: data/ui/edit-dialog.ui:560
 msgid "Delete Event"
 msgstr "Sguab às an tachartas"
 
-#: ../data/ui/edit-dialog.ui.h:13
-#| msgid "minutes"
+#: data/ui/edit-dialog.ui:599
 msgid "5 minutes"
 msgstr "5 mionaidean"
 
-#: ../data/ui/edit-dialog.ui.h:14
-#| msgid "minutes"
+#: data/ui/edit-dialog.ui:608
 msgid "10 minutes"
 msgstr "10 mionaidean"
 
-#: ../data/ui/edit-dialog.ui.h:15
-#| msgid "minutes"
+#: data/ui/edit-dialog.ui:617
 msgid "30 minutes"
 msgstr "Leth-uair a thìde"
 
-#: ../data/ui/edit-dialog.ui.h:16
-#| msgid "hours"
+#: data/ui/edit-dialog.ui:626
 msgid "1 hour"
 msgstr "Uair a thìde"
 
-#: ../data/ui/edit-dialog.ui.h:17
-#| msgid "All day"
+#: data/ui/edit-dialog.ui:634
 msgid "1 day"
 msgstr "Latha"
 
-#: ../data/ui/edit-dialog.ui.h:18
-#| msgid "days"
+#: data/ui/edit-dialog.ui:643
 msgid "2 days"
 msgstr "2 latha"
 
-#: ../data/ui/edit-dialog.ui.h:19
-#| msgid "days"
+#: data/ui/edit-dialog.ui:652
 msgid "3 days"
 msgstr "3 làithean"
 
-#: ../data/ui/edit-dialog.ui.h:20
-#| msgid "weeks"
+#: data/ui/edit-dialog.ui:661
 msgid "1 week"
 msgstr "Seachdain"
 
-#: ../data/ui/help-overlay.ui.h:1
+#: data/ui/help-overlay.ui:13
 msgctxt "shortcut window"
 msgid "General"
 msgstr "Coitcheann"
 
-#: ../data/ui/help-overlay.ui.h:2
+#: data/ui/help-overlay.ui:17
 msgctxt "shortcut window"
 msgid "New event"
 msgstr "Tachartas ùr"
 
-#: ../data/ui/help-overlay.ui.h:3
+#: data/ui/help-overlay.ui:24
 msgctxt "shortcut window"
 msgid "Close window"
 msgstr "Dùin an uinneag"
 
-#: ../data/ui/help-overlay.ui.h:4
+#: data/ui/help-overlay.ui:31
 msgctxt "shortcut window"
 msgid "Search"
 msgstr "Lorg"
 
-#: ../data/ui/help-overlay.ui.h:5
+#: data/ui/help-overlay.ui:38
 msgctxt "shortcut window"
 msgid "Show help"
-msgstr "Seall a' chobhair"
+msgstr "Seall a’ chobhair"
 
-#: ../data/ui/help-overlay.ui.h:6
+#: data/ui/help-overlay.ui:45
 msgctxt "shortcut window"
 msgid "Shortcuts"
 msgstr "Ath-ghoiridean"
 
-#: ../data/ui/help-overlay.ui.h:7
+#: data/ui/help-overlay.ui:54
 msgctxt "shortcut window"
 msgid "Navigation"
 msgstr "Seòladaireachd"
 
-#: ../data/ui/help-overlay.ui.h:8
+#: data/ui/help-overlay.ui:58
 msgctxt "shortcut window"
 msgid "Go back"
 msgstr "Air ais"
 
-#: ../data/ui/help-overlay.ui.h:9
+#: data/ui/help-overlay.ui:65
 msgctxt "shortcut window"
 msgid "Go forward"
 msgstr "Air adhart"
 
-#: ../data/ui/help-overlay.ui.h:10
+#: data/ui/help-overlay.ui:72
 msgctxt "shortcut window"
 msgid "Show today"
 msgstr "Seall an-diugh"
 
-#: ../data/ui/help-overlay.ui.h:11
+#: data/ui/help-overlay.ui:79
 msgctxt "shortcut window"
 msgid "Next view"
 msgstr "An ath-shealladh"
 
-#: ../data/ui/help-overlay.ui.h:12
+#: data/ui/help-overlay.ui:86
 msgctxt "shortcut window"
 msgid "Previous view"
 msgstr "An sealladh roimhe"
 
-#: ../data/ui/help-overlay.ui.h:13
+#: data/ui/help-overlay.ui:95
 msgctxt "shortcut window"
 msgid "View"
 msgstr "Sealladh"
 
-#: ../data/ui/help-overlay.ui.h:14
+#: data/ui/help-overlay.ui:99
+#| msgctxt "shortcut window"
+#| msgid "Next view"
+msgctxt "shortcut window"
+msgid "Week view"
+msgstr "Sealladh seachdaineach"
+
+#: data/ui/help-overlay.ui:106
 msgctxt "shortcut window"
 msgid "Month view"
 msgstr "Seall mìos"
 
-#: ../data/ui/help-overlay.ui.h:15
+#: data/ui/help-overlay.ui:113
 msgctxt "shortcut window"
 msgid "Year view"
 msgstr "Seall bliadhna"
 
-#: ../data/ui/menus.ui.h:1
+#: data/ui/menus.ui:6
 msgid "Add Eve_nt…"
 msgstr "Cuir _tachartas ris…"
 
-#: ../data/ui/menus.ui.h:2
-msgid "_Search…"
-msgstr "_Lorg…"
-
-#: ../data/ui/menus.ui.h:3
+#: data/ui/menus.ui:13
 #| msgid "Calendars"
-msgid "_Calendars…"
-msgstr "_Mìosachain…"
+msgid "_Calendars"
+msgstr "_Mìosachain"
 
-#: ../data/ui/menus.ui.h:4
+#: data/ui/menus.ui:19
 msgid "_Keyboard Shortcuts"
-msgstr "Ath-ghoiridean a' _mheur-chlàir"
+msgstr "Ath-ghoiridean a’ _mheur-chlàir"
 
-#: ../data/ui/menus.ui.h:5
+#: data/ui/menus.ui:23
 msgid "_About"
 msgstr "_Mu dhèidhinn"
 
-#: ../data/ui/menus.ui.h:6
+#: data/ui/menus.ui:27
 msgid "_Quit"
 msgstr "_Fàg an-seo"
 
-#: ../data/ui/menus.ui.h:7
+#: data/ui/menus.ui:47
+#| msgid "Add Eve_nt…"
+msgid "Add Eve_nt"
+msgstr "Cuir _tachartas ris"
+
+#: data/ui/menus.ui:54
 msgid "_Synchronize"
 msgstr "_Sioncronaich"
 
-#: ../data/ui/menus.ui.h:8
+#: data/ui/menus.ui:61 data/ui/menus.ui:81
+msgid "_Weather"
+msgstr "An _aimsir"
+
+#: data/ui/menus.ui:62
+msgid "win-menu-weather"
+msgstr "win-menu-weather"
+
+#: data/ui/menus.ui:82
+msgid "win-menu-main"
+msgstr "win-menu-main"
+
+#: data/ui/menus.ui:101
+#| msgctxt "shortcut window"
+#| msgid "Show help"
+msgid "Show Weather"
+msgstr "Seall an aimsir"
+
+#: data/ui/menus.ui:137
+#| msgid "Location"
+msgid "Automatic Location"
+msgstr "Ionad fèin-obrachail"
+
+#: data/ui/menus.ui:188
 msgid "From Web…"
 msgstr "On lìon…"
 
-#: ../data/ui/menus.ui.h:9
+#: data/ui/menus.ui:192
 msgid "New Local Calendar…"
 msgstr "Mìosachan ionadail ùr…"
 
-#: ../data/ui/menus.ui.h:10
+#: data/ui/menus.ui:196
 msgid "From File…"
 msgstr "O fhaidhle…"
 
-#: ../data/ui/quick-add-popover.ui.h:1
+#: data/ui/month-popover.ui:91
+#| msgctxt "shortcut window"
+#| msgid "New event"
+msgid "New Event…"
+msgstr "Tachartas ùr…"
+
+#: data/ui/quick-add-popover.ui:117
 msgid "Edit Details…"
 msgstr "Deasaich am fiosrachadh…"
 
-#: ../data/ui/quick-add-popover.ui.h:2 ../data/ui/source-dialog.ui.h:9
+#: data/ui/quick-add-popover.ui:130 data/ui/source-dialog.ui:389
+#: data/ui/source-dialog.ui:773
 msgid "Add"
 msgstr "Cuir ris"
 
-#: ../data/ui/search-view.ui.h:1
+#: data/ui/search-view.ui:76
 msgid "No results found"
 msgstr "Cha deach toradh a lorg"
 
-#: ../data/ui/search-view.ui.h:2
+#: data/ui/search-view.ui:92
 msgid "Try a different search"
 msgstr "Feuch lorg eile"
 
-#: ../data/ui/source-dialog.ui.h:1 ../src/gcal-window.c:1123
-#: ../src/gcal-window.c:1127
+#: data/ui/source-dialog.ui:53 src/gcal-window.c:1119 src/gcal-window.c:1123
 msgid "Undo"
 msgstr "Neo-dhèan"
 
-#: ../data/ui/source-dialog.ui.h:2
+#: data/ui/source-dialog.ui:135
 msgid "Online Accounts"
 msgstr "Cunntasan air loidhne"
 
-#: ../data/ui/source-dialog.ui.h:3
+#: data/ui/source-dialog.ui:151
 msgid "Open online account settings"
-msgstr "Fosgail roghainnean a' chunntais air loidhne"
+msgstr "Fosgail roghainnean a’ chunntais air loidhne"
 
-#: ../data/ui/source-dialog.ui.h:4
+#: data/ui/source-dialog.ui:198
 msgid "Google"
 msgstr "Google"
 
-#: ../data/ui/source-dialog.ui.h:5
+#: data/ui/source-dialog.ui:209 data/ui/source-dialog.ui:260
+#: data/ui/source-dialog.ui:311
 msgid "Click to set up"
 msgstr "Briog gus a shuidheachadh"
 
-#: ../data/ui/source-dialog.ui.h:6
+#: data/ui/source-dialog.ui:249
 msgid "Nextcloud"
 msgstr "Nextcloud"
 
-#: ../data/ui/source-dialog.ui.h:7
+#: data/ui/source-dialog.ui:300
 msgid "Microsoft Exchange"
 msgstr "Microsoft Exchange"
 
-#: ../data/ui/source-dialog.ui.h:8
+#: data/ui/source-dialog.ui:346 data/ui/source-dialog.ui:682
 msgid "Calendars"
 msgstr "Mìosachain"
 
-#: ../data/ui/source-dialog.ui.h:10
+#: data/ui/source-dialog.ui:421
 msgid "Overview"
 msgstr "Foir-shealladh"
 
-#: ../data/ui/source-dialog.ui.h:11
+#: data/ui/source-dialog.ui:441
 msgid "Add new events to this calendar by default"
-msgstr "Cuir tachartasan ùra ris a' mhìosachan seo a ghnàth"
+msgstr "Cuir tachartasan ùra ris a’ mhìosachan seo a ghnàth"
 
-#: ../data/ui/source-dialog.ui.h:12
+#: data/ui/source-dialog.ui:454
 msgid "Remove Calendar"
 msgstr "Thoir am mìosachan air falbh"
 
-#: ../data/ui/source-dialog.ui.h:13
+#: data/ui/source-dialog.ui:483
 msgid "Display calendar"
 msgstr "Seall am mìosachan"
 
-#: ../data/ui/source-dialog.ui.h:14
+#: data/ui/source-dialog.ui:521
 msgid "Calendar name"
-msgstr "Ainm a' mhìosachain"
+msgstr "Ainm a’ mhìosachain"
 
-#: ../data/ui/source-dialog.ui.h:15
+#: data/ui/source-dialog.ui:535
 msgid "Color"
 msgstr "Dath"
 
-#: ../data/ui/source-dialog.ui.h:16
+#: data/ui/source-dialog.ui:549
 msgid "Account"
 msgstr "Cunntas"
 
-#: ../data/ui/source-dialog.ui.h:18
+#: data/ui/source-dialog.ui:587
 msgid "Settings"
 msgstr "Roghainnean"
 
-#: ../data/ui/source-dialog.ui.h:19
+#: data/ui/source-dialog.ui:618
 msgid "Edit Calendar"
 msgstr "Deasaich am mìosachan"
 
-#: ../data/ui/source-dialog.ui.h:20
+#: data/ui/source-dialog.ui:631
 msgid ""
 "Enter the address of the calendar that you want to add. If the calendar "
 "belongs to one of your online accounts, you can add it through the <a href="
 "\"GOA\">online account settings</a>."
 msgstr ""
-"Cuir a-steach seòladh a' mhìosachain a tha thu airson cur ris. Ma tha am "
-"mìosachan a' buntainn ri fear dhe na cunntasan air loidhne agad, 's urrainn "
-"dhut a chur ris le <a href=\"GOA\">roghainnean a' chunntais air loidhne</a>."
+"Cuir a-steach seòladh a’ mhìosachain a tha thu airson cur ris. Ma tha am "
+"mìosachan a’ buntainn ri fear dhe na cunntasan air loidhne agad, ’s urrainn "
+"dhut a chur ris le <a href=\"GOA\">roghainnean a’ chunntais air loidhne</a>."
 
-#: ../data/ui/source-dialog.ui.h:21
+#: data/ui/source-dialog.ui:646
 msgid "Calendar Address"
-msgstr "Seòladh a' mhìosachain"
+msgstr "Seòladh a’ mhìosachain"
 
-#: ../data/ui/source-dialog.ui.h:22 ../src/gcal-source-dialog.c:2202
-#: ../src/gcal-source-dialog.c:2208
+#: data/ui/source-dialog.ui:729 src/gcal-source-dialog.c:2284
+#: src/gcal-source-dialog.c:2290
 msgid "Add Calendar"
 msgstr "Cuir mìosachan ris"
 
-#: ../data/ui/source-dialog.ui.h:24
+#: data/ui/source-dialog.ui:745 data/ui/window.ui:343
+#: src/gcal-source-dialog.c:861 src/gcal-source-dialog.c:2313
+msgid "Calendar Settings"
+msgstr "Roghainnean a’ mhìosachain"
+
+#: data/ui/source-dialog.ui:806
 msgid "User"
 msgstr "Cleachdaiche"
 
-#: ../data/ui/source-dialog.ui.h:25
+#: data/ui/source-dialog.ui:820
 msgid "Password"
 msgstr "Facal-faire"
 
-#: ../data/ui/source-dialog.ui.h:26
+#: data/ui/source-dialog.ui:866
+#| msgid "Manage your calendars"
+msgid "Enter your credentials"
+msgstr "Cuir a-steach teisteas"
+
+#: data/ui/source-dialog.ui:878
 msgid "Connect"
 msgstr "Ceangail"
 
-#: ../data/ui/time-selector.ui.h:1
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:758
+#: src/views/gcal-week-view.c:294
 msgid "00:00"
 msgstr "00:00"
 
-#: ../data/ui/time-selector.ui.h:2
+#: data/ui/time-selector.ui:65
 msgid ":"
 msgstr ":"
 
-#: ../data/ui/time-selector.ui.h:3 ../src/gcal-week-view.c:417
+#: data/ui/time-selector.ui:78 src/views/gcal-week-view.c:449
 msgid "AM"
 msgstr "m"
 
-#: ../data/ui/time-selector.ui.h:4 ../src/gcal-week-view.c:417
+#: data/ui/time-selector.ui:79 src/views/gcal-week-view.c:449
 msgid "PM"
 msgstr "f"
 
-#: ../data/ui/window.ui.h:1
+#: data/ui/window.ui:67
+msgid "Week"
+msgstr "Seachdain"
+
+#: data/ui/window.ui:82
 msgid "Month"
 msgstr "Mìos"
 
-#: ../data/ui/window.ui.h:2
+#: data/ui/window.ui:96
 msgid "Year"
 msgstr "Bliadhna"
 
-#: ../data/ui/window.ui.h:4 ../data/ui/year-view.ui.h:1
-#: ../src/gcal-year-view.c:262 ../src/gcal-year-view.c:482
+#: data/ui/window.ui:190 data/ui/year-view.ui:88 src/views/gcal-year-view.c:294
+#: src/views/gcal-year-view.c:529
 msgid "Today"
 msgstr "An-diugh"
 
-#: ../data/ui/window.ui.h:5
+#: data/ui/window.ui:270
 msgid "Manage your calendars"
 msgstr "Stiùirich na mìosachain agad"
 
-#: ../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"
+#: data/ui/window.ui:287
+#| msgid "Search for events"
+msgctxt "tooltip"
+msgid "Search for events"
+msgstr "Lorg tachartasan"
 
-#: ../data/ui/year-view.ui.h:2
+#: data/ui/year-view.ui:103
+msgid "temp"
+msgstr "teothachd"
+
+#: data/ui/year-view.ui:133
 msgid "No events"
 msgstr "Chan eil tachartas ann"
 
-#: ../data/ui/year-view.ui.h:3 ../src/gcal-month-view.c:1037
+#: data/ui/year-view.ui:155
 msgid "Add Event…"
 msgstr "Cuir tachartas ris…"
 
-#: ../src/gcal-application.c:102
+#: src/gcal-application.c:90
 msgid "Display version number"
 msgstr "Seall àireamh an tionndaidh"
 
-#: ../src/gcal-application.c:107
+#: src/gcal-application.c:95
+msgid "Enable debug messages"
+msgstr "Cuir teachdaireachdan dì-bhugachaidh an comas"
+
+#: src/gcal-application.c:100
 msgid "Open calendar on the passed date"
-msgstr "Fosgail am mìosachain air a' cheann-là"
+msgstr "Fosgail am mìosachain air a’ cheann-là"
 
-#: ../src/gcal-application.c:112
+#: src/gcal-application.c:105
 msgid "Open calendar showing the passed event"
-msgstr "Fosgail am mìosachain a' sealltainn an tachartais"
+msgstr "Fosgail am mìosachain a’ sealltainn an tachartais"
 
-#: ../src/gcal-application.c:324
-msgid "- Calendar management"
-msgstr "- Stiùireadh a' mhìosachain"
-
-#: ../src/gcal-application.c:471
+#: src/gcal-application.c:486
 #, c-format
-msgid "Copyright © %d The Calendar authors"
-msgstr "Còir-lethbhreac © %d ùghdaran a' Mhìosachain"
+#| msgid "Copyright © %d–%d The Calendar authors"
+msgid "Copyright © 2012–%d The Calendar authors"
+msgstr "Còir-lethbhreac © 2012–%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"
-
-#: ../src/gcal-application.c:490
+#: src/gcal-application.c:535
 msgid "translator-credits"
 msgstr "GunChleoc fios@foramnagaidhlig.net"
 
-#: ../src/gcal-edit-dialog.c:565
+#: src/gcal-edit-dialog.c:275
 msgid "Save"
 msgstr "Sàbhail"
 
-#: ../src/gcal-edit-dialog.c:837
+#: src/gcal-edit-dialog.c:1019
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
@@ -538,9 +640,8 @@ msgstr[1] "%d mhionaid roimhe"
 msgstr[2] "%d mionaidean roimhe"
 msgstr[3] "%d mionaid roimhe"
 
-#: ../src/gcal-edit-dialog.c:845
+#: src/gcal-edit-dialog.c:1027
 #, c-format
-#| msgid "before"
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d uair a thìde roimhe"
@@ -548,9 +649,8 @@ 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
+#: src/gcal-edit-dialog.c:1035
 #, c-format
-#| msgid "before"
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d latha roimhe"
@@ -558,9 +658,8 @@ msgstr[1] "%d latha roimhe"
 msgstr[2] "%d làithean roimhe"
 msgstr[3] "%d latha roimhe"
 
-#: ../src/gcal-edit-dialog.c:861
+#: src/gcal-edit-dialog.c:1043
 #, c-format
-#| msgid "before"
 msgid "%d week before"
 msgid_plural "%d weeks before"
 msgstr[0] "%d seachdain roimhe"
@@ -568,16 +667,401 @@ 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
+#: src/gcal-edit-dialog.c:1347 src/gcal-quick-add-popover.c:680
 msgid "Unnamed event"
 msgstr "Tachartas gun ainm"
 
-#: ../src/gcal-month-view.c:1275
-msgid "Other events"
-msgstr "Tachartasan eile"
+#. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
+#: src/gcal-event-widget.c:420
+#, c-format
+msgid "At %s"
+msgstr "Aig %s"
 
-#. TODO: Warning: in some languages this string can be too long and may overlap with the number
-#: ../src/gcal-month-view.c:1737
+#: src/gcal-quick-add-popover.c:119
+#, 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:244
+msgid "from next Monday"
+msgstr "on ath DhiLuain"
+
+#: src/gcal-quick-add-popover.c:245
+msgid "from next Tuesday"
+msgstr "on ath DhiMàirt"
+
+#: src/gcal-quick-add-popover.c:246
+msgid "from next Wednesday"
+msgstr "on ath DhiCiadain"
+
+#: src/gcal-quick-add-popover.c:247
+msgid "from next Thursday"
+msgstr "on ath DhiarDaoin"
+
+#: src/gcal-quick-add-popover.c:248
+msgid "from next Friday"
+msgstr "on ath DhihAoine"
+
+#: src/gcal-quick-add-popover.c:249
+msgid "from next Saturday"
+msgstr "on ath DhiSathairne"
+
+#: src/gcal-quick-add-popover.c:250
+msgid "from next Sunday"
+msgstr "on ath DhiDòmhnaich"
+
+#: src/gcal-quick-add-popover.c:255
+msgid "to next Monday"
+msgstr "gu ruige an ath DhiLuain"
+
+#: src/gcal-quick-add-popover.c:256
+msgid "to next Tuesday"
+msgstr "gu ruige an ath DhiMàirt"
+
+#: src/gcal-quick-add-popover.c:257
+msgid "to next Wednesday"
+msgstr "gu ruige an ath DhiCiadain"
+
+#: src/gcal-quick-add-popover.c:258
+msgid "to next Thursday"
+msgstr "gu ruige an ath DhiarDaoin"
+
+#: src/gcal-quick-add-popover.c:259
+msgid "to next Friday"
+msgstr "gu ruige an ath DhihAoine"
+
+#: src/gcal-quick-add-popover.c:260
+msgid "to next Saturday"
+msgstr "gu ruige an ath DhiSathairne"
+
+#: src/gcal-quick-add-popover.c:261
+msgid "to next Sunday"
+msgstr "gu ruige an ath DhiDòmhnaich"
+
+#: src/gcal-quick-add-popover.c:266
+msgid "January"
+msgstr "dhen Fhaoilleach"
+
+#: src/gcal-quick-add-popover.c:267
+msgid "February"
+msgstr "dhen Ghearran"
+
+#: src/gcal-quick-add-popover.c:268
+#| msgctxt "shortcut window"
+#| msgid "Search"
+msgid "March"
+msgstr "dhen Mhàrt"
+
+#: src/gcal-quick-add-popover.c:269
+msgid "April"
+msgstr "dhen Ghiblean"
+
+#: src/gcal-quick-add-popover.c:270
+#| msgid "Day"
+msgid "May"
+msgstr "dhen Chèitean"
+
+#: src/gcal-quick-add-popover.c:271
+msgid "June"
+msgstr "dhen Ògmhios"
+
+#: src/gcal-quick-add-popover.c:272
+msgid "July"
+msgstr "dhen Iuchar"
+
+#: src/gcal-quick-add-popover.c:273
+msgid "August"
+msgstr "dhen Lùnastal"
+
+#: src/gcal-quick-add-popover.c:274
+msgid "September"
+msgstr "dhen t-Sultain"
+
+#: src/gcal-quick-add-popover.c:275
+msgid "October"
+msgstr "dhen Dàmhair"
+
+#: src/gcal-quick-add-popover.c:276
+msgid "November"
+msgstr "dhen t-Samhain"
+
+#: src/gcal-quick-add-popover.c:277
+msgid "December"
+msgstr "dhen Dùbhlachd"
+
+#: src/gcal-quick-add-popover.c:286
+#| msgid "Today"
+msgid "from Today"
+msgstr "o an-diugh"
+
+#: src/gcal-quick-add-popover.c:290
+msgid "from Tomorrow"
+msgstr "o a-màireach"
+
+#: src/gcal-quick-add-popover.c:294
+msgid "from Yesterday"
+msgstr "o an-dè"
+
+#. Translators:
+#. * 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:312
+#, c-format
+msgid "from %1$s %2$s"
+msgstr "o %1$s %2$s"
+
+#: src/gcal-quick-add-popover.c:323
+#| msgid "Today"
+msgid "to Today"
+msgstr "gu ruige an-diugh"
+
+#: src/gcal-quick-add-popover.c:327
+msgid "to Tomorrow"
+msgstr "gu ruige a-màireach"
+
+#: src/gcal-quick-add-popover.c:331
+msgid "to Yesterday"
+msgstr "gu ruige an-dè"
+
+#. Translators:
+#. * 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:349
+#, c-format
+msgid "to %1$s %2$s"
+msgstr "gu ruige %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:356
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event %1$s %2$s"
+msgstr "Tachartas ùr %1$s %2$s"
+
+#: src/gcal-quick-add-popover.c:373
+#| msgid "New Event on %s"
+msgid "New Event Today"
+msgstr "Tachartas ùr an-diugh"
+
+#: src/gcal-quick-add-popover.c:377
+#| msgid "New Event on %s"
+msgid "New Event Tomorrow"
+msgstr "Tachartas ùr a-màireach"
+
+#: src/gcal-quick-add-popover.c:381
+#| msgid "New Event on %s"
+msgid "New Event Yesterday"
+msgstr "Tachartas ùr an-dè"
+
+#: src/gcal-quick-add-popover.c:387
+#| msgid "New Event on %s"
+msgid "New Event next Monday"
+msgstr "Tachartas ùr an ath DhiLuain"
+
+#: src/gcal-quick-add-popover.c:388
+#| msgid "New Event on %s"
+msgid "New Event next Tuesday"
+msgstr "Tachartas ùr an ath DhiMàirt"
+
+#: src/gcal-quick-add-popover.c:389
+#| msgid "New Event on %s"
+msgid "New Event next Wednesday"
+msgstr "Tachartas ùr an ath DhiCiadain"
+
+#: src/gcal-quick-add-popover.c:390
+#| msgid "New Event on %s"
+msgid "New Event next Thursday"
+msgstr "Tachartas ùr an ath DhiarDaoin"
+
+#: src/gcal-quick-add-popover.c:391
+#| msgid "New Event on %s"
+msgid "New Event next Friday"
+msgstr "Tachartas ùr an ath DhihAoine"
+
+#: src/gcal-quick-add-popover.c:392
+#| msgid "New Event on %s"
+msgid "New Event next Saturday"
+msgstr "Tachartas ùr an ath DhiSathairne"
+
+#: src/gcal-quick-add-popover.c:393
+#| msgid "New Event on %s"
+msgid "New Event next Sunday"
+msgstr "Tachartas ùr an ath DhiDòmhnaich"
+
+#. Translators: %d is the numeric day of month
+#: src/gcal-quick-add-popover.c:405
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on January %d"
+msgstr "Tachartas ùr an %d dhen Fhaoilleach"
+
+#: src/gcal-quick-add-popover.c:406
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on February %d"
+msgstr "Tachartas ùr an %d dhen Ghearran"
+
+#: src/gcal-quick-add-popover.c:407
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on March %d"
+msgstr "Tachartas ùr an %d dhen Mhàrt"
+
+#: src/gcal-quick-add-popover.c:408
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on April %d"
+msgstr "Tachartas ùr an %d dhen Ghiblean"
+
+#: src/gcal-quick-add-popover.c:409
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on May %d"
+msgstr "Tachartas ùr an %d dhen Chèitean"
+
+#: src/gcal-quick-add-popover.c:410
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on June %d"
+msgstr "Tachartas ùr an %d dhen Ògmhios"
+
+#: src/gcal-quick-add-popover.c:411
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on July %d"
+msgstr "Tachartas ùr an %d dhen Iuchar"
+
+#: src/gcal-quick-add-popover.c:412
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on August %d"
+msgstr "Tachartas ùr an %d dhen Lùnastal"
+
+#: src/gcal-quick-add-popover.c:413
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on September %d"
+msgstr "Tachartas ùr an %d dhen t-Sultain"
+
+#: src/gcal-quick-add-popover.c:414
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on October %d"
+msgstr "Tachartas ùr an %d dhen Dàmhair"
+
+#: src/gcal-quick-add-popover.c:415
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on November %d"
+msgstr "Tachartas ùr an %d dhen t-Samhainn"
+
+#: src/gcal-quick-add-popover.c:416
+#, c-format
+#| msgid "New Event on %s"
+msgid "New Event on December %d"
+msgstr "Tachartas ùr an %d dhen Dùbhlachd"
+
+#. Translators: %1$s is the event name, %2$s is the start hour, and %3$s is the end hour
+#: src/gcal-quick-add-popover.c:464
+#, c-format
+msgid "%1$s, %2$s – %3$s"
+msgstr "%1$s, %2$s – %3$s"
+
+#: src/gcal-search-view.c:358
+msgid "All day"
+msgstr "Fad an latha"
+
+#: src/gcal-search-view.c:563
+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:1158
+msgid "Select a calendar file"
+msgstr "Tagh faidhle mìosachain"
+
+#: src/gcal-source-dialog.c:1162
+msgid "Open"
+msgstr "Fosgail"
+
+#: src/gcal-source-dialog.c:1169
+msgid "Calendar files"
+msgstr "Faidhlichean mìosachain"
+
+#. update the source properties
+#: src/gcal-source-dialog.c:1203
+msgid "Unnamed Calendar"
+msgstr "Mìosachan gun ainm"
+
+#. Update notification label
+#: src/gcal-source-dialog.c:1809
+#, 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:1858 src/gcal-source-dialog.c:1914
+msgid "Off"
+msgstr "Dheth"
+
+#: src/gcal-source-dialog.c:1858 src/gcal-source-dialog.c:1914
+msgid "On"
+msgstr "Air"
+
+#: src/gcal-source-dialog.c:1913
+msgid "Expired"
+msgstr "Dh’falbh an ùine air"
+
+#: src/gcal-time-selector.c:84
+#, c-format
+msgid "%s AM"
+msgstr "%sm"
+
+#: src/gcal-time-selector.c:86
+#, c-format
+msgid "%s PM"
+msgstr "%sf"
+
+#: src/gcal-utils.c:1090
+msgid ""
+"The event you are trying to modify is recurring. The changes you have "
+"selected should be applied to:"
+msgstr ""
+"Tachraidh an tachartas a thagh thu a-rithist. Bu toigh leat na "
+"h-atharraichean a thagh thu a chur an sàs air:"
+
+#: src/gcal-utils.c:1093
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "_Sguir dheth"
+
+#: src/gcal-utils.c:1095
+msgid "_Only This Event"
+msgstr "An tachartas se_o a-mhàin"
+
+#: src/gcal-utils.c:1102
+msgid "_Subsequent events"
+msgstr "A h-uile tacharta_s às a dhèidh"
+
+#: src/gcal-utils.c:1104
+#| msgid "No events"
+msgid "_All events"
+msgstr "_A h-uile tachartas"
+
+#: src/gcal-window.c:1119
+msgid "Another event deleted"
+msgstr "Chaidh tachartas eile a sguabadh às"
+
+#: src/gcal-window.c:1123
+msgid "Event deleted"
+msgstr "Chaidh an tachartas a sguabadh às"
+
+#: src/views/gcal-week-grid.c:755 src/views/gcal-week-view.c:291
+msgid "00 AM"
+msgstr "00m"
+
+#: src/views/gcal-week-header.c:400
 #, c-format
 msgid "Other event"
 msgid_plural "Other %d events"
@@ -586,95 +1070,65 @@ msgstr[1] "%d thachartas eile"
 msgstr[2] "%d tachartasan eile"
 msgstr[3] "%d tachartas eile"
 
-#: ../src/gcal-quick-add-popover.c:115
+#: src/views/gcal-week-header.c:933
 #, c-format
-msgid "%s (this calendar is read-only)"
-msgstr "%s (tha am mìosachan seo ri leughadh a-mhàin)"
+#| msgid "1 week"
+msgid "week %d"
+msgstr "seachdain %d"
 
-#: ../src/gcal-quick-add-popover.c:225 ../src/gcal-quick-add-popover.c:243
-msgctxt "event date format"
+#. Translators: This is a date format in the sidebar of the year
+#. * view when the selection starts at the specified day and the
+#. * end is unspecified.
+#: src/views/gcal-year-view.c:303
+#| msgctxt "event date format"
+#| msgid "%B %d"
+msgid "%B %d…"
+msgstr "%d %B…"
+
+#. 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:309 src/views/gcal-year-view.c:532
+#| msgctxt "event date format"
+#| msgid "%B %d"
 msgid "%B %d"
 msgstr "%d %B"
 
-#: ../src/gcal-quick-add-popover.c:245
-#, c-format
-msgid "New Event from %s to %s"
-msgstr "Tachartas ùr o %s gu %s"
+#~ msgid "List of the disabled sources"
+#~ msgstr "Liosta nan tùsan a tha à comas"
 
-#: ../src/gcal-quick-add-popover.c:251
-#, c-format
-msgid "New Event on %s"
-msgstr "Tachartas ùr %s"
+#~ msgid "Sources disabled last time Calendar ran"
+#~ msgstr ""
+#~ "Chaidh na tùsan a chur à comas an turas mu dheireadh a chaidh am "
+#~ "mìosachan a ruith"
 
-#: ../src/gcal-search-view.c:353
-msgid "All day"
-msgstr "Fad an latha"
+#~ msgid "_Search…"
+#~ msgstr "_Lorg…"
 
-#: ../src/gcal-search-view.c:502
-msgid "Use the entry above to search for events."
-msgstr "Cleachd an t-innteart gu h-àrd gus tachartasan a lorg."
+#~| msgid "Calendars"
+#~ msgid "_Calendars…"
+#~ msgstr "_Mìosachain…"
 
-#. Dialog
-#: ../src/gcal-source-dialog.c:1113
-msgid "Select a calendar file"
-msgstr "Tagh faidhle mìosachain"
+#~ msgid "- Calendar management"
+#~ msgstr "- Stiùireadh a' mhìosachain"
 
-#: ../src/gcal-source-dialog.c:1117
-msgid "Open"
-msgstr "Fosgail"
+#~ msgid "Copyright © %d The Calendar authors"
+#~ msgstr "Còir-lethbhreac © %d ùghdaran a' Mhìosachain"
 
-#: ../src/gcal-source-dialog.c:1124
-msgid "Calendar files"
-msgstr "Faidhlichean mìosachain"
+#~ msgid "Other events"
+#~ msgstr "Tachartasan eile"
 
-#. update the source properties
-#: ../src/gcal-source-dialog.c:1166
-msgid "Unnamed Calendar"
-msgstr "Mìosachan gun ainm"
+#~ msgid "New Event from %s to %s"
+#~ msgstr "Tachartas ùr o %s gu %s"
 
-#. Update notification label
-#: ../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"
+#~ msgid "Midnight"
+#~ msgstr "Meadhan-oidhche"
 
-#: ../src/gcal-source-dialog.c:1969 ../src/gcal-source-dialog.c:2025
-msgid "Off"
-msgstr "Dheth"
+#~ msgid "Noon"
+#~ msgstr "Meadhan-latha"
 
-#: ../src/gcal-source-dialog.c:1969 ../src/gcal-source-dialog.c:2025
-msgid "On"
-msgstr "Air"
-
-#: ../src/gcal-time-selector.c:82
-#, c-format
-msgid "%s AM"
-msgstr "%sm"
-
-#: ../src/gcal-time-selector.c:84
-#, c-format
-msgid "%s PM"
-msgstr "%sf"
-
-#: ../src/gcal-week-view.c:420 ../src/gcal-week-view.c:493
-msgid "Midnight"
-msgstr "Meadhan-oidhche"
-
-#: ../src/gcal-week-view.c:422 ../src/gcal-week-view.c:496
-msgid "Noon"
-msgstr "Meadhan-latha"
-
-#: ../src/gcal-week-view.c:499
-msgid "00:00 PM"
-msgstr "00:00f"
-
-#: ../src/gcal-window.c:1123
-msgid "Another event deleted"
-msgstr "Chaidh tachartas eile a sguabadh às"
-
-#: ../src/gcal-window.c:1127
-msgid "Event deleted"
-msgstr "Chaidh an tachartas a sguabadh às"
+#~ msgid "00:00 PM"
+#~ msgstr "00:00f"
 
 #~ msgid "Starts"
 #~ msgstr "Àm-tòiseachaidh"
@@ -682,9 +1136,6 @@ msgstr "Chaidh an tachartas a sguabadh às"
 #~ msgid "Ends"
 #~ msgstr "Àm-crìochnachaidh"
 
-#~ msgid "Day"
-#~ msgstr "Latha"
-
 #~ msgid "Create"
 #~ msgstr "Cruthaich"
 
@@ -724,9 +1175,6 @@ msgstr "Chaidh an tachartas a sguabadh às"
 #~ msgid "Change the time"
 #~ msgstr "Atharraich an t-àm"
 
-#~ msgid "Week"
-#~ msgstr "Seachdain"
-
 #~ msgid "List"
 #~ msgstr "Liosta"