diff --git a/po/es.po b/po/es.po
index a619cf89..4bf5ca1b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: gnome-calendar master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "calendar&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2017-06-23 07:00+0000\n"
-"PO-Revision-Date: 2017-06-23 14:23+0200\n"
+"POT-Creation-Date: 2017-07-13 17:28+0000\n"
+"PO-Revision-Date: 2017-07-20 10:03+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -52,8 +52,6 @@ msgstr ""
 "sentirá cómodo usando Calendario, como si llevara años usándolo."
 
 #: data/appdata/org.gnome.Calendar.appdata.xml.in:27
-#| msgctxt "shortcut window"
-#| msgid "Week view"
 msgid "Week view"
 msgstr "Vista de semana"
 
@@ -128,7 +126,7 @@ msgstr "Cancelar"
 msgid "Click to select the calendar"
 msgstr "Pulse para seleccionar el calendario"
 
-#: data/ui/edit-dialog.ui:110 src/gcal-edit-dialog.c:608
+#: data/ui/edit-dialog.ui:110 src/gcal-edit-dialog.c:697
 msgid "Done"
 msgstr "Hecho"
 
@@ -140,63 +138,106 @@ msgstr "Título"
 msgid "Date"
 msgstr "Fecha"
 
-#: data/ui/edit-dialog.ui:172
+#: data/ui/edit-dialog.ui:171
+msgid "Repeat"
+msgstr "Repetir"
+
+#: data/ui/edit-dialog.ui:188
 msgid "Reminders"
 msgstr "Recordatorios"
 
-#: data/ui/edit-dialog.ui:189
+#: data/ui/edit-dialog.ui:205
 msgid "Notes"
 msgstr "Notas"
 
-#: data/ui/edit-dialog.ui:204 data/ui/source-dialog.ui:563
+#: data/ui/edit-dialog.ui:220 data/ui/source-dialog.ui:563
 msgid "Location"
 msgstr "Ubicación"
 
-#: data/ui/edit-dialog.ui:276
+#: data/ui/edit-dialog.ui:292
 msgid "Time"
 msgstr "Hora"
 
-#: data/ui/edit-dialog.ui:339
+#: data/ui/edit-dialog.ui:355
 msgid "All Day"
 msgstr "Todo el día"
 
-#: data/ui/edit-dialog.ui:383
+#: data/ui/edit-dialog.ui:399
 msgid "Add reminder…"
 msgstr "Añadir recordatorio…"
 
-#: data/ui/edit-dialog.ui:457
+#: data/ui/edit-dialog.ui:428
+msgid "No Repeat"
+msgstr "No repetir"
+
+#: data/ui/edit-dialog.ui:429
+msgid "Daily"
+msgstr "Diariamente"
+
+#: data/ui/edit-dialog.ui:430
+msgid "Monday – Friday"
+msgstr "De lunes a viernes"
+
+#: data/ui/edit-dialog.ui:431
+#| msgid "Week"
+msgid "Weekly"
+msgstr "Semanalmente"
+
+#: data/ui/edit-dialog.ui:432
+#| msgid "Month"
+msgid "Monthly"
+msgstr "Mensualmente"
+
+#: data/ui/edit-dialog.ui:433
+#| msgid "Year"
+msgid "Yearly"
+msgstr "Anualmente"
+
+#: data/ui/edit-dialog.ui:461
+msgid "Forever"
+msgstr "Para siempre"
+
+#: data/ui/edit-dialog.ui:462
+msgid "No. of occurrences"
+msgstr ""
+
+#: data/ui/edit-dialog.ui:463
+msgid "Until Date"
+msgstr "Hasta la fecha"
+
+#: data/ui/edit-dialog.ui:554
 msgid "Delete Event"
 msgstr "Eliminar evento"
 
-#: data/ui/edit-dialog.ui:494
+#: data/ui/edit-dialog.ui:591
 msgid "5 minutes"
 msgstr "5 minutos"
 
-#: data/ui/edit-dialog.ui:503
+#: data/ui/edit-dialog.ui:600
 msgid "10 minutes"
 msgstr "10 minutos"
 
-#: data/ui/edit-dialog.ui:512
+#: data/ui/edit-dialog.ui:609
 msgid "30 minutes"
 msgstr "30 minutos"
 
-#: data/ui/edit-dialog.ui:521
+#: data/ui/edit-dialog.ui:618
 msgid "1 hour"
 msgstr "1 hora"
 
-#: data/ui/edit-dialog.ui:529
+#: data/ui/edit-dialog.ui:626
 msgid "1 day"
 msgstr "1 día"
 
