update es+nl

4 files changed, 854 insertions, 752 deletions

diff --git a/view/es/hmessages.po b/view/es/hmessages.po
index 88ad2bf09..27ad2c772 100644
--- a/view/es/hmessages.po
+++ b/view/es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 00:03-0800\n"
-"PO-Revision-Date: 2015-11-28 17:04+0000\n"
+"POT-Creation-Date: 2015-12-04 00:03-0800\n"
+"PO-Revision-Date: 2015-12-06 18:09+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Especificador de sala no válido."
 msgid "Room not found."
 msgstr "Sala no encontrada."
 
-#: ../../include/chat.php:133 ../../include/items.php:4396
+#: ../../include/chat.php:133 ../../include/items.php:4398
 #: ../../include/attach.php:140 ../../include/attach.php:188
 #: ../../include/attach.php:251 ../../include/attach.php:265
 #: ../../include/attach.php:272 ../../include/attach.php:337
@@ -90,17 +90,17 @@ msgstr "Sala no encontrada."
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/mail.php:118
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/regmod.php:17 ../../mod/channel.php:100
+#: ../../mod/channel.php:214 ../../mod/channel.php:254
 #: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
 #: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
 #: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
-#: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
-#: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../index.php:182 ../../index.php:365
+#: ../../mod/mail.php:118 ../../mod/service_limits.php:7
+#: ../../mod/suggest.php:26 ../../mod/events.php:260 ../../mod/message.php:16
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/mitem.php:111
+#: ../../mod/sharedwithme.php:7 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../index.php:182 ../../index.php:365
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -154,7 +154,7 @@ msgstr "Programar bandeja de entrada"
 msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1317
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1331
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../mod/photos.php:759
 #: ../../mod/photos.php:1198
@@ -183,7 +183,7 @@ msgid "Create"
 msgstr "Crear"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
 #: ../../mod/photos.php:784 ../../mod/photos.php:1317
 #: ../../mod/profile_photo.php:453
 msgid "Upload"
@@ -324,10 +324,11 @@ msgid "Describe (optional)"
 msgstr "Describir (opcional)"
 
 #: ../../include/js_strings.php:22 ../../include/widgets.php:676
-#: ../../include/ItemObject.php:697 ../../mod/filestorage.php:156
-#: ../../mod/group.php:81 ../../mod/connect.php:93 ../../mod/rate.php:168
-#: ../../mod/mood.php:135 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/pconfig.php:108 ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
 #: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
@@ -339,9 +340,9 @@ msgstr "Describir (opcional)"
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/mail.php:371 ../../mod/xchan.php:11 ../../mod/invite.php:142
-#: ../../mod/chat.php:184 ../../mod/chat.php:213 ../../mod/events.php:476
-#: ../../mod/events.php:673 ../../mod/mitem.php:231
+#: ../../mod/invite.php:142 ../../mod/xchan.php:11 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:372 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Enviar"
@@ -355,7 +356,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Cambios no guardados. ¿Está seguro de que desea abandonar la página?"
 
 #: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
-#: ../../mod/profiles.php:464 ../../mod/events.php:467
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
 msgid "Location"
 msgstr "Ubicación"
 
@@ -630,87 +631,71 @@ msgstr "Predeterminado"
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
+#: ../../include/items.php:1130 ../../include/items.php:1176
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que haya sido autenticado."
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4317 ../../mod/filestorage.php:27
+#: ../../include/items.php:4319 ../../mod/filestorage.php:27
 #: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
 #: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4831 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Colección no encontrada."
 
-#: ../../include/items.php:4842
+#: ../../include/items.php:4847
 msgid "Collection is empty."
 msgstr "La colección está vacía."
 
-#: ../../include/items.php:4849
+#: ../../include/items.php:4854
 #, php-format
 msgid "Collection: %s"
 msgstr "Colección: %s"
 
-#: ../../include/items.php:4859 ../../mod/connedit.php:683
+#: ../../include/items.php:4864 ../../mod/connedit.php:683
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:4861
+#: ../../include/items.php:4866
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "No se ha especificado ningún destinatario."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[sin asunto]"
-
-#: ../../include/message.php:43
-msgid "Unable to determine sender."
-msgstr "No ha sido posible determinar el remitente. "
-
-#: ../../include/message.php:218
-msgid "Stored post could not be verified."
-msgstr "No se han podido verificar las entradas guardadas."
-
 #: ../../include/network.php:630
 msgid "view full size"
 msgstr "Ver en el tamaño original"
@@ -1438,127 +1423,139 @@ msgstr "Eventos de la semana"
 msgid "Month View"
 msgstr "Eventos del mes"
 
-#: ../../include/widgets.php:674 ../../mod/events.php:669
+#: ../../include/widgets.php:674 ../../mod/events.php:654
 msgid "Export"
 msgstr "Exportar"
 
-#: ../../include/widgets.php:675 ../../mod/events.php:672
+#: ../../include/widgets.php:675 ../../mod/events.php:657
 msgid "Import"
 msgstr "Importar"
 
-#: ../../include/widgets.php:749
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Gestión de eventos"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Exportar el calendario"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Importar un calendario"
+
+#: ../../include/widgets.php:761
 msgid "Chat Rooms"
 msgstr "Salas de chat"
 
-#: ../../include/widgets.php:769
+#: ../../include/widgets.php:781
 msgid "Bookmarked Chatrooms"
 msgstr "Salas de chat preferidas"
 
-#: ../../include/widgets.php:789
+#: ../../include/widgets.php:801
 msgid "Suggested Chatrooms"
 msgstr "Salas de chat sugeridas"
 
-#: ../../include/widgets.php:916 ../../include/widgets.php:974
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
 msgid "photo/image"
 msgstr "foto/imagen"
 
-#: ../../include/widgets.php:1069 ../../include/widgets.php:1071
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
 msgid "Rate Me"
 msgstr "Valorar este canal"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1087
 msgid "View Ratings"
 msgstr "Mostrar las valoraciones"
 
-#: ../../include/widgets.php:1086
+#: ../../include/widgets.php:1098
 msgid "Public Hubs"
 msgstr "Servidores públicos"
 
-#: ../../include/widgets.php:1134
+#: ../../include/widgets.php:1146
 msgid "Forums"
 msgstr "Foros"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1175
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../../include/widgets.php:1170
+#: ../../include/widgets.php:1184
 msgid "Documentation"
 msgstr "Documentación"
 
-#: ../../include/widgets.php:1172
+#: ../../include/widgets.php:1186
 msgid "Project/Site Information"
 msgstr "Información sobre el proyecto o sitio"
 
-#: ../../include/widgets.php:1173
+#: ../../include/widgets.php:1187
 msgid "For Members"
 msgstr "Para los usuarios"
 
-#: ../../include/widgets.php:1174
+#: ../../include/widgets.php:1188
 msgid "For Administrators"
 msgstr "Para los administradores"
 
-#: ../../include/widgets.php:1175
+#: ../../include/widgets.php:1189
 msgid "For Developers"
 msgstr "Para los desarrolladores"
 
-#: ../../include/widgets.php:1200 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:434
 msgid "Site"
 msgstr "Sitio"
 
-#: ../../include/widgets.php:1201
+#: ../../include/widgets.php:1215
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../../include/widgets.php:1202 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:965
 msgid "Channels"
 msgstr "Canales"
 
-#: ../../include/widgets.php:1203 ../../mod/admin.php:1062
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1062
 #: ../../mod/admin.php:1102
 msgid "Plugins"
 msgstr "Extensiones"
 
-#: ../../include/widgets.php:1204 ../../mod/admin.php:1262
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1262
 #: ../../mod/admin.php:1296
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../include/widgets.php:1205
+#: ../../include/widgets.php:1219
 msgid "Inspect queue"
 msgstr "Examinar la cola"
 
-#: ../../include/widgets.php:1206
+#: ../../include/widgets.php:1220
 msgid "Profile Config"
 msgstr "Ajustes del perfil"
 
-#: ../../include/widgets.php:1207
+#: ../../include/widgets.php:1221
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../include/widgets.php:1225 ../../include/widgets.php:1231
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
 #: ../../mod/admin.php:1381
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../include/widgets.php:1229 ../../include/nav.php:210
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Administrador"
 
-#: ../../include/widgets.php:1230
+#: ../../include/widgets.php:1244
 msgid "Plugin Features"
 msgstr "Ajustes de la extensión"
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1246
 msgid "User registrations waiting for confirmation"
 msgstr "Registros de usuarios pendientes de confirmación"
 
-#: ../../include/widgets.php:1311 ../../mod/photos.php:753
+#: ../../include/widgets.php:1325 ../../mod/photos.php:753
 #: ../../mod/photos.php:1286
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../include/widgets.php:1327 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:782
 msgid "Edit Album"
 msgstr "Editar álbum"
 
@@ -1673,7 +1670,7 @@ msgstr "Fotos de gran tamaño"
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
-msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (6400px)"
+msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
 
 #: ../../include/features.php:59
 msgid "Automatically import channel content from other channels or feeds"
@@ -2078,11 +2075,11 @@ msgid "YYYY-MM-DD or MM-DD"
 msgstr "AAAA-MM-DD o MM-DD"
 
 #: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:452 ../../mod/events.php:457
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
 msgid "Required"
 msgstr "Obligatorio"
 
-#: ../../include/datetime.php:263 ../../boot.php:2289
+#: ../../include/datetime.php:263 ../../boot.php:2284
 msgid "never"
 msgstr "nunca"
 
@@ -2162,7 +2159,7 @@ msgstr "Cumpleaños de %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Feliz cumpleaños %1$s"
 
-#: ../../include/api.php:1302
+#: ../../include/api.php:1301
 msgid "Public Timeline"
 msgstr "Cronología pública"
 
@@ -2207,7 +2204,7 @@ msgstr "%1$s ha dado un toque a %2$s"
 
 #: ../../include/conversation.php:243 ../../include/text.php:954
 msgid "poked"
-msgstr "ha recibido un toque"
+msgstr "ha dado un toque a"
 
 #: ../../include/conversation.php:260 ../../mod/mood.php:63
 #, php-format
@@ -2336,7 +2333,7 @@ msgstr "Dejar de seguir este hilo"
 
 #: ../../include/conversation.php:949
 msgid "View Status"
-msgstr "Ver el estado actual"
+msgstr "Ver mi estado actual"
 
 #: ../../include/conversation.php:950 ../../include/nav.php:86
 #: ../../mod/connedit.php:498
@@ -2437,8 +2434,8 @@ msgstr "Guardar en carpeta:"
 msgid "Where are you right now?"
 msgstr "¿Donde está ahora?"
 
-#: ../../include/conversation.php:1161 ../../mod/mail.php:195
-#: ../../mod/mail.php:309 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:195 ../../mod/mail.php:309
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Caduca YYYY-MM-DD HH:MM"
 
@@ -2446,7 +2443,7 @@ msgstr "Caduca YYYY-MM-DD HH:MM"
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
 #: ../../mod/photos.php:1049 ../../mod/editblock.php:171
 #: ../../mod/webpages.php:188 ../../mod/editpost.php:149
-#: ../../mod/events.php:473
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Previsualizar"
 
@@ -2506,7 +2503,7 @@ msgstr "subir foto"
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/mail.php:240 ../../mod/mail.php:369 ../../mod/editpost.php:119
+#: ../../mod/editpost.php:119 ../../mod/mail.php:240 ../../mod/mail.php:370
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
@@ -2516,7 +2513,7 @@ msgstr "adjuntar fichero"
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/mail.php:241 ../../mod/mail.php:370 ../../mod/editpost.php:120
+#: ../../mod/editpost.php:120 ../../mod/mail.php:241 ../../mod/mail.php:371
 msgid "Insert web link"
 msgstr "Insertar enlace web"
 
@@ -2577,7 +2574,7 @@ msgstr "Categorías (opcional, lista separada por comas)"
 
 #: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editpost.php:130 ../../mod/events.php:474
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Configuración de permisos"
 
@@ -2599,7 +2596,7 @@ msgstr "Ejemplo: roberto@ejemplo.com, maría@ejemplo.com"
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/mail.php:245 ../../mod/mail.php:374 ../../mod/editpost.php:155
+#: ../../mod/editpost.php:155 ../../mod/mail.php:245 ../../mod/mail.php:375
 msgid "Set expiration date"
 msgstr "Configurar fecha de caducidad"
 
@@ -2608,7 +2605,7 @@ msgid "Set publish date"
 msgstr "Establecer la fecha de publicación"
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
+#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:377
 msgid "Encrypt text"
 msgstr "Cifrar texto"
 
@@ -2833,7 +2830,7 @@ msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
-#: ../../boot.php:1488
+#: ../../boot.php:1483
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -2861,23 +2858,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/zot.php:685
-msgid "Invalid data packet"
-msgstr "Paquete de datos no válido"
-
-#: ../../include/zot.php:701
-msgid "Unable to verify channel signature"
-msgstr "No ha sido posible de verificar la firma del canal"
-
-#: ../../include/zot.php:2265
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "No ha sido posible de verificar la firma del sitio para %s"
-
-#: ../../include/zot.php:3592
-msgid "invalid target signature"
-msgstr "La firma recibida no es válida"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:794
 #: ../../include/bbcode.php:797 ../../include/bbcode.php:802
 #: ../../include/bbcode.php:805 ../../include/bbcode.php:808
@@ -3001,47 +2981,6 @@ msgstr[1] "%d conexiones en común"
 msgid "show more"
 msgstr "mostrar más"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Opciones del directorio"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Modo seguro"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:462
-#: ../../mod/events.php:463 ../../mod/events.php:472 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "No"
-msgstr "No"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
-#: ../../mod/events.php:462 ../../mod/events.php:463 ../../mod/events.php:472
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "Yes"
-msgstr "Sí"
-
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Solo foros públicos"
-
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Solo este sitio web"
-
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -3060,7 +2999,7 @@ msgstr "%1$s, %2$s le ha enviado un nuevo mensaje privado en %3$s."
 #: ../../include/enotify.php:103
 #, php-format
 msgid "%1$s sent you %2$s."
-msgstr "%1$s le envió %2$s."
+msgstr "%1$s le ha enviado %2$s."
 
 #: ../../include/enotify.php:103
 msgid "a private message"
@@ -3126,7 +3065,7 @@ msgstr "[Hubzilla:Aviso] %s le ha etiquetado"
 #: ../../include/enotify.php:227
 #, php-format
 msgid "%1$s, %2$s tagged you at %3$s"
-msgstr "%1$s, %2$s le etiquetó en %3$s"
+msgstr "%1$s, %2$s le ha etiquetado en %3$s"
 
 #: ../../include/enotify.php:228
 #, php-format
@@ -3141,12 +3080,12 @@ msgstr "[Hubzilla:Aviso] %1$s le ha dado un toque"
 #: ../../include/enotify.php:241
 #, php-format
 msgid "%1$s, %2$s poked you at %3$s"
-msgstr "%1$s, %2$s le dio un toque en %3$s"
+msgstr "%1$s, %2$s le ha dado un toque en %3$s"
 
 #: ../../include/enotify.php:242
 #, php-format
 msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr "%1$s, %2$s [zrl=%2$s]le dio un toque[/zrl]."
+msgstr "%1$s, %2$s [zrl=%2$s]le ha dado un toque[/zrl]."
 
 #: ../../include/enotify.php:258
 #, php-format
@@ -3161,7 +3100,7 @@ msgstr "%1$s, %2$s ha etiquetado su publicación en %3$s"
 #: ../../include/enotify.php:260
 #, php-format
 msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr "%1$s, %2$s etiquetó [zrl=%3$s]su publicación[/zrl]"
+msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]"
 
 #: ../../include/enotify.php:272
 msgid "[Hubzilla:Notify] Introduction received"
@@ -3261,7 +3200,23 @@ msgstr "Contenido incorporado"
 msgid "Embedding disabled"
 msgstr "Incrustación deshabilitada"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "No se ha especificado ningún destinatario."
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "No ha sido posible determinar el remitente. "
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "No se han podido verificar las entradas guardadas."
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1480
 msgid "Logout"
 msgstr "Finalizar sesión"
 
@@ -3317,7 +3272,7 @@ msgstr "Sus marcadores"
 msgid "Your webpages"
 msgstr "Sus páginas web"
 
-#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1486
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1481
 msgid "Login"
 msgstr "Iniciar sesión"
 
@@ -3342,7 +3297,7 @@ msgstr "Pulsar para identificarse en su servidor de inicio"
 msgid "Home Page"
 msgstr "Página de inicio"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1463
 msgid "Register"
 msgstr "Registrarse"
 
@@ -3679,7 +3634,7 @@ msgstr "eliminar del fichero"
 msgid "Click to open/close"
 msgstr "Pulsar para abrir/cerrar"
 
-#: ../../include/text.php:1692 ../../mod/events.php:638
+#: ../../include/text.php:1692 ../../mod/events.php:623
 msgid "Link to Source"
 msgstr "Enlazar con la entrada en su ubicación original"
 
@@ -3727,6 +3682,47 @@ msgstr "Formato gráfico"
 msgid "Pages"
 msgstr "Páginas"
 
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Opciones del directorio"
+
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Modo seguro"
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
+#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1485
+msgid "No"
+msgstr "No"
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
+#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1485
+msgid "Yes"
+msgstr "Sí"
+
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Solo foros públicos"
+
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Solo este sitio web"
+
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -3762,6 +3758,23 @@ msgstr "Añadir nueva colección"
 msgid "Channels not in any collection"
 msgstr "El canal no se encuentra en ninguna colección"
 
+#: ../../include/zot.php:675
+msgid "Invalid data packet"
+msgstr "Paquete de datos no válido"
+
+#: ../../include/zot.php:691
+msgid "Unable to verify channel signature"
+msgstr "No ha sido posible de verificar la firma del canal"
+
+#: ../../include/zot.php:2259
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "No ha sido posible de verificar la firma del sitio para %s"
+
+#: ../../include/zot.php:3586
+msgid "invalid target signature"
+msgstr "La firma recibida no es válida"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nueva página"
@@ -4820,8 +4833,8 @@ msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 msgid "System check"
 msgstr "Verificación del sistema"
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:668
-#: ../../mod/events.php:675
+#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:653
+#: ../../mod/events.php:660
 msgid "Next"
 msgstr "Siguiente"
 
@@ -5209,7 +5222,7 @@ msgstr "Mis marcadores"
 msgid "My Connections Bookmarks"
 msgstr "Marcadores de mis conexiones"
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
 msgid "$Projectname"
 msgstr "$Projectname"
 
@@ -5946,7 +5959,7 @@ msgstr "Guardar marcador"
 msgid "URL of bookmark"
 msgstr "Dirección del marcador"
 
-#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:465
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
 msgid "Description"
 msgstr "Descripción"
 
@@ -6160,7 +6173,7 @@ msgid ""
 "Password reset failed."
 msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1494
+#: ../../mod/lostpass.php:86 ../../boot.php:1489
 msgid "Password Reset"
 msgstr "Restablecer la contraseña"
 
@@ -6409,7 +6422,7 @@ msgstr "Usar como foto del perfil"
 msgid "Private Photo"
 msgstr "Foto privada"
 
-#: ../../mod/photos.php:905 ../../mod/events.php:667 ../../mod/events.php:674
+#: ../../mod/photos.php:905 ../../mod/events.php:652 ../../mod/events.php:659
 msgid "Previous"
 msgstr "Anterior"
 