-#: data/ui/edit-dialog.ui:538
+#: data/ui/edit-dialog.ui:635
 msgid "2 days"
 msgstr "2 días"
 
-#: data/ui/edit-dialog.ui:547
+#: data/ui/edit-dialog.ui:644
 msgid "3 days"
 msgstr "3 días"
 
-#: data/ui/edit-dialog.ui:556
+#: data/ui/edit-dialog.ui:653
 msgid "1 week"
 msgstr "1 semana"
 
@@ -333,7 +374,7 @@ msgstr "No se encontraron resultados."
 msgid "Try a different search"
 msgstr "Pruebe una búsqueda diferente"
 
-#: data/ui/source-dialog.ui:53 src/gcal-window.c:1126 src/gcal-window.c:1130
+#: data/ui/source-dialog.ui:53 src/gcal-window.c:1129 src/gcal-window.c:1133
 msgid "Undo"
 msgstr "Deshacer"
 
@@ -433,7 +474,7 @@ msgstr "Contraseña"
 msgid "Connect"
 msgstr "Conectar"
 
-#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:734
+#: data/ui/time-selector.ui:9 src/views/gcal-week-grid.c:763
 #: src/views/gcal-week-view.c:287
 msgid "00:00"
 msgstr "00:00"
@@ -523,43 +564,44 @@ msgstr "Copyright © %d–%d Los autores de Calendario"
 msgid "translator-credits"
 msgstr "Daniel Mustieles <daniel.mustieles@gmail.com>, 2012 - 2017"
 
-#: src/gcal-edit-dialog.c:608
+#: src/gcal-edit-dialog.c:697
 msgid "Save"
 msgstr "Guardar"
 
-#: src/gcal-edit-dialog.c:878
+#: src/gcal-edit-dialog.c:997
 #, c-format
 msgid "%d minute before"
 msgid_plural "%d minutes before"
 msgstr[0] "%d minuto antes"
 msgstr[1] "%d minutos antes"
 
-#: src/gcal-edit-dialog.c:886
+#: src/gcal-edit-dialog.c:1005
 #, c-format
 msgid "%d hour before"
 msgid_plural "%d hours before"
 msgstr[0] "%d hora antes"
 msgstr[1] "%d horas antes"
 
-#: src/gcal-edit-dialog.c:894
+#: src/gcal-edit-dialog.c:1013
 #, c-format
 msgid "%d day before"
 msgid_plural "%d days before"
 msgstr[0] "%d día antes"
 msgstr[1] "%d días antes"
 
-#: src/gcal-edit-dialog.c:902
+#: src/gcal-edit-dialog.c:1021
 #, c-format
 msgid "%d week before"
 msgid_plural "%d weeks before"
 msgstr[0] "%d semana antes"
 msgstr[1] "%d semanas antes"
 
-#: src/gcal-edit-dialog.c:1162 src/gcal-quick-add-popover.c:680
+#: src/gcal-edit-dialog.c:1312 src/gcal-quick-add-popover.c:683
 msgid "Unnamed event"
 msgstr "Evento sin nombre"
 
-#: src/gcal-event-widget.c:362
+#. Translators: %s is the location of the event (e.g. "Downtown, 3rd Avenue")
+#: src/gcal-event-widget.c:364
 #, c-format
 msgid "At %s"
 msgstr "El %s"
@@ -634,8 +676,6 @@ msgid "February"
 msgstr "Febrero"
 
 #: src/gcal-quick-add-popover.c:268
-#| msgctxt "shortcut window"
-#| msgid "Search"
 msgid "March"
 msgstr "Marzo"
 
@@ -644,7 +684,6 @@ msgid "April"
 msgstr "Abril"
 
 #: src/gcal-quick-add-popover.c:270
-#| msgid "Day"
 msgid "May"
 msgstr "May"
 
@@ -677,7 +716,6 @@ msgid "December"
 msgstr "Diciembre"
 
 #: src/gcal-quick-add-popover.c:286
-#| msgid "Today"
 msgid "from Today"
 msgstr "desde hoy"
 
@@ -699,7 +737,6 @@ msgid "from %1$s %2$s"
 msgstr "desde %1$s %2$s"
 
 #: src/gcal-quick-add-popover.c:323
-#| msgid "Today"
 msgid "to Today"
 msgstr "hasta hoy"
 
@@ -720,128 +757,108 @@ msgstr "hasta ayer"
 msgid "to %1$s %2$s"
 msgstr "hasta %1$s %2$s"
 
-#: src/gcal-quick-add-popover.c:355
+#. 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 "Evento nuevo el %1$s %2$s"
 
-#: src/gcal-quick-add-popover.c:373
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:374
 msgid "New Event Today"
 msgstr "Evento nuevo hoy"
 