@@ -8257,121 +8270,6 @@ msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Imposible asociar a un destinatario."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Imposible comunicar con el canal solicitado."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "No se puede verificar el canal solicitado."
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
-
-#: ../../mod/mail.php:132
-msgid "Messages"
-msgstr "Mensajes"
-
-#: ../../mod/mail.php:167
-msgid "Message recalled."
-msgstr "Mensaje revocado."
-
-#: ../../mod/mail.php:180
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: ../../mod/mail.php:223
-msgid "Requested channel is not in this network"
-msgstr "El canal solicitado no existe en esta red"
-
-#: ../../mod/mail.php:231
-msgid "Send Private Message"
-msgstr "Enviar un mensaje privado"
-
-#: ../../mod/mail.php:232 ../../mod/mail.php:361
-msgid "To:"
-msgstr "Para:"
-
-#: ../../mod/mail.php:235 ../../mod/mail.php:363
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: ../../mod/mail.php:238 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Su mensaje:"
-
-#: ../../mod/mail.php:242
-msgid "Send"
-msgstr "Enviar"
-
-#: ../../mod/mail.php:333
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: ../../mod/mail.php:334
-msgid "Delivery report"
-msgstr "Informe de transmisión"
-
-#: ../../mod/mail.php:335
-msgid "Recall message"
-msgstr "Revocar el mensaje"
-
-#: ../../mod/mail.php:337
-msgid "Message has been recalled."
-msgstr "El mensaje ha sido revocado."
-
-#: ../../mod/mail.php:354
-msgid "Delete Conversation"
-msgstr "Eliminar conversación"
-
-#: ../../mod/mail.php:356
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
-
-#: ../../mod/mail.php:360
-msgid "Send Reply"
-msgstr "Responder"
-
-#: ../../mod/mail.php:365
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Su mensaje para %s (%s):"
-
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Por favor, inicie sesión."
-
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
-msgstr "Búsqueda de canales"
-
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Buscar un canal (o un \"webbie\") que comience por:"
-
-#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
-msgid "Not found."
-msgstr "No encontrado."
-
-#: ../../mod/channel.php:25 ../../mod/chat.php:19
-msgid "You must be logged in to see this page."
-msgstr "Debe haber iniciado sesión para poder ver esta página."
-
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
-
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Elemento no disponible"
-
 #: ../../mod/invite.php:25
 msgid "Total invitation limit exceeded."
 msgstr "Se ha superado el límite máximo de invitaciones."
@@ -8413,6 +8311,10 @@ msgstr "Enviar invitaciones"
 msgid "Enter email addresses, one per line:"
 msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
 
+#: ../../mod/invite.php:131 ../../mod/mail.php:238
+msgid "Your message:"
+msgstr "Su mensaje:"
+
 #: ../../mod/invite.php:132
 msgid "Please join my community on $Projectname."
 msgstr "Por favor, únase a mi comunidad en $Projectname."
@@ -8438,6 +8340,34 @@ msgstr "o visite "
 msgid "3. Click [Connect]"
 msgstr "3. Pulse [conectar]"
 
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Por favor, inicie sesión."
+
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
+msgstr "Búsqueda de canales"
+
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Buscar un canal (o un \"webbie\") que comience por:"
+
+#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
+msgid "Not found."
+msgstr "No encontrado."
+
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
+msgstr "Debe haber iniciado sesión para poder ver esta página."
+
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Elemento no disponible"
+
 #: ../../mod/lockview.php:37
 msgid "Remote privacy information not available."
 msgstr "La información privada remota no está disponible."
@@ -8827,6 +8757,89 @@ msgstr "El título del menú tal como será visto por los demás"
 msgid "Allow bookmarks"
 msgstr "Permitir marcadores"
 
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Imposible asociar a un destinatario."
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Imposible comunicar con el canal solicitado."
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "No se puede verificar el canal solicitado."
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
+
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr "Mensajes"
+
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr "Mensaje revocado."
+
+#: ../../mod/mail.php:180
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
+msgstr "El canal solicitado no existe en esta red"
+
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
+msgstr "Enviar un mensaje privado"
+
+#: ../../mod/mail.php:232 ../../mod/mail.php:362
+msgid "To:"
+msgstr "Para:"
+
+#: ../../mod/mail.php:235 ../../mod/mail.php:364
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../../mod/mail.php:242
+msgid "Send"
+msgstr "Enviar"
+
+#: ../../mod/mail.php:334
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: ../../mod/mail.php:335
+msgid "Delivery report"
+msgstr "Informe de transmisión"
+
+#: ../../mod/mail.php:336
+msgid "Recall message"
+msgstr "Revocar el mensaje"
+
+#: ../../mod/mail.php:338
+msgid "Message has been recalled."
+msgstr "El mensaje ha sido revocado."
+
+#: ../../mod/mail.php:355
+msgid "Delete Conversation"
+msgstr "Eliminar conversación"
+
+#: ../../mod/mail.php:357
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
+
+#: ../../mod/mail.php:361
+msgid "Send Reply"
+msgstr "Responder"
+
+#: ../../mod/mail.php:366
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Su mensaje para %s (%s):"
+
 #: ../../mod/post.php:234
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
@@ -8837,62 +8850,62 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión
 msgid "No service class restrictions found."
 msgstr "No se han encontrado restricciones sobre esta clase de servicio."
 
-#: ../../mod/siteinfo.php:111
+#: ../../mod/siteinfo.php:15
 #, php-format
 msgid "Version %s"
 msgstr "Versión %s"
 
-#: ../../mod/siteinfo.php:132
+#: ../../mod/siteinfo.php:36
 msgid "Installed plugins/addons/apps:"
 msgstr "Extensiones/Aplicaciones instaladas:"
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:49
 msgid "No installed plugins/addons/apps"
 msgstr "Extensiones/Aplicaciones no instaladas:"
 
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:62
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "Este es un sitio integrado en $Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada."
 
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:64
 msgid "Tag: "
 msgstr "Etiqueta:"
 
-#: ../../mod/siteinfo.php:162
+#: ../../mod/siteinfo.php:66
 msgid "Last background fetch: "
 msgstr "Última actualización en segundo plano:"
 
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:68
 msgid "Current load average: "
 msgstr "Carga media actual:"
 
-#: ../../mod/siteinfo.php:167
+#: ../../mod/siteinfo.php:71
 msgid "Running at web location"
 msgstr "Corriendo en el sitio web"
 
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:72
 msgid ""
 "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre $Projectname."
 
-#: ../../mod/siteinfo.php:169
+#: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
 msgstr "Informes de errores e incidencias: por, favor visite"
 
-#: ../../mod/siteinfo.php:171
+#: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
 msgstr "Problemas en $projectname"
 
-#: ../../mod/siteinfo.php:172
+#: ../../mod/siteinfo.php:76
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"
 
-#: ../../mod/siteinfo.php:174
+#: ../../mod/siteinfo.php:78
 msgid "Site Administrators"
 msgstr "Administradores del sitio"
 
@@ -8926,77 +8939,105 @@ msgstr "Se requieren el título del evento y su hora de inicio."
 msgid "Event not found."
 msgstr "Evento no encontrado."
 
-#: ../../mod/events.php:452
-msgid "Event Title"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Editar el título del evento"
+
+#: ../../mod/events.php:437
+msgid "Event titel"
 msgstr "Título del evento"
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:439
 msgid "Categories (comma-separated list)"
 msgstr "Categorías (lista separada por comas)"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Editar la categoría"
+
+#: ../../mod/events.php:440
 msgid "Category"
 msgstr "Categoría"
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Modificar la fecha y hora de comienzo"
+
+#: ../../mod/events.php:443
 msgid "Start date and time"
 msgstr "Fecha y hora de comienzo"
 
-#: ../../mod/events.php:459 ../../mod/events.php:462
+#: ../../mod/events.php:444 ../../mod/events.php:447
 msgid "Finish date and time are not known or not relevant"
 msgstr "La fecha y hora de terminación no se conocen o no son relevantes"
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Modificar la fecha y hora de terminación"
+
+#: ../../mod/events.php:446
 msgid "Finish date and time"
 msgstr "Fecha y hora de terminación"
 
-#: ../../mod/events.php:463 ../../mod/events.php:464
+#: ../../mod/events.php:448 ../../mod/events.php:449
 msgid "Adjust for viewer timezone"
 msgstr "Ajustar para obtener el visor de zona horaria"
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:448
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales."
 
-#: ../../mod/events.php:470 ../../mod/events.php:472
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Editar la descripción"
+
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Modificar la localización"
+
+#: ../../mod/events.php:455 ../../mod/events.php:457
 msgid "Share this event"
 msgstr "Compartir este evento"
 
-#: ../../mod/events.php:477
+#: ../../mod/events.php:462
 msgid "Advanced Options"
 msgstr "Opciones avanzadas"
 
-#: ../../mod/events.php:589
+#: ../../mod/events.php:574
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:611
+#: ../../mod/events.php:596
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: ../../mod/events.php:613
+#: ../../mod/events.php:598
 msgid "Delete event"
 msgstr "Borrar evento"
 
-#: ../../mod/events.php:647
+#: ../../mod/events.php:632
 msgid "calendar"
 msgstr "calendario"
 
-#: ../../mod/events.php:666
-msgid "New Event"
-msgstr "Nuevo evento"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Editar el evento"
 
-#: ../../mod/events.php:676
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Crear un evento"
+
+#: ../../mod/events.php:661
 msgid "Today"
 msgstr "Hoy"
 
-#: ../../mod/events.php:707
+#: ../../mod/events.php:692
 msgid "Event removed"
 msgstr "Evento borrado"
 
-#: ../../mod/events.php:710
+#: ../../mod/events.php:695
 msgid "Failed to remove event"
 msgstr "Error al eliminar el evento"
 
@@ -9293,51 +9334,51 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
-#: ../../boot.php:1291
+#: ../../boot.php:1292
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1294
+#: ../../boot.php:1295
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1461
+#: ../../boot.php:1462
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1484
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1485
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1493
+#: ../../boot.php:1488
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2113
+#: ../../boot.php:2108
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2248
+#: ../../boot.php:2243
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificado SSL del sitio web no es válido. Por favor, solucione el problema."
 
-#: ../../boot.php:2251
+#: ../../boot.php:2246
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2288
+#: ../../boot.php:2283
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2292
+#: ../../boot.php:2287
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Las tareas de Cron no están funcionando en %s"
diff --git a/view/es/hstrings.php b/view/es/hstrings.php
index 18cdf0a8a..6b73063b8 100644
--- a/view/es/hstrings.php
+++ b/view/es/hstrings.php
@@ -143,10 +143,6 @@ $a->strings["Collection is empty."] = "La colección está vacía.";
 $a->strings["Collection: %s"] = "Colección: %s";
 $a->strings["Connection: %s"] = "Conexión: %s";
 $a->strings["Connection not found."] = "Conexión no encontrada";
-$a->strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
-$a->strings["[no subject]"] = "[sin asunto]";
-$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
-$a->strings["Stored post could not be verified."] = "No se han podido verificar las entradas guardadas.";
 $a->strings["view full size"] = "Ver en el tamaño original";
 $a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
 $a->strings["\$projectname"] = "\$projectname";
@@ -321,6 +317,9 @@ $a->strings["Week View"] = "Eventos de la semana";
 $a->strings["Month View"] = "Eventos del mes";
 $a->strings["Export"] = "Exportar";
 $a->strings["Import"] = "Importar";
+$a->strings["Events Tools"] = "Gestión de eventos";
+$a->strings["Export Calendar"] = "Exportar el calendario";
+$a->strings["Import Calendar"] = "Importar un calendario";
 $a->strings["Chat Rooms"] = "Salas de chat";
 $a->strings["Bookmarked Chatrooms"] = "Salas de chat preferidas";
 $a->strings["Suggested Chatrooms"] = "Salas de chat sugeridas";
@@ -375,7 +374,7 @@ $a->strings["Post Composition Features"] = "Características de composición de
 $a->strings["Use Markdown"] = "Usar Markdown";
 $a->strings["Allow use of \"Markdown\" to format posts"] = "Permitir el uso de \"Markdown\" para formatear publicaciones";
 $a->strings["Large Photos"] = "Fotos de gran tamaño";
-$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (6400px)";
+$a->strings["Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails"] = "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)";
 $a->strings["Automatically import channel content from other channels or feeds"] = "Importar automáticamente contenido de otros canales o \"feeds\"";
 $a->strings["Even More Encryption"] = "Más cifrado todavía";
 $a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida.";
@@ -501,7 +500,7 @@ $a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s le gusta %3\$s de %2\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "a %1\$s no le gusta %3\$s de %2\$s";
 $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
-$a->strings["poked"] = "ha recibido un toque";
+$a->strings["poked"] = "ha dado un toque a";
 $a->strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
 $a->strings["__ctx:title__ Likes"] = "Me gusta";
 $a->strings["__ctx:title__ Dislikes"] = "No me gusta";
@@ -529,7 +528,7 @@ $a->strings["Delete Selected Items"] = "Eliminar elementos seleccionados";
 $a->strings["View Source"] = "Ver la fuente original de la entrada";
 $a->strings["Follow Thread"] = "Seguir este hilo";
 $a->strings["Unfollow Thread"] = "Dejar de seguir este hilo";
-$a->strings["View Status"] = "Ver el estado actual";
+$a->strings["View Status"] = "Ver mi estado actual";
 $a->strings["View Profile"] = "Ver el perfil";
 $a->strings["View Photos"] = "Ver fotos";
 $a->strings["Activity/Posts"] = "Actividad y entradas";
@@ -669,10 +668,6 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Invalid data packet"] = "Paquete de datos no válido";
-$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
-$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
-$a->strings["invalid target signature"] = "La firma recibida no es válida";
 $a->strings["Image/photo"] = "Imagen/foto";
 $a->strings["Encrypted content"] = "Contenido cifrado";
 $a->strings["Install %s element: "] = "Instalar el elemento %s:";
@@ -705,16 +700,10 @@ $a->strings["%d connection in common"] = array(
 	1 => "%d conexiones en común",
 );
 $a->strings["show more"] = "mostrar más";
-$a->strings["Directory Options"] = "Opciones del directorio";
-$a->strings["Safe Mode"] = "Modo seguro";
-$a->strings["No"] = "No";
-$a->strings["Yes"] = "Sí";
-$a->strings["Public Forums Only"] = "Solo foros públicos";
-$a->strings["This Website Only"] = "Solo este sitio web";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Aviso] Nuevo mensaje en %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s le ha enviado un nuevo mensaje privado en %3\$s.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s le ha enviado %2\$s.";
 $a->strings["a private message"] = "un mensaje privado";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado.";
 $a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]%4\$s[/zrl]";
@@ -727,14 +716,14 @@ $a->strings["[Hubzilla:Notify] %s posted to your profile wall"] = "[Hubzilla:Avi
 $a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = "%1\$s, %2\$s publicó en su página del perfil en %3\$s";
 $a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = "%1\$s, %2\$s publicó en [zrl=%3\$s]su página del perfil[/zrl]";
 $a->strings["[Hubzilla:Notify] %s tagged you"] = "[Hubzilla:Aviso] %s le ha etiquetado";
-$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s";
+$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le ha etiquetado en %3\$s";
 $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl].";
 $a->strings["[Hubzilla:Notify] %1\$s poked you"] = "[Hubzilla:Aviso] %1\$s le ha dado un toque";
-$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s";
-$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl].";
+$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le ha dado un toque en %3\$s";
+$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le ha dado un toque[/zrl].";
 $a->strings["[Hubzilla:Notify] %s tagged your post"] = "[Hubzilla:Aviso] %s ha etiquetado su publicación";
 $a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación en %3\$s";
-$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetó [zrl=%3\$s]su publicación[/zrl]";
+$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]";
 $a->strings["[Hubzilla:Notify] Introduction received"] = "[Hubzilla:Aviso] Ha recibido una solicitud de conexión";
 $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en  %3\$s";
 $a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s.";
@@ -757,6 +746,10 @@ $a->strings["local account not found."] = "No se ha encontrado la cuenta local."
 $a->strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
 $a->strings["Embedded content"] = "Contenido incorporado";
 $a->strings["Embedding disabled"] = "Incrustación deshabilitada";
+$a->strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
+$a->strings["[no subject]"] = "[sin asunto]";
+$a->strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
+$a->strings["Stored post could not be verified."] = "No se han podido verificar las entradas guardadas.";
 $a->strings["Logout"] = "Finalizar sesión";
 $a->strings["End this session"] = "Finalizar esta sesión";
 $a->strings["Home"] = "Inicio";
@@ -874,6 +867,12 @@ $a->strings["Blocks"] = "Bloques";
 $a->strings["Menus"] = "Menús";
 $a->strings["Layouts"] = "Formato gráfico";
 $a->strings["Pages"] = "Páginas";
+$a->strings["Directory Options"] = "Opciones del directorio";
+$a->strings["Safe Mode"] = "Modo seguro";
+$a->strings["No"] = "No";
+$a->strings["Yes"] = "Sí";
+$a->strings["Public Forums Only"] = "Solo foros públicos";
+$a->strings["This Website Only"] = "Solo este sitio web";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 $a->strings["Add new connections to this collection (privacy group)"] = "Añadir nuevas conexiones a esta colección (privacidad del grupo)";
 $a->strings["All Channels"] = "Todos los canales";
@@ -882,6 +881,10 @@ $a->strings["Collections"] = "Colecciones";
 $a->strings["Edit collection"] = "Editar colección";
 $a->strings["Add new collection"] = "Añadir nueva colección";
 $a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección";
+$a->strings["Invalid data packet"] = "Paquete de datos no válido";
+$a->strings["Unable to verify channel signature"] = "No ha sido posible de verificar la firma del canal";
+$a->strings["Unable to verify site signature for %s"] = "No ha sido posible de verificar la firma del sitio para %s";
+$a->strings["invalid target signature"] = "La firma recibida no es válida";
 $a->strings["New Page"] = "Nueva página";
 $a->strings["View"] = "Ver";
 $a->strings["Actions"] = "Acciones";
@@ -1943,34 +1946,6 @@ $a->strings["Sync now"] = "Sincronizar ahora";
 $a->strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
-$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
-$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
-$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
-$a->strings["Messages"] = "Mensajes";
-$a->strings["Message recalled."] = "Mensaje revocado.";
-$a->strings["Conversation removed."] = "Conversación eliminada.";
-$a->strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
-$a->strings["Send Private Message"] = "Enviar un mensaje privado";
-$a->strings["To:"] = "Para:";
-$a->strings["Subject:"] = "Asunto:";
-$a->strings["Your message:"] = "Su mensaje:";
-$a->strings["Send"] = "Enviar";
-$a->strings["Delete message"] = "Borrar mensaje";
-$a->strings["Delivery report"] = "Informe de transmisión";
-$a->strings["Recall message"] = "Revocar el mensaje";
-$a->strings["Message has been recalled."] = "El mensaje ha sido revocado.";
-$a->strings["Delete Conversation"] = "Eliminar conversación";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
-$a->strings["Send Reply"] = "Responder";
-$a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
-$a->strings["Please login."] = "Por favor, inicie sesión.";
-$a->strings["Xchan Lookup"] = "Búsqueda de canales";
-$a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
-$a->strings["Not found."] = "No encontrado.";
-$a->strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
-$a->strings["Item not available."] = "Elemento no disponible";
 $a->strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
 $a->strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
 $a->strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
@@ -1983,12 +1958,20 @@ $a->strings["%d message sent."] = array(
 $a->strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
 $a->strings["Send invitations"] = "Enviar invitaciones";
 $a->strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
+$a->strings["Your message:"] = "Su mensaje:";
 $a->strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
 $a->strings["You will need to supply this invitation code: "] = "Debe proporcionar este código de invitación:";
 $a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)";
 $a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
 $a->strings["or visit "] = "o visite ";
 $a->strings["3. Click [Connect]"] = "3. Pulse [conectar]";
+$a->strings["Please login."] = "Por favor, inicie sesión.";
+$a->strings["Xchan Lookup"] = "Búsqueda de canales";
+$a->strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
+$a->strings["Not found."] = "No encontrado.";
+$a->strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficientes. Petición redirigida a la página del perfil.";
+$a->strings["Item not available."] = "Elemento no disponible";
 $a->strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
 $a->strings["Visible to:"] = "Visible para:";
 $a->strings["Export Channel"] = "Exportar el canal";
@@ -2079,6 +2062,26 @@ $a->strings["Must be unique, only seen by you"] = "Debe ser único, solo será v
 $a->strings["Menu title"] = "Título del menú";
 $a->strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
 $a->strings["Allow bookmarks"] = "Permitir marcadores";
+$a->strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
+$a->strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
+$a->strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+$a->strings["Messages"] = "Mensajes";
+$a->strings["Message recalled."] = "Mensaje revocado.";
+$a->strings["Conversation removed."] = "Conversación eliminada.";
+$a->strings["Requested channel is not in this network"] = "El canal solicitado no existe en esta red";
+$a->strings["Send Private Message"] = "Enviar un mensaje privado";
+$a->strings["To:"] = "Para:";
+$a->strings["Subject:"] = "Asunto:";
+$a->strings["Send"] = "Enviar";
+$a->strings["Delete message"] = "Borrar mensaje";
+$a->strings["Delivery report"] = "Informe de transmisión";
+$a->strings["Recall message"] = "Revocar el mensaje";
+$a->strings["Message has been recalled."] = "El mensaje ha sido revocado.";
+$a->strings["Delete Conversation"] = "Eliminar conversación";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
+$a->strings["Send Reply"] = "Responder";
+$a->strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "La autenticación desde su servidor está bloqueada. Ha iniciado sesión localmente. Por favor, salga de la sesión y vuelva a intentarlo.";
 $a->strings["No service class restrictions found."] = "No se han encontrado restricciones sobre esta clase de servicio.";
 $a->strings["Version %s"] = "Versión %s";
@@ -2101,21 +2104,28 @@ $a->strings["Event can not end before it has started."] = "Un evento no puede te
 $a->strings["Unable to generate preview."] = "No se puede crear la vista previa.";
 $a->strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
 $a->strings["Event not found."] = "Evento no encontrado.";
-$a->strings["Event Title"] = "Título del evento";
+$a->strings["Edit event titel"] = "Editar el título del evento";
+$a->strings["Event titel"] = "Título del evento";
 $a->strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
+$a->strings["Edit Category"] = "Editar la categoría";
 $a->strings["Category"] = "Categoría";
+$a->strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo";
 $a->strings["Start date and time"] = "Fecha y hora de comienzo";
 $a->strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes";
+$a->strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación";
 $a->strings["Finish date and time"] = "Fecha y hora de terminación";
 $a->strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de zona horaria";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
+$a->strings["Edit Description"] = "Editar la descripción";
+$a->strings["Edit Location"] = "Modificar la localización";
 $a->strings["Share this event"] = "Compartir este evento";
 $a->strings["Advanced Options"] = "Opciones avanzadas";
 $a->strings["l, F j"] = "l j F";
 $a->strings["Edit event"] = "Editar evento";
 $a->strings["Delete event"] = "Borrar evento";
 $a->strings["calendar"] = "calendario";
-$a->strings["New Event"] = "Nuevo evento";
+$a->strings["Edit Event"] = "Editar el evento";
+$a->strings["Create Event"] = "Crear un evento";
 $a->strings["Today"] = "Hoy";
 $a->strings["Event removed"] = "Evento borrado";
 $a->strings["Failed to remove event"] = "Error al eliminar el evento";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index bc7642841..9029d41a6 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-27 00:03-0800\n"
-"PO-Revision-Date: 2015-11-28 22:02+0000\n"
+"POT-Creation-Date: 2015-12-04 00:03-0800\n"
+"PO-Revision-Date: 2015-12-07 13:18+0000\n"
 "Last-Translator: jeroenpraat <jeroenpraat@xs4all.nl>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/red-matrix/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Ongeldige omschrijving chatkanaal"
 msgid "Room not found."
 msgstr "Chatkanaal niet gevonden"
 
-#: ../../include/chat.php:133 ../../include/items.php:4396
+#: ../../include/chat.php:133 ../../include/items.php:4398
 #: ../../include/attach.php:140 ../../include/attach.php:188
 #: ../../include/attach.php:251 ../../include/attach.php:265
 #: ../../include/attach.php:272 ../../include/attach.php:337
@@ -85,17 +85,17 @@ msgstr "Chatkanaal niet gevonden"
 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
 #: ../../mod/settings.php:568 ../../mod/webpages.php:69
 #: ../../mod/appman.php:66 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/mail.php:118
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/layouts.php:87 ../../mod/locs.php:83 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/regmod.php:17 ../../mod/channel.php:100
+#: ../../mod/channel.php:214 ../../mod/channel.php:254
 #: ../../mod/editpost.php:13 ../../mod/chat.php:94 ../../mod/chat.php:99
 #: ../../mod/viewsrc.php:14 ../../mod/authtest.php:13
 #: ../../mod/connections.php:29 ../../mod/manage.php:6 ../../mod/menu.php:74
-#: ../../mod/service_limits.php:7 ../../mod/suggest.php:26
-#: ../../mod/events.php:260 ../../mod/message.php:16 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/mitem.php:111 ../../mod/sharedwithme.php:7
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../index.php:182 ../../index.php:365
+#: ../../mod/mail.php:118 ../../mod/service_limits.php:7
+#: ../../mod/suggest.php:26 ../../mod/events.php:260 ../../mod/message.php:16
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/mitem.php:111
+#: ../../mod/sharedwithme.php:7 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../index.php:182 ../../index.php:365
 msgid "Permission denied."
 msgstr "Toegang geweigerd"
 