-#: src/gcal-quick-add-popover.c:377
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:378
 msgid "New Event Tomorrow"
 msgstr "Evento nuevo mañana"
 
-#: src/gcal-quick-add-popover.c:381
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:382
 msgid "New Event Yesterday"
 msgstr "Evento nuevo ayer"
 
-#: src/gcal-quick-add-popover.c:387
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:388
 msgid "New Event next Monday"
 msgstr "Evento nuevo en el próximo lunes"
 
-#: src/gcal-quick-add-popover.c:388
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:389
 msgid "New Event next Tuesday"
 msgstr "Evento nuevo en el próximo martes"
 
-#: src/gcal-quick-add-popover.c:389
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:390
 msgid "New Event next Wednesday"
 msgstr "Evento nuevo el próximo miércoles"
 
-#: src/gcal-quick-add-popover.c:390
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:391
 msgid "New Event next Thursday"
 msgstr "Evento nuevo en el próximo jueves"
 
-#: src/gcal-quick-add-popover.c:391
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:392
 msgid "New Event next Friday"
 msgstr "Evento nuevo en el próximo viernes"
 
-#: src/gcal-quick-add-popover.c:392
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:393
 msgid "New Event next Saturday"
 msgstr "Evento nuevo el próximo sábado"
 
-#: src/gcal-quick-add-popover.c:393
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:394
 msgid "New Event next Sunday"
 msgstr "Evento nuevo en el próximo domingo"
 
-#: src/gcal-quick-add-popover.c:404
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:405
 msgid "New Event on January"
 msgstr "Evento nuevo en enero"
 
-#: src/gcal-quick-add-popover.c:405
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:406
 msgid "New Event on February"
 msgstr "Evento nuevo en febrero"
 
-#: src/gcal-quick-add-popover.c:406
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:407
 msgid "New Event on March"
 msgstr "Evento nuevo en marzo"
 
-#: src/gcal-quick-add-popover.c:407
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:408
 msgid "New Event on April"
 msgstr "Evento nuevo en abril"
 
-#: src/gcal-quick-add-popover.c:408
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:409
 msgid "New Event on May"
 msgstr "Evento nuevo en mayo"
 
-#: src/gcal-quick-add-popover.c:409
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:410
 msgid "New Event on June"
 msgstr "Evento nuevo en junio"
 
-#: src/gcal-quick-add-popover.c:410
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:411
 msgid "New Event on July"
 msgstr "Evento nuevo en julio"
 
-#: src/gcal-quick-add-popover.c:411
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:412
 msgid "New Event on August"
 msgstr "Evento nuevo en agosto"
 
-#: src/gcal-quick-add-popover.c:412
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:413
 msgid "New Event on September"
 msgstr "Evento nuevo en septiembre"
 
-#: src/gcal-quick-add-popover.c:413
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:414
 msgid "New Event on October"
 msgstr "Evento nuevo en octubre"
 
-#: src/gcal-quick-add-popover.c:414
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:415
 msgid "New Event on November"
 msgstr "Evento nuevo en noviembre"
 
-#: src/gcal-quick-add-popover.c:415
-#| msgid "New Event on %s"
+#: src/gcal-quick-add-popover.c:416
 msgid "New Event on December"
 msgstr "Evento nuevo en diciembre"
 
-#: src/gcal-quick-add-popover.c:420
+#. Translators: %1$s is the event month (e.g. "New Event on December") and %2$d is the numeric day of month
+#: src/gcal-quick-add-popover.c:422
 #, c-format
 msgid "%1$s %2$d"
 msgstr "%1$s %2$d"
 
-#: src/gcal-quick-add-popover.c:464
+#. 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:467
 #, c-format
 msgid "%1$s, %2$s – %3$s"
 msgstr "%1$s, %2$s – %3$s"
@@ -924,11 +941,11 @@ msgstr "_Eventos próximos"
 msgid "_All events"
 msgstr "_Todos los eventos"
 
-#: src/gcal-window.c:1126
+#: src/gcal-window.c:1129
 msgid "Another event deleted"
 msgstr "Otro evento eliminado"
 
-#: src/gcal-window.c:1130
+#: src/gcal-window.c:1133
 msgid "Event deleted"
 msgstr "Evento eliminado"
 
@@ -952,7 +969,7 @@ msgid_plural "Other %d events"
 msgstr[0] "Otro evento"
 msgstr[1] "Otros %d eventos"
 
-#: src/views/gcal-week-grid.c:731 src/views/gcal-week-view.c:284
+#: src/views/gcal-week-grid.c:760 src/views/gcal-week-view.c:284
 msgid "00 AM"
 msgstr "00 AM"