@@ -149,7 +149,7 @@ msgstr "Planning-postvak IN"
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1317
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/widgets.php:1331
 #: ../../include/conversation.php:1027 ../../include/apps.php:360
 #: ../../include/apps.php:415 ../../mod/photos.php:759
 #: ../../mod/photos.php:1198
@@ -178,7 +178,7 @@ msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../include/RedDAV/RedBrowser.php:231
-#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1329
+#: ../../include/RedDAV/RedBrowser.php:305 ../../include/widgets.php:1343
 #: ../../mod/photos.php:784 ../../mod/photos.php:1317
 #: ../../mod/profile_photo.php:453
 msgid "Upload"
@@ -319,10 +319,11 @@ msgid "Describe (optional)"
 msgstr "Omschrijving (optioneel)"
 
 #: ../../include/js_strings.php:22 ../../include/widgets.php:676
-#: ../../include/ItemObject.php:697 ../../mod/filestorage.php:156
-#: ../../mod/group.php:81 ../../mod/connect.php:93 ../../mod/rate.php:168
-#: ../../mod/mood.php:135 ../../mod/setup.php:331 ../../mod/setup.php:371
-#: ../../mod/pconfig.php:108 ../../mod/poke.php:171 ../../mod/profiles.php:675
+#: ../../include/widgets.php:688 ../../include/ItemObject.php:697
+#: ../../mod/filestorage.php:156 ../../mod/group.php:81
+#: ../../mod/connect.php:93 ../../mod/rate.php:168 ../../mod/mood.php:135
+#: ../../mod/setup.php:331 ../../mod/setup.php:371 ../../mod/pconfig.php:108
+#: ../../mod/poke.php:171 ../../mod/profiles.php:675
 #: ../../mod/connedit.php:715 ../../mod/fsuggest.php:108
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
 #: ../../mod/import.php:527 ../../mod/photos.php:637 ../../mod/photos.php:1008
@@ -334,9 +335,9 @@ msgstr "Omschrijving (optioneel)"
 #: ../../mod/settings.php:698 ../../mod/settings.php:726
 #: ../../mod/settings.php:749 ../../mod/settings.php:834
 #: ../../mod/settings.php:1023 ../../mod/appman.php:99 ../../mod/locs.php:116
-#: ../../mod/mail.php:371 ../../mod/xchan.php:11 ../../mod/invite.php:142
-#: ../../mod/chat.php:184 ../../mod/chat.php:213 ../../mod/events.php:476
-#: ../../mod/events.php:673 ../../mod/mitem.php:231
+#: ../../mod/invite.php:142 ../../mod/xchan.php:11 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/mail.php:372 ../../mod/events.php:461
+#: ../../mod/events.php:658 ../../mod/mitem.php:231
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr "Opslaan"
@@ -350,7 +351,7 @@ msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr "Niet opgeslagen wijzigingen. Ben je er zeker van dat je deze pagina wil verlaten?"
 
 #: ../../include/js_strings.php:25 ../../mod/pubsites.php:28
-#: ../../mod/profiles.php:464 ../../mod/events.php:467
+#: ../../mod/profiles.php:464 ../../mod/events.php:452
 msgid "Location"
 msgstr "Locatie"
 
@@ -625,87 +626,71 @@ msgstr "Standaard"
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
+#: ../../include/items.php:1130 ../../include/items.php:1176
 msgid "(Unknown)"
 msgstr "(Onbekend)"
 
-#: ../../include/items.php:1371
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Voor iedereen op het internet zichtbaar."
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Alleen voor jou zichtbaar."
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Voor iedereen in dit netwerk zichtbaar."
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Voor iedereen op %s zichtbaar."
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Voor alle connecties zichtbaar."
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Voor alle goedgekeurde connecties zichtbaar."
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Voor specifieke connecties zichtbaar."
 
-#: ../../include/items.php:4317 ../../mod/filestorage.php:27
+#: ../../include/items.php:4319 ../../mod/filestorage.php:27
 #: ../../mod/thing.php:86 ../../mod/admin.php:127 ../../mod/admin.php:1005
 #: ../../mod/admin.php:1210 ../../mod/display.php:36 ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Item niet gevonden."
 
-#: ../../include/items.php:4826 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4831 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr "Collectie niet gevonden."
 
-#: ../../include/items.php:4842
+#: ../../include/items.php:4847
 msgid "Collection is empty."
 msgstr "Collectie is leeg"
 
-#: ../../include/items.php:4849
+#: ../../include/items.php:4854
 #, php-format
 msgid "Collection: %s"
 msgstr "Collectie: %s"
 
-#: ../../include/items.php:4859 ../../mod/connedit.php:683
+#: ../../include/items.php:4864 ../../mod/connedit.php:683
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../include/items.php:4861
+#: ../../include/items.php:4866
 msgid "Connection not found."
 msgstr "Connectie niet gevonden."
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
-msgstr "Geen ontvanger opgegeven."
-
-#: ../../include/message.php:23
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
-
-#: ../../include/message.php:43
-msgid "Unable to determine sender."
-msgstr "Afzender kan niet bepaald worden."
-
-#: ../../include/message.php:218
-msgid "Stored post could not be verified."
-msgstr "Opgeslagen bericht kon niet worden geverifieerd."
-
 #: ../../include/network.php:630
 msgid "view full size"
 msgstr "volledige grootte tonen"
@@ -1433,127 +1418,139 @@ msgstr "Week tonen"
 msgid "Month View"
 msgstr "Maand tonen"
 
-#: ../../include/widgets.php:674 ../../mod/events.php:669
+#: ../../include/widgets.php:674 ../../mod/events.php:654
 msgid "Export"
 msgstr "Exporteren"
 
-#: ../../include/widgets.php:675 ../../mod/events.php:672
+#: ../../include/widgets.php:675 ../../mod/events.php:657
 msgid "Import"
 msgstr "Importeren"
 
-#: ../../include/widgets.php:749
+#: ../../include/widgets.php:685
+msgid "Events Tools"
+msgstr "Agenda-hulpmiddelen"
+
+#: ../../include/widgets.php:686
+msgid "Export Calendar"
+msgstr "Exporteren"
+
+#: ../../include/widgets.php:687
+msgid "Import Calendar"
+msgstr "Importeren"
+
+#: ../../include/widgets.php:761
 msgid "Chat Rooms"
 msgstr "Chatkanalen"
 
-#: ../../include/widgets.php:769
+#: ../../include/widgets.php:781
 msgid "Bookmarked Chatrooms"
 msgstr "Bladwijzers van chatkanalen"
 
-#: ../../include/widgets.php:789
+#: ../../include/widgets.php:801
 msgid "Suggested Chatrooms"
 msgstr "Voorgestelde chatkanalen"
 
-#: ../../include/widgets.php:916 ../../include/widgets.php:974
+#: ../../include/widgets.php:928 ../../include/widgets.php:986
 msgid "photo/image"
 msgstr "foto/afbeelding"
 
-#: ../../include/widgets.php:1069 ../../include/widgets.php:1071
+#: ../../include/widgets.php:1081 ../../include/widgets.php:1083
 msgid "Rate Me"
 msgstr "Beoordeel mij"
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1087
 msgid "View Ratings"
 msgstr "Bekijk beoordelingen"
 
-#: ../../include/widgets.php:1086
+#: ../../include/widgets.php:1098
 msgid "Public Hubs"
 msgstr "Openbare hubs"
 
-#: ../../include/widgets.php:1134
+#: ../../include/widgets.php:1146
 msgid "Forums"
 msgstr "Forums"
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1175
 msgid "Tasks"
 msgstr "Taken"
 
-#: ../../include/widgets.php:1170
+#: ../../include/widgets.php:1184
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: ../../include/widgets.php:1172
+#: ../../include/widgets.php:1186
 msgid "Project/Site Information"
 msgstr "Project- en hub-informatie"
 
-#: ../../include/widgets.php:1173
+#: ../../include/widgets.php:1187
 msgid "For Members"
 msgstr "Voor leden"
 
-#: ../../include/widgets.php:1174
+#: ../../include/widgets.php:1188
 msgid "For Administrators"
 msgstr "Voor beheerders"
 
-#: ../../include/widgets.php:1175
+#: ../../include/widgets.php:1189
 msgid "For Developers"
 msgstr "Voor ontwikkelaars"
 
-#: ../../include/widgets.php:1200 ../../mod/admin.php:434
+#: ../../include/widgets.php:1214 ../../mod/admin.php:434
 msgid "Site"
 msgstr "Hub-instellingen"
 
-#: ../../include/widgets.php:1201
+#: ../../include/widgets.php:1215
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../../include/widgets.php:1202 ../../mod/admin.php:965
+#: ../../include/widgets.php:1216 ../../mod/admin.php:965
 msgid "Channels"
 msgstr "Kanalen"
 
-#: ../../include/widgets.php:1203 ../../mod/admin.php:1062
+#: ../../include/widgets.php:1217 ../../mod/admin.php:1062
 #: ../../mod/admin.php:1102
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../../include/widgets.php:1204 ../../mod/admin.php:1262
+#: ../../include/widgets.php:1218 ../../mod/admin.php:1262
 #: ../../mod/admin.php:1296
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../include/widgets.php:1205
+#: ../../include/widgets.php:1219
 msgid "Inspect queue"
 msgstr "Inspecteer berichtenwachtrij"
 
-#: ../../include/widgets.php:1206
+#: ../../include/widgets.php:1220
 msgid "Profile Config"
 msgstr "Profielconfiguratie"
 
-#: ../../include/widgets.php:1207
+#: ../../include/widgets.php:1221
 msgid "DB updates"
 msgstr "Database-updates"
 
-#: ../../include/widgets.php:1225 ../../include/widgets.php:1231
+#: ../../include/widgets.php:1239 ../../include/widgets.php:1245
 #: ../../mod/admin.php:1381
 msgid "Logs"
 msgstr "Logboeken"
 
-#: ../../include/widgets.php:1229 ../../include/nav.php:210
+#: ../../include/widgets.php:1243 ../../include/nav.php:210
 msgid "Admin"
 msgstr "Beheer"
 
-#: ../../include/widgets.php:1230
+#: ../../include/widgets.php:1244
 msgid "Plugin Features"
 msgstr "Plug-in-opties"
 
-#: ../../include/widgets.php:1232
+#: ../../include/widgets.php:1246
 msgid "User registrations waiting for confirmation"
 msgstr "Accounts die op goedkeuring wachten"
 
-#: ../../include/widgets.php:1311 ../../mod/photos.php:753
+#: ../../include/widgets.php:1325 ../../mod/photos.php:753
 #: ../../mod/photos.php:1286
 msgid "View Photo"
 msgstr "Foto weergeven"
 
-#: ../../include/widgets.php:1327 ../../mod/photos.php:782
+#: ../../include/widgets.php:1341 ../../mod/photos.php:782
 msgid "Edit Album"
 msgstr "Album bewerken"
 
@@ -2073,11 +2070,11 @@ msgid "YYYY-MM-DD or MM-DD"
 msgstr "JJJJ-MM-DD of MM-DD"
 
 #: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:452 ../../mod/events.php:457
+#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
 msgid "Required"
 msgstr "Vereist"
 
-#: ../../include/datetime.php:263 ../../boot.php:2289
+#: ../../include/datetime.php:263 ../../boot.php:2284
 msgid "never"
 msgstr "nooit"
 
@@ -2157,7 +2154,7 @@ msgstr "Verjaardag van %1$s"
 msgid "Happy Birthday %1$s"
 msgstr "Gefeliciteerd met je verjaardag %1$s"
 
-#: ../../include/api.php:1302
+#: ../../include/api.php:1301
 msgid "Public Timeline"
 msgstr "Openbare tijdlijn"
 
@@ -2432,8 +2429,8 @@ msgstr "Bewaar in map: "
 msgid "Where are you right now?"
 msgstr "Waar bevind je je op dit moment?"
 
-#: ../../include/conversation.php:1161 ../../mod/mail.php:195
-#: ../../mod/mail.php:309 ../../mod/editpost.php:56
+#: ../../include/conversation.php:1161 ../../mod/editpost.php:56
+#: ../../mod/mail.php:195 ../../mod/mail.php:309
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 
@@ -2441,7 +2438,7 @@ msgstr "Verloopt op DD-MM-YYYY om HH:MM"
 #: ../../include/ItemObject.php:706 ../../mod/editwebpage.php:212
 #: ../../mod/photos.php:1049 ../../mod/editblock.php:171
 #: ../../mod/webpages.php:188 ../../mod/editpost.php:149
-#: ../../mod/events.php:473
+#: ../../mod/events.php:458
 msgid "Preview"
 msgstr "Voorvertoning"
 
@@ -2501,7 +2498,7 @@ msgstr "foto uploaden"
 
 #: ../../include/conversation.php:1206 ../../mod/editwebpage.php:183
 #: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
-#: ../../mod/mail.php:240 ../../mod/mail.php:369 ../../mod/editpost.php:119
+#: ../../mod/editpost.php:119 ../../mod/mail.php:240 ../../mod/mail.php:370
 msgid "Attach file"
 msgstr "Bestand toevoegen"
 
@@ -2511,7 +2508,7 @@ msgstr "bestand toevoegen"
 
 #: ../../include/conversation.php:1208 ../../mod/editwebpage.php:184
 #: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
-#: ../../mod/mail.php:241 ../../mod/mail.php:370 ../../mod/editpost.php:120
+#: ../../mod/editpost.php:120 ../../mod/mail.php:241 ../../mod/mail.php:371
 msgid "Insert web link"
 msgstr "Weblink invoegen"
 
@@ -2572,7 +2569,7 @@ msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
 #: ../../include/conversation.php:1228 ../../mod/editwebpage.php:191
 #: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editpost.php:130 ../../mod/events.php:474
+#: ../../mod/editpost.php:130 ../../mod/events.php:459
 msgid "Permission settings"
 msgstr "Permissies"
 
@@ -2594,7 +2591,7 @@ msgstr "Voorbeeld: bob@voorbeeld.nl, mary@voorbeeld.be"
 
 #: ../../include/conversation.php:1252 ../../mod/editwebpage.php:217
 #: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
-#: ../../mod/mail.php:245 ../../mod/mail.php:374 ../../mod/editpost.php:155
+#: ../../mod/editpost.php:155 ../../mod/mail.php:245 ../../mod/mail.php:375
 msgid "Set expiration date"
 msgstr "Verloopdatum instellen"
 
@@ -2603,7 +2600,7 @@ msgid "Set publish date"
 msgstr "Publicatiedatum instellen"
 
 #: ../../include/conversation.php:1257 ../../include/ItemObject.php:709
-#: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:157
+#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:377
 msgid "Encrypt text"
 msgstr "Tekst versleutelen"
 
@@ -2828,7 +2825,7 @@ msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:805 ../../mod/admin.php:814
-#: ../../boot.php:1488
+#: ../../boot.php:1483
 msgid "Email"
 msgstr "E-mail"
 
@@ -2856,23 +2853,6 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../../include/zot.php:685
-msgid "Invalid data packet"
-msgstr "Datapakket ongeldig"
-
-#: ../../include/zot.php:701
-msgid "Unable to verify channel signature"
-msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
-
-#: ../../include/zot.php:2265
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
-
-#: ../../include/zot.php:3592
-msgid "invalid target signature"
-msgstr "ongeldig doelkenmerk"
-
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:794
 #: ../../include/bbcode.php:797 ../../include/bbcode.php:802
 #: ../../include/bbcode.php:805 ../../include/bbcode.php:808
@@ -2996,47 +2976,6 @@ msgstr[1] "%d gemeenschappelijke connecties"
 msgid "show more"
 msgstr "meer connecties weergeven"
 
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr "Opties kanalengids"
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr "Veilig zoeken"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
-#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:462
-#: ../../mod/events.php:463 ../../mod/events.php:472 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "No"
-msgstr "Nee"
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
-#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
-#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
-#: ../../mod/events.php:462 ../../mod/events.php:463 ../../mod/events.php:472
-#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1490
-msgid "Yes"
-msgstr "Ja"
-
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
-msgstr "Alleen openbare forums"
-
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
-msgstr "Alleen deze hub"
-
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -3256,7 +3195,23 @@ msgstr "Ingesloten inhoud"
 msgid "Embedding disabled"
 msgstr "Insluiten uitgeschakeld"
 
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1485
+#: ../../include/message.php:19
+msgid "No recipient provided."
+msgstr "Geen ontvanger opgegeven."
+
+#: ../../include/message.php:24
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
+
+#: ../../include/message.php:44
+msgid "Unable to determine sender."
+msgstr "Afzender kan niet bepaald worden."
+
+#: ../../include/message.php:219
+msgid "Stored post could not be verified."
+msgstr "Opgeslagen bericht kon niet worden geverifieerd."
+
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1480
 msgid "Logout"
 msgstr "Uitloggen"
 
@@ -3312,7 +3267,7 @@ msgstr "Jouw bladwijzers"
 msgid "Your webpages"
 msgstr "Jouw webpagina's"
 
-#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1486
+#: ../../include/nav.php:111 ../../include/apps.php:131 ../../boot.php:1481
 msgid "Login"
 msgstr "Inloggen"
 
@@ -3337,7 +3292,7 @@ msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1462
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1463
 msgid "Register"
 msgstr "Registreren"
 
@@ -3674,7 +3629,7 @@ msgstr "uit map verwijderen"
 msgid "Click to open/close"
 msgstr "Klik om te openen of te sluiten"
 
-#: ../../include/text.php:1692 ../../mod/events.php:638
+#: ../../include/text.php:1692 ../../mod/events.php:623
 msgid "Link to Source"
 msgstr "Originele locatie"
 
@@ -3722,6 +3677,47 @@ msgstr "Lay-outs"
 msgid "Pages"
 msgstr "Pagina's"
 
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
+msgstr "Opties kanalengids"
+
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
+msgstr "Veilig zoeken"
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/connedit.php:635 ../../mod/connedit.php:684 ../../mod/api.php:106
+#: ../../mod/photos.php:626 ../../mod/admin.php:410 ../../mod/settings.php:577
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/events.php:447
+#: ../../mod/events.php:448 ../../mod/events.php:457 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1485
+msgid "No"
+msgstr "Nee"
+
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/removeme.php:60
+#: ../../mod/api.php:105 ../../mod/photos.php:626 ../../mod/admin.php:412
+#: ../../mod/settings.php:577 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
+#: ../../mod/mitem.php:229 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1485
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
+msgstr "Alleen openbare forums"
+
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
+msgstr "Alleen deze hub"
+
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -3757,6 +3753,23 @@ msgstr "Nieuwe collectie toevoegen"
 msgid "Channels not in any collection"
 msgstr "Kanalen die zich in geen enkele collectie bevinden"
 
+#: ../../include/zot.php:675
+msgid "Invalid data packet"
+msgstr "Datapakket ongeldig"
+
+#: ../../include/zot.php:691
+msgid "Unable to verify channel signature"
+msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
+
+#: ../../include/zot.php:2259
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
+
+#: ../../include/zot.php:3586
+msgid "invalid target signature"
+msgstr "ongeldig doelkenmerk"
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr "Nieuwe pagina"
@@ -4815,8 +4828,8 @@ msgstr "Please see the file \"install/INSTALL.txt\"."
 msgid "System check"
 msgstr "System check"
 
-#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:668
-#: ../../mod/events.php:675
+#: ../../mod/setup.php:285 ../../mod/photos.php:914 ../../mod/events.php:653
+#: ../../mod/events.php:660
 msgid "Next"
 msgstr "Volgende"
 
@@ -5204,7 +5217,7 @@ msgstr "Mijn bladwijzers"
 msgid "My Connections Bookmarks"
 msgstr "Bladwijzers van mijn connecties"
 
-#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:61
 msgid "$Projectname"
 msgstr "$Projectname"
 
@@ -5941,7 +5954,7 @@ msgstr "Bladwijzer opslaan"
 msgid "URL of bookmark"
 msgstr "URL van bladwijzer"
 
-#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:465
+#: ../../mod/rbmark.php:97 ../../mod/appman.php:93 ../../mod/events.php:450
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -6155,7 +6168,7 @@ msgid ""
 "Password reset failed."
 msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1494
+#: ../../mod/lostpass.php:86 ../../boot.php:1489
 msgid "Password Reset"
 msgstr "Wachtwoord vergeten?"
 
@@ -6404,7 +6417,7 @@ msgstr "Als profielfoto gebruiken"
 msgid "Private Photo"
 msgstr "Privéfoto"
 
-#: ../../mod/photos.php:905 ../../mod/events.php:667 ../../mod/events.php:674
+#: ../../mod/photos.php:905 ../../mod/events.php:652 ../../mod/events.php:659
 msgid "Previous"
 msgstr "Vorige"
 
@@ -8039,7 +8052,7 @@ msgstr "Aankomende gebeurtenissen"
 
 #: ../../mod/settings.php:1091
 msgid "Events today"
-msgstr "Gebeurtissen van vandaag"
+msgstr "Gebeurtenissen van vandaag"
 
 #: ../../mod/settings.php:1092
 msgid "Upcoming birthdays"
@@ -8252,121 +8265,6 @@ msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen
 msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."
 
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr "Niet in staat om ontvanger op te zoeken."
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr "Kan opgevraagd kanaal niet verifieren"
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
-
-#: ../../mod/mail.php:132
-msgid "Messages"
-msgstr "Berichten"
-
-#: ../../mod/mail.php:167
-msgid "Message recalled."
-msgstr "Bericht ingetrokken."
-
-#: ../../mod/mail.php:180
-msgid "Conversation removed."
-msgstr "Conversatie verwijderd"
-
-#: ../../mod/mail.php:223
-msgid "Requested channel is not in this network"
-msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
-
-#: ../../mod/mail.php:231
-msgid "Send Private Message"
-msgstr "Privébericht versturen"
-
-#: ../../mod/mail.php:232 ../../mod/mail.php:361
-msgid "To:"
-msgstr "Aan:"
-
-#: ../../mod/mail.php:235 ../../mod/mail.php:363
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: ../../mod/mail.php:238 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: ../../mod/mail.php:242
-msgid "Send"
-msgstr "Verzenden"
-
-#: ../../mod/mail.php:333
-msgid "Delete message"
-msgstr "Bericht verwijderen"
-
-#: ../../mod/mail.php:334
-msgid "Delivery report"
-msgstr "Afleveringsrapport"
-
-#: ../../mod/mail.php:335
-msgid "Recall message"
-msgstr "Bericht intrekken"
-
-#: ../../mod/mail.php:337
-msgid "Message has been recalled."
-msgstr "Bericht is ingetrokken."
-
-#: ../../mod/mail.php:354
-msgid "Delete Conversation"
-msgstr "Verwijder conversatie"
-
-#: ../../mod/mail.php:356
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
-
-#: ../../mod/mail.php:360
-msgid "Send Reply"
-msgstr "Antwoord versturen"
-
-#: ../../mod/mail.php:365
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Jouw privébericht aan %s (%s):"
-
-#: ../../mod/regmod.php:11
-msgid "Please login."
-msgstr "Inloggen."
-
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
-msgstr "Xchan opzoeken"
-
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
-msgstr "Zoek een xchan (of webbie) die begint met:"
-
-#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
-msgid "Not found."
-msgstr "Niet gevonden."
-
-#: ../../mod/channel.php:25 ../../mod/chat.php:19
-msgid "You must be logged in to see this page."
-msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
-
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
-
-#: ../../mod/attach.php:9
-msgid "Item not available."
-msgstr "Item is niet aanwezig."
-
 #: ../../mod/invite.php:25
 msgid "Total invitation limit exceeded."
 msgstr "Limiet voor aantal uitnodigingen overschreden."
@@ -8408,6 +8306,10 @@ msgstr "Uitnodigingen verzenden"
 msgid "Enter email addresses, one per line:"
 msgstr "Voer e-mailadressen in, één per regel:"
 
+#: ../../mod/invite.php:131 ../../mod/mail.php:238
+msgid "Your message:"
+msgstr "Jouw bericht:"
+
 #: ../../mod/invite.php:132
 msgid "Please join my community on $Projectname."
 msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op https://redmatrix.me."
@@ -8433,6 +8335,34 @@ msgstr "of bezoek "
 msgid "3. Click [Connect]"
 msgstr "3. Klik op [+ Verbinden]"
 
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr "Inloggen."
+
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
+msgstr "Xchan opzoeken"
+
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr "Zoek een xchan (of webbie) die begint met:"
+
+#: ../../mod/xchan.php:37 ../../mod/menu.php:162 ../../mod/mitem.php:116
+msgid "Not found."
+msgstr "Niet gevonden."
+
+#: ../../mod/channel.php:25 ../../mod/chat.php:19
+msgid "You must be logged in to see this page."
+msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
+
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
+
+#: ../../mod/attach.php:9
+msgid "Item not available."
+msgstr "Item is niet aanwezig."
+
 #: ../../mod/lockview.php:37
 msgid "Remote privacy information not available."
 msgstr "Privacy-informatie op afstand niet beschikbaar."
@@ -8822,6 +8752,89 @@ msgstr "Titel van menu zoals anderen dat zien."
 msgid "Allow bookmarks"
 msgstr "Bladwijzers toestaan"
 
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr "Niet in staat om ontvanger op te zoeken."
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr "Kan opgevraagd kanaal niet verifieren"
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
+
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr "Berichten"
+
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr "Bericht ingetrokken."
+
+#: ../../mod/mail.php:180
+msgid "Conversation removed."
+msgstr "Conversatie verwijderd"
+
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
+msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
+
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
+msgstr "Privébericht versturen"
+
+#: ../../mod/mail.php:232 ../../mod/mail.php:362
+msgid "To:"
+msgstr "Aan:"
+
+#: ../../mod/mail.php:235 ../../mod/mail.php:364
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: ../../mod/mail.php:242
+msgid "Send"
+msgstr "Verzenden"
+
+#: ../../mod/mail.php:334
+msgid "Delete message"
+msgstr "Bericht verwijderen"
+
+#: ../../mod/mail.php:335
+msgid "Delivery report"
+msgstr "Afleveringsrapport"
+
+#: ../../mod/mail.php:336
+msgid "Recall message"
+msgstr "Bericht intrekken"
+
+#: ../../mod/mail.php:338
+msgid "Message has been recalled."
+msgstr "Bericht is ingetrokken."
+
+#: ../../mod/mail.php:355
+msgid "Delete Conversation"
+msgstr "Verwijder conversatie"
+
+#: ../../mod/mail.php:357
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
+
+#: ../../mod/mail.php:361
+msgid "Send Reply"
+msgstr "Antwoord versturen"
+
+#: ../../mod/mail.php:366
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Jouw privébericht aan %s (%s):"
+
 #: ../../mod/post.php:234
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
@@ -8832,62 +8845,62 @@ msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelog
 msgid "No service class restrictions found."
 msgstr "Geen abonnementsbeperkingen gevonden."
 
-#: ../../mod/siteinfo.php:111
+#: ../../mod/siteinfo.php:15
 #, php-format
 msgid "Version %s"
 msgstr "Versie %s"
 
-#: ../../mod/siteinfo.php:132
+#: ../../mod/siteinfo.php:36
 msgid "Installed plugins/addons/apps:"
 msgstr "Ingeschakelde plug-ins/add-ons/apps:"
 
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:49
 msgid "No installed plugins/addons/apps"
 msgstr "Geen ingeschakelde plug-ins/add-ons/apps"
 
-#: ../../mod/siteinfo.php:158
+#: ../../mod/siteinfo.php:62
 msgid ""
 "This is a hub of $Projectname - a global cooperative network of "
 "decentralized privacy enhanced websites."
 msgstr "Dit is een $Projectname-hub - $Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy."
 
-#: ../../mod/siteinfo.php:160
+#: ../../mod/siteinfo.php:64
 msgid "Tag: "
 msgstr "Tag: "
 
-#: ../../mod/siteinfo.php:162
+#: ../../mod/siteinfo.php:66
 msgid "Last background fetch: "
 msgstr "Meest recente achtergrond-fetch:"
 
-#: ../../mod/siteinfo.php:164
+#: ../../mod/siteinfo.php:68
 msgid "Current load average: "
 msgstr "Gemiddelde systeembelasting is nu:"
 
-#: ../../mod/siteinfo.php:167
+#: ../../mod/siteinfo.php:71
 msgid "Running at web location"
 msgstr "Draaiend op weblocatie"
 
-#: ../../mod/siteinfo.php:168
+#: ../../mod/siteinfo.php:72
 msgid ""
 "Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> "
 
-#: ../../mod/siteinfo.php:169
+#: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
 msgstr "Bugrapporten en andere kwesties: bezoek"
 
-#: ../../mod/siteinfo.php:171
+#: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
 msgstr "$projectname-issues"
 
-#: ../../mod/siteinfo.php:172
+#: ../../mod/siteinfo.php:76
 msgid ""
 "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
 "com"
 msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com"
 
-#: ../../mod/siteinfo.php:174
+#: ../../mod/siteinfo.php:78
 msgid "Site Administrators"
 msgstr "Hubbeheerders: "
 
@@ -8921,77 +8934,105 @@ msgstr "Titel en begintijd van gebeurtenis zijn vereist."
 msgid "Event not found."
 msgstr "Gebeurtenis niet gevonden"
 
-#: ../../mod/events.php:452
-msgid "Event Title"
+#: ../../mod/events.php:437
+msgid "Edit event titel"
+msgstr "Titel bewerken"
+
+#: ../../mod/events.php:437
+msgid "Event titel"
 msgstr "Titel"
 
-#: ../../mod/events.php:454
+#: ../../mod/events.php:439
 msgid "Categories (comma-separated list)"
 msgstr "Categorieën (door komma's gescheiden lijst)"
 
-#: ../../mod/events.php:455
+#: ../../mod/events.php:440
+msgid "Edit Category"
+msgstr "Categorie"
+
+#: ../../mod/events.php:440
 msgid "Category"
 msgstr "Categorie"
 
-#: ../../mod/events.php:458
+#: ../../mod/events.php:443
+msgid "Edit start date and time"
+msgstr "Begindatum en -tijd bewerken"
+
+#: ../../mod/events.php:443
 msgid "Start date and time"
 msgstr "Begindatum en -tijd"
 
-#: ../../mod/events.php:459 ../../mod/events.php:462
+#: ../../mod/events.php:444 ../../mod/events.php:447
 msgid "Finish date and time are not known or not relevant"
 msgstr "Einddatum en -tijd zijn niet bekend of niet van toepassing"
 
-#: ../../mod/events.php:461
+#: ../../mod/events.php:446
+msgid "Edit finish date and time"
+msgstr "Einddatum en -tijd bewerken"
+
+#: ../../mod/events.php:446
 msgid "Finish date and time"
 msgstr "Einddatum en -tijd"
 
-#: ../../mod/events.php:463 ../../mod/events.php:464
+#: ../../mod/events.php:448 ../../mod/events.php:449
 msgid "Adjust for viewer timezone"
 msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"
 
-#: ../../mod/events.php:463
+#: ../../mod/events.php:448
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen."
 
-#: ../../mod/events.php:470 ../../mod/events.php:472
+#: ../../mod/events.php:450
+msgid "Edit Description"
+msgstr "Omschrijving bewerken"
+
+#: ../../mod/events.php:452
+msgid "Edit Location"
+msgstr "Locatie bewerken"
+
+#: ../../mod/events.php:455 ../../mod/events.php:457
 msgid "Share this event"
 msgstr "Deel deze gebeurtenis"
 
-#: ../../mod/events.php:477
+#: ../../mod/events.php:462
 msgid "Advanced Options"
-msgstr "Geavenceerde opties"
+msgstr "Geavanceerde opties"
 
-#: ../../mod/events.php:589
+#: ../../mod/events.php:574
 msgid "l, F j"
 msgstr "l j F"
 
-#: ../../mod/events.php:611
+#: ../../mod/events.php:596
 msgid "Edit event"
 msgstr "Gebeurtenis bewerken"
 
-#: ../../mod/events.php:613
+#: ../../mod/events.php:598
 msgid "Delete event"
 msgstr "Gebeurtenis verwijderen"
 
-#: ../../mod/events.php:647
+#: ../../mod/events.php:632
 msgid "calendar"
 msgstr "agenda"
 
-#: ../../mod/events.php:666
-msgid "New Event"
-msgstr "Nieuwe gebeurtenis"
+#: ../../mod/events.php:651
+msgid "Edit Event"
+msgstr "Gebeurtenis bewerken"
 
-#: ../../mod/events.php:676
+#: ../../mod/events.php:651
+msgid "Create Event"
+msgstr "Gebeurtenis aanmaken"
+
+#: ../../mod/events.php:661
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../../mod/events.php:707
+#: ../../mod/events.php:692
 msgid "Event removed"
 msgstr "Gebeurtenis verwijderd"
 
-#: ../../mod/events.php:710
+#: ../../mod/events.php:695
 msgid "Failed to remove event"
 msgstr "Verwijderen gebeurtenis mislukt"
 
@@ -9288,51 +9329,51 @@ msgstr "Grootte profielfoto's van berichten instellen"
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1291
+#: ../../boot.php:1292
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1294
+#: ../../boot.php:1295
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1461
+#: ../../boot.php:1462
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
 
-#: ../../boot.php:1489
+#: ../../boot.php:1484
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1485
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1493
+#: ../../boot.php:1488
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2113
+#: ../../boot.php:2108
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2248
+#: ../../boot.php:2243
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Het SSL-certificaat van deze website is ongeldig. Corrigeer dit a.u.b."
 
-#: ../../boot.php:2251
+#: ../../boot.php:2246
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2288
+#: ../../boot.php:2283
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2292
+#: ../../boot.php:2287
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-taken zijn niet actief op %s"
diff --git a/view/nl/hstrings.php b/view/nl/hstrings.php
index 685862895..ea02d8633 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -143,10 +143,6 @@ $a->strings["Collection is empty."] = "Collectie is leeg";
 $a->strings["Collection: %s"] = "Collectie: %s";
 $a->strings["Connection: %s"] = "Connectie: %s";
 $a->strings["Connection not found."] = "Connectie niet gevonden.";
-$a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
-$a->strings["[no subject]"] = "[geen onderwerp]";
-$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
-$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
 $a->strings["view full size"] = "volledige grootte tonen";
 $a->strings["\$Projectname Notification"] = "\$Projectname-notificatie";
 $a->strings["\$projectname"] = "\$projectname";
@@ -321,6 +317,9 @@ $a->strings["Week View"] = "Week tonen";
 $a->strings["Month View"] = "Maand tonen";
 $a->strings["Export"] = "Exporteren";
 $a->strings["Import"] = "Importeren";
+$a->strings["Events Tools"] = "Agenda-hulpmiddelen";
+$a->strings["Export Calendar"] = "Exporteren";
+$a->strings["Import Calendar"] = "Importeren";
 $a->strings["Chat Rooms"] = "Chatkanalen";
 $a->strings["Bookmarked Chatrooms"] = "Bladwijzers van chatkanalen";
 $a->strings["Suggested Chatrooms"] = "Voorgestelde chatkanalen";
@@ -669,10 +668,6 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
-$a->strings["Invalid data packet"] = "Datapakket ongeldig";
-$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
-$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
-$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["Image/photo"] = "Afbeelding/foto";
 $a->strings["Encrypted content"] = "Versleutelde inhoud";
 $a->strings["Install %s element: "] = "Installeer %s-element: ";
@@ -705,12 +700,6 @@ $a->strings["%d connection in common"] = array(
 	1 => "%d gemeenschappelijke connecties",
 );
 $a->strings["show more"] = "meer connecties weergeven";
-$a->strings["Directory Options"] = "Opties kanalengids";
-$a->strings["Safe Mode"] = "Veilig zoeken";
-$a->strings["No"] = "Nee";
-$a->strings["Yes"] = "Ja";
-$a->strings["Public Forums Only"] = "Alleen openbare forums";
-$a->strings["This Website Only"] = "Alleen deze hub";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Hubzilla:Notify] New mail received at %s"] = "[Hubzilla:Notificatie] Nieuw privébericht ontvangen op %s";
 $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s zond jou een nieuw privébericht om %3\$s.";
@@ -757,6 +746,10 @@ $a->strings["local account not found."] = "lokale account niet gevonden.";
 $a->strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
 $a->strings["Embedded content"] = "Ingesloten inhoud";
 $a->strings["Embedding disabled"] = "Insluiten uitgeschakeld";
+$a->strings["No recipient provided."] = "Geen ontvanger opgegeven.";
+$a->strings["[no subject]"] = "[geen onderwerp]";
+$a->strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
+$a->strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
 $a->strings["Logout"] = "Uitloggen";
 $a->strings["End this session"] = "Beëindig deze sessie";
 $a->strings["Home"] = "Home";
@@ -874,6 +867,12 @@ $a->strings["Blocks"] = "Blokken";
 $a->strings["Menus"] = "Menu's";
 $a->strings["Layouts"] = "Lay-outs";
 $a->strings["Pages"] = "Pagina's";
+$a->strings["Directory Options"] = "Opties kanalengids";
+$a->strings["Safe Mode"] = "Veilig zoeken";
+$a->strings["No"] = "Nee";
+$a->strings["Yes"] = "Ja";
+$a->strings["Public Forums Only"] = "Alleen openbare forums";
+$a->strings["This Website Only"] = "Alleen deze hub";
 $a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken.";
 $a->strings["Add new connections to this collection (privacy group)"] = "Voeg nieuwe connecties aan deze collectie toe (privacy-groep)";
 $a->strings["All Channels"] = "Alle kanalen";
@@ -882,6 +881,10 @@ $a->strings["Collections"] = "Collecties";
 $a->strings["Edit collection"] = "Collectie bewerken";
 $a->strings["Add new collection"] = "Nieuwe collectie toevoegen";
 $a->strings["Channels not in any collection"] = "Kanalen die zich in geen enkele collectie bevinden";
+$a->strings["Invalid data packet"] = "Datapakket ongeldig";
+$a->strings["Unable to verify channel signature"] = "Kanaalkenmerk kon niet worden geverifieerd.  ";
+$a->strings["Unable to verify site signature for %s"] = "Hubkenmerk voor %s kon niet worden geverifieerd";
+$a->strings["invalid target signature"] = "ongeldig doelkenmerk";
 $a->strings["New Page"] = "Nieuwe pagina";
 $a->strings["View"] = "Weergeven";
 $a->strings["Actions"] = "Acties";
@@ -1891,7 +1894,7 @@ $a->strings["Unseen channel activity"] = "Niet bekeken kanaal-activiteit";
 $a->strings["Unseen private messages"] = "Niet bekeken privéberichten";
 $a->strings["Recommended"] = "Aanbevolen";
 $a->strings["Upcoming events"] = "Aankomende gebeurtenissen";
-$a->strings["Events today"] = "Gebeurtissen van vandaag";
+$a->strings["Events today"] = "Gebeurtenissen van vandaag";
 $a->strings["Upcoming birthdays"] = "Aankomende verjaardagen";
 $a->strings["Not available in all themes"] = "Niet in alle thema's beschikbaar";
 $a->strings["System (personal) notifications"] = "(Persoonlijke) systeemnotificaties";
@@ -1943,34 +1946,6 @@ $a->strings["Sync now"] = "Nu synchroniseren";
 $a->strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen.";
 $a->strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen.";
 $a->strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is.";
-$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
-$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
-$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
-$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
-$a->strings["Messages"] = "Berichten";
-$a->strings["Message recalled."] = "Bericht ingetrokken.";
-$a->strings["Conversation removed."] = "Conversatie verwijderd";
-$a->strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
-$a->strings["Send Private Message"] = "Privébericht versturen";
-$a->strings["To:"] = "Aan:";
-$a->strings["Subject:"] = "Onderwerp:";
-$a->strings["Your message:"] = "Jouw bericht:";
-$a->strings["Send"] = "Verzenden";
-$a->strings["Delete message"] = "Bericht verwijderen";
-$a->strings["Delivery report"] = "Afleveringsrapport";
-$a->strings["Recall message"] = "Bericht intrekken";
-$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
-$a->strings["Delete Conversation"] = "Verwijder conversatie";
-$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
-$a->strings["Send Reply"] = "Antwoord versturen";
-$a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
-$a->strings["Please login."] = "Inloggen.";
-$a->strings["Xchan Lookup"] = "Xchan opzoeken";
-$a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
-$a->strings["Not found."] = "Niet gevonden.";
-$a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
-$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
-$a->strings["Item not available."] = "Item is niet aanwezig.";
 $a->strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden.";
 $a->strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres.";
 $a->strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname";
@@ -1983,12 +1958,20 @@ $a->strings["%d message sent."] = array(
 $a->strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar";
 $a->strings["Send invitations"] = "Uitnodigingen verzenden";
 $a->strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:";
+$a->strings["Your message:"] = "Jouw bericht:";
 $a->strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op https://redmatrix.me.";
 $a->strings["You will need to supply this invitation code: "] = "Je moet deze uitnodigingscode opgeven:";
 $a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):";
 $a->strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:";
 $a->strings["or visit "] = "of bezoek ";
 $a->strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]";
+$a->strings["Please login."] = "Inloggen.";
+$a->strings["Xchan Lookup"] = "Xchan opzoeken";
+$a->strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
+$a->strings["Not found."] = "Niet gevonden.";
+$a->strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
+$a->strings["Insufficient permissions.  Request redirected to profile page."] = "Onvoldoende permissies.  Doorgestuurd naar profielpagina.";
+$a->strings["Item not available."] = "Item is niet aanwezig.";
 $a->strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
 $a->strings["Visible to:"] = "Zichtbaar voor:";
 $a->strings["Export Channel"] = "Kanaal exporteren";
@@ -2079,6 +2062,26 @@ $a->strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen
 $a->strings["Menu title"] = "Titel van menu";
 $a->strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien.";
 $a->strings["Allow bookmarks"] = "Bladwijzers toestaan";
+$a->strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
+$a->strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
+$a->strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
+$a->strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
+$a->strings["Messages"] = "Berichten";
+$a->strings["Message recalled."] = "Bericht ingetrokken.";
+$a->strings["Conversation removed."] = "Conversatie verwijderd";
+$a->strings["Requested channel is not in this network"] = "Opgevraagd kanaal is niet in dit netwerk beschikbaar";
+$a->strings["Send Private Message"] = "Privébericht versturen";
+$a->strings["To:"] = "Aan:";
+$a->strings["Subject:"] = "Onderwerp:";
+$a->strings["Send"] = "Verzenden";
+$a->strings["Delete message"] = "Bericht verwijderen";
+$a->strings["Delivery report"] = "Afleveringsrapport";
+$a->strings["Recall message"] = "Bericht intrekken";
+$a->strings["Message has been recalled."] = "Bericht is ingetrokken.";
+$a->strings["Delete Conversation"] = "Verwijder conversatie";
+$a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
+$a->strings["Send Reply"] = "Antwoord versturen";
+$a->strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
 $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelogd. Uitloggen en opnieuw proberen.";
 $a->strings["No service class restrictions found."] = "Geen abonnementsbeperkingen gevonden.";
 $a->strings["Version %s"] = "Versie %s";
@@ -2101,21 +2104,28 @@ $a->strings["Event can not end before it has started."] = "Gebeurtenis kan niet
 $a->strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren";
 $a->strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist.";
 $a->strings["Event not found."] = "Gebeurtenis niet gevonden";
-$a->strings["Event Title"] = "Titel";
+$a->strings["Edit event titel"] = "Titel bewerken";
+$a->strings["Event titel"] = "Titel";
 $a->strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)";
+$a->strings["Edit Category"] = "Categorie";
 $a->strings["Category"] = "Categorie";
+$a->strings["Edit start date and time"] = "Begindatum en -tijd bewerken";
 $a->strings["Start date and time"] = "Begindatum en -tijd";
 $a->strings["Finish date and time are not known or not relevant"] = "Einddatum en -tijd zijn niet bekend of niet van toepassing";
+$a->strings["Edit finish date and time"] = "Einddatum en -tijd bewerken";
 $a->strings["Finish date and time"] = "Einddatum en -tijd";
 $a->strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
 $a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
+$a->strings["Edit Description"] = "Omschrijving bewerken";
+$a->strings["Edit Location"] = "Locatie bewerken";
 $a->strings["Share this event"] = "Deel deze gebeurtenis";
-$a->strings["Advanced Options"] = "Geavenceerde opties";
+$a->strings["Advanced Options"] = "Geavanceerde opties";
 $a->strings["l, F j"] = "l j F";
 $a->strings["Edit event"] = "Gebeurtenis bewerken";
 $a->strings["Delete event"] = "Gebeurtenis verwijderen";
 $a->strings["calendar"] = "agenda";
-$a->strings["New Event"] = "Nieuwe gebeurtenis";
+$a->strings["Edit Event"] = "Gebeurtenis bewerken";
+$a->strings["Create Event"] = "Gebeurtenis aanmaken";
 $a->strings["Today"] = "Vandaag";
 $a->strings["Event removed"] = "Gebeurtenis verwijderd";
 $a->strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt";