Merge https://github.com/redmatrix/hubzilla into pending_merge

2 files changed, 583 insertions, 577 deletions

diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index 942656112..e55530bf5 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-11 00:03-0800\n"
-"PO-Revision-Date: 2016-03-13 12:23+0000\n"
+"POT-Creation-Date: 2016-03-18 00:03-0700\n"
+"PO-Revision-Date: 2016-03-20 10:32+0000\n"
 "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
 #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/widgets.php:1434
+#: ../../include/apps.php:415 ../../include/widgets.php:1439
 #: ../../include/conversation.php:1037 ../../mod/photos.php:766
 #: ../../mod/photos.php:1209
 msgid "Unknown"
@@ -91,7 +91,7 @@ msgid "Create"
 msgstr "Crear"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:305
-#: ../../include/widgets.php:1447 ../../mod/photos.php:793
+#: ../../include/widgets.php:1452 ../../mod/photos.php:793
 #: ../../mod/photos.php:1333 ../../mod/profile_photo.php:401
 #: ../../mod/cover_photo.php:353
 msgid "Upload"
@@ -118,8 +118,8 @@ msgstr "Última modificación"
 
 #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/menu.php:108 ../../include/identity.php:924
-#: ../../include/identity.php:928 ../../include/ItemObject.php:100
+#: ../../include/menu.php:108 ../../include/ItemObject.php:100
+#: ../../include/identity.php:932 ../../include/identity.php:936
 #: ../../mod/blocks.php:153 ../../mod/connections.php:286
 #: ../../mod/connections.php:306 ../../mod/editblock.php:135
 #: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
@@ -170,7 +170,7 @@ msgstr "Subir fichero"
 #: ../../include/attach.php:352 ../../include/attach.php:359
 #: ../../include/attach.php:437 ../../include/attach.php:889
 #: ../../include/attach.php:960 ../../include/attach.php:1112
-#: ../../include/photos.php:29 ../../include/items.php:4573
+#: ../../include/photos.php:29 ../../include/items.php:4660
 #: ../../index.php:180 ../../mod/achievements.php:30 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/appman.php:66 ../../mod/authtest.php:13
 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/blocks.php:69
@@ -219,8 +219,8 @@ msgid "Page not found."
 msgstr "Página no encontrada."
 
 #: ../../include/Contact.php:101 ../../include/widgets.php:147
-#: ../../include/widgets.php:185 ../../include/identity.php:1003
-#: ../../include/conversation.php:961 ../../mod/directory.php:321
+#: ../../include/widgets.php:185 ../../include/conversation.php:961
+#: ../../include/identity.php:1011 ../../mod/directory.php:321
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr "Conectar"
@@ -289,7 +289,7 @@ msgid "Registration request at %s"
 msgstr "Solicitud de registro en %s"
 
 #: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1660
+#: ../../include/account.php:404 ../../include/network.php:1864
 msgid "Administrator"
 msgstr "Administrador"
 
@@ -422,7 +422,7 @@ msgstr "Páginas web"
 msgid "Channel Home"
 msgstr "Mi canal"
 
-#: ../../include/apps.php:138 ../../include/identity.php:1387
+#: ../../include/apps.php:138 ../../include/identity.php:1395
 #: ../../mod/profperm.php:112
 msgid "Profile"
 msgstr "Perfil"
@@ -515,15 +515,15 @@ msgstr "Instalar"
 msgid "Purchase"
 msgstr "Comprar"
 
-#: ../../include/auth.php:132
+#: ../../include/auth.php:105
 msgid "Logged out."
 msgstr "Desconectado/a."
 
-#: ../../include/auth.php:273
+#: ../../include/auth.php:246
 msgid "Failed authentication"
 msgstr "Autenticación fallida."
 
-#: ../../include/auth.php:287 ../../mod/openid.php:189
+#: ../../include/auth.php:260 ../../mod/openid.php:189
 msgid "Login failed."
 msgstr "El acceso ha fallado."
 
@@ -551,7 +551,7 @@ msgid "Finishes:"
 msgstr "Finaliza:"
 
 #: ../../include/bb2diaspora.php:487 ../../include/event.php:52
-#: ../../include/text.php:1433 ../../include/identity.php:1018
+#: ../../include/text.php:1433 ../../include/identity.php:1026
 #: ../../mod/directory.php:307
 msgid "Location:"
 msgstr "Ubicación:"
@@ -680,8 +680,9 @@ msgstr "Modo seguro"
 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/removeme.php:60
-#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:105
+#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/profiles.php:647
+#: ../../mod/removeme.php:60 ../../mod/settings.php:588
+#: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555
 msgid "No"
 msgstr "No"
@@ -693,8 +694,9 @@ msgstr "No"
 #: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
 #: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
 #: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/removeme.php:60
-#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:105
+#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/profiles.php:647
+#: ../../mod/removeme.php:60 ../../mod/settings.php:588
+#: ../../view/theme/redbasic/php/config.php:105
 #: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1555
 msgid "Yes"
 msgstr "Sí"
@@ -753,7 +755,7 @@ msgstr "Respuesta incompleta del canal."
 msgid "Channel was deleted and no longer exists."
 msgstr "El canal ha sido eliminado y ya no existe."
 
-#: ../../include/follow.php:153 ../../include/follow.php:183
+#: ../../include/follow.php:153 ../../include/follow.php:185
 msgid "Protocol disabled."
 msgstr "Protocolo deshabilitado."
 
@@ -761,11 +763,11 @@ msgstr "Protocolo deshabilitado."
 msgid "Channel discovery failed."
 msgstr "El intento de acceder al canal ha fallado."
 
-#: ../../include/follow.php:199
+#: ../../include/follow.php:201
 msgid "local account not found."
 msgstr "No se ha encontrado la cuenta local."
 
-#: ../../include/follow.php:224
+#: ../../include/follow.php:226
 msgid "Cannot connect to yourself."
 msgstr "No puede conectarse consigo mismo."
 
@@ -888,7 +890,8 @@ 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/events.php:459
-#: ../../mod/profiles.php:472 ../../mod/pubsites.php:36
+#: ../../mod/profiles.php:472 ../../mod/profiles.php:697
+#: ../../mod/pubsites.php:36
 msgid "Location"
 msgstr "Ubicación"
 
@@ -1185,7 +1188,8 @@ msgstr "Ver el perfil"
 msgid "Your profile page"
 msgstr "Su página del perfil"
 
-#: ../../include/nav.php:88 ../../include/identity.php:924
+#: ../../include/nav.php:88 ../../include/identity.php:932
+#: ../../mod/profiles.php:776
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
@@ -1193,7 +1197,7 @@ msgstr "Editar perfiles"
 msgid "Manage/Edit profiles"
 msgstr "Administrar/editar perfiles"
 
-#: ../../include/nav.php:90 ../../include/identity.php:928
+#: ../../include/nav.php:90 ../../include/identity.php:936
 msgid "Edit Profile"
 msgstr "Editar el perfil"
 
@@ -1352,7 +1356,7 @@ msgstr "Gestionar sus canales"
 msgid "Account/Channel Settings"
 msgstr "Ajustes de cuenta/canales"
 
-#: ../../include/nav.php:213 ../../include/widgets.php:1347
+#: ../../include/nav.php:213 ../../include/widgets.php:1350
 msgid "Admin"
 msgstr "Administrador"
 
@@ -1752,7 +1756,7 @@ msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrid
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../../include/taxonomy.php:305 ../../mod/profiles.php:717
+#: ../../include/taxonomy.php:305
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -1788,8 +1792,8 @@ msgstr "no me gusta"
 msgid "dislikes"
 msgstr "no gusta de"
 
-#: ../../include/taxonomy.php:415 ../../include/identity.php:1296
-#: ../../include/conversation.php:1756 ../../include/ItemObject.php:179
+#: ../../include/taxonomy.php:415 ../../include/conversation.php:1756
+#: ../../include/ItemObject.php:179 ../../include/identity.php:1304
 #: ../../mod/photos.php:1097
 msgctxt "noun"
 msgid "Like"
@@ -1797,92 +1801,6 @@ msgid_plural "Likes"
 msgstr[0] "Me gusta"
 msgstr[1] "Me gusta"
 
-#: ../../include/datetime.php:48
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#: ../../include/datetime.php:132
-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:444 ../../mod/events.php:449
-msgid "Required"
-msgstr "Obligatorio"
-
-#: ../../include/datetime.php:263 ../../boot.php:2382
-msgid "never"
-msgstr "nunca"
-
-#: ../../include/datetime.php:269
-msgid "less than a second ago"
-msgstr "hace un instante"
-
-#: ../../include/datetime.php:287
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "hace %1$d %2$s"
-
-#: ../../include/datetime.php:298
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "año"
-msgstr[1] "años"
-
-#: ../../include/datetime.php:301
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mes"
-msgstr[1] "meses"
-
-#: ../../include/datetime.php:304
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "semana"
-msgstr[1] "semanas"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "día"
-msgstr[1] "días"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
-#: ../../include/datetime.php:553
-#, php-format
-msgid "%1$s's birthday"
-msgstr "Cumpleaños de %1$s"
-
-#: ../../include/datetime.php:554
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Feliz cumpleaños %1$s"
-
 #: ../../include/zot.php:680
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
@@ -1891,12 +1809,12 @@ msgstr "Paquete de datos no válido"
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
-#: ../../include/zot.php:2326
+#: ../../include/zot.php:2332
 #, 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:3661
+#: ../../include/zot.php:3667
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
@@ -2032,24 +1950,24 @@ msgstr "MySpace"
 msgid "view full size"
 msgstr "Ver en el tamaño original"
 
-#: ../../include/network.php:1612 ../../include/enotify.php:57
+#: ../../include/network.php:1816 ../../include/enotify.php:57
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: ../../include/network.php:1613 ../../include/enotify.php:58
+#: ../../include/network.php:1817 ../../include/enotify.php:58
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../include/network.php:1615 ../../include/enotify.php:60
+#: ../../include/network.php:1819 ../../include/enotify.php:60
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: ../../include/network.php:1617 ../../include/enotify.php:62
+#: ../../include/network.php:1821 ../../include/enotify.php:62
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
 
-#: ../../include/network.php:1674
+#: ../../include/network.php:1878
 msgid "No Subject"
 msgstr "Sin asunto"
 
@@ -2374,6 +2292,7 @@ msgid "System"
 msgstr "Sistema"
 
 #: ../../include/widgets.php:105 ../../include/conversation.php:1541
+#: ../../mod/profiles.php:696
 msgid "Personal"
 msgstr "Personales"
 
@@ -2631,6 +2550,10 @@ msgstr "Sitio"
 msgid "Accounts"
 msgstr "Cuentas"
 
+#: ../../include/widgets.php:1317 ../../include/widgets.php:1355
+msgid "Member registrations waiting for confirmation"
+msgstr "Inscripciones en espera de aprobación"
+
 #: ../../include/widgets.php:1318 ../../mod/admin.php:1149
 msgid "Channels"
 msgstr "Canales"
@@ -2661,25 +2584,21 @@ msgstr "Campos del perfil"
 msgid "DB updates"
 msgstr "Actualizaciones de la base de datos"
 
-#: ../../include/widgets.php:1343 ../../include/widgets.php:1349
+#: ../../include/widgets.php:1343 ../../include/widgets.php:1353
 #: ../../mod/admin.php:1605
 msgid "Logs"
 msgstr "Informes"
 
-#: ../../include/widgets.php:1348
+#: ../../include/widgets.php:1351
 msgid "Plugin Features"
 msgstr "Extensiones"
 
-#: ../../include/widgets.php:1350
-msgid "User registrations waiting for confirmation"
-msgstr "Registros de usuarios pendientes de confirmación"
-
-#: ../../include/widgets.php:1428 ../../mod/photos.php:760
+#: ../../include/widgets.php:1433 ../../mod/photos.php:760
 #: ../../mod/photos.php:1300
 msgid "View Photo"
 msgstr "Ver foto"
 
-#: ../../include/widgets.php:1445 ../../mod/photos.php:791
+#: ../../include/widgets.php:1450 ../../mod/photos.php:791
 msgid "Edit Album"
 msgstr "Editar álbum"
 
@@ -3146,234 +3065,100 @@ msgstr "Por favor, visite %s para aprobar o rechazar la sugerencia."
 msgid "[Hubzilla:Notify]"
 msgstr "[Hubzilla:Aviso]"
 
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr "Nombre vacío"
-
-#: ../../include/identity.php:69
-msgid "Name too long"
-msgstr "Nombre demasiado largo"
-
-#: ../../include/identity.php:181
-msgid "No account identifier"
-msgstr "Ningún identificador de la cuenta"
-
-#: ../../include/identity.php:193
-msgid "Nickname is required."
-msgstr "Se requiere un sobrenombre (alias)."
-
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
-msgstr "Sobrenombre en uso. Por favor, elija otro."
-
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
-
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
-msgstr "No ha sido posible recuperar la identidad creada"
-
-#: ../../include/identity.php:346
-msgid "Default Profile"
-msgstr "Perfil principal"
-
-#: ../../include/identity.php:776
-msgid "Requested channel is not available."
-msgstr "El canal solicitado no está disponible."
-
-#: ../../include/identity.php:822 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
-msgstr "El perfil solicitado no está disponible."
-
-#: ../../include/identity.php:917 ../../mod/profiles.php:795
-msgid "Change profile photo"
-msgstr "Cambiar la foto del perfil"
-
-#: ../../include/identity.php:925 ../../mod/profiles.php:796
-msgid "Create New Profile"
-msgstr "Crear un nuevo perfil"
-
-#: ../../include/identity.php:942 ../../mod/profiles.php:807
-msgid "Profile Image"
-msgstr "Imagen del perfil"
-
-#: ../../include/identity.php:945
-msgid "Visible to everybody"
-msgstr "Visible para todos"
-
-#: ../../include/identity.php:946 ../../mod/profiles.php:689
-#: ../../mod/profiles.php:811
-msgid "Edit visibility"
-msgstr "Editar visibilidad"
-
-#: ../../include/identity.php:1022 ../../include/identity.php:1280
-msgid "Gender:"
-msgstr "Género:"
-
-#: ../../include/identity.php:1023 ../../include/identity.php:1324
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../include/identity.php:1024 ../../include/identity.php:1335
-msgid "Homepage:"
-msgstr "Página personal:"
-
-#: ../../include/identity.php:1025
-msgid "Online Now"
-msgstr "Ahora en línea"
-
-#: ../../include/identity.php:1113 ../../include/identity.php:1191
-#: ../../mod/ping.php:318
-msgid "g A l F d"
-msgstr "g A l d F"
-
-#: ../../include/identity.php:1114 ../../include/identity.php:1192
-msgid "F d"
-msgstr "d F"
-
-#: ../../include/identity.php:1159 ../../include/identity.php:1231
-#: ../../mod/ping.php:341
-msgid "[today]"
-msgstr "[hoy]"
-
-#: ../../include/identity.php:1170
-msgid "Birthday Reminders"
-msgstr "Recordatorios de cumpleaños"
-
-#: ../../include/identity.php:1171
-msgid "Birthdays this week:"
-msgstr "Cumpleaños de esta semana:"
-
-#: ../../include/identity.php:1224
-msgid "[No description]"
-msgstr "[Sin descripción]"
-
-#: ../../include/identity.php:1242
-msgid "Event Reminders"
-msgstr "Recordatorios de eventos"
-
-#: ../../include/identity.php:1243
-msgid "Events this week:"
-msgstr "Eventos de esta semana:"
-
-#: ../../include/identity.php:1278 ../../mod/settings.php:1047
-msgid "Full Name:"
-msgstr "Nombre completo:"
-
-#: ../../include/identity.php:1285
-msgid "Like this channel"
-msgstr "Me gusta este canal"
-
-#: ../../include/identity.php:1309
-msgid "j F, Y"
-msgstr "j F Y"
-
-#: ../../include/identity.php:1310
-msgid "j F"
-msgstr "j F"
+#: ../../include/datetime.php:48 ../../mod/profiles.php:699
+msgid "Miscellaneous"
+msgstr "Varios"
 
-#: ../../include/identity.php:1317
-msgid "Birthday:"
-msgstr "Cumpleaños:"
+#: ../../include/datetime.php:136
+msgid "Birthday"
+msgstr "Cumpleaños"
 
-#: ../../include/identity.php:1321 ../../mod/directory.php:302
-msgid "Age:"
+#: ../../include/datetime.php:138
+msgid "Age: "
 msgstr "Edad:"
 
-#: ../../include/identity.php:1330
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "por %1$d %2$s"
-
-#: ../../include/identity.php:1333
-msgid "Sexual Preference:"
-msgstr "Orientación sexual:"
-
-#: ../../include/identity.php:1337 ../../mod/directory.php:318
-msgid "Hometown:"
-msgstr "Lugar de nacimiento:"
-
-#: ../../include/identity.php:1339
-msgid "Tags:"
-msgstr "Etiquetas:"
-
-#: ../../include/identity.php:1341
-msgid "Political Views:"
-msgstr "Posición política:"
-
-#: ../../include/identity.php:1343
-msgid "Religion:"
-msgstr "Religión:"
-
-#: ../../include/identity.php:1345 ../../mod/directory.php:320
-msgid "About:"
-msgstr "Sobre mí:"
-
-#: ../../include/identity.php:1347
-msgid "Hobbies/Interests:"
-msgstr "Aficciones/Intereses:"
+#: ../../include/datetime.php:140
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "AAAA-MM-DD o MM-DD"
 
-#: ../../include/identity.php:1349
-msgid "Likes:"
-msgstr "Me gusta:"
+#: ../../include/datetime.php:246 ../../mod/appman.php:91
+#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449
+#: ../../mod/profiles.php:708 ../../mod/profiles.php:712
+msgid "Required"
+msgstr "Obligatorio"
 
-#: ../../include/identity.php:1351
-msgid "Dislikes:"
-msgstr "No me gusta:"
+#: ../../include/datetime.php:273 ../../boot.php:2382
+msgid "never"
+msgstr "nunca"
 
-#: ../../include/identity.php:1353
-msgid "Contact information and Social Networks:"
-msgstr "Información de contacto y redes sociales:"
+#: ../../include/datetime.php:279
+msgid "less than a second ago"
+msgstr "hace un instante"
 
-#: ../../include/identity.php:1355
-msgid "My other channels:"
-msgstr "Mis otros canales:"
+#: ../../include/datetime.php:297
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "hace %1$d %2$s"
 
-#: ../../include/identity.php:1357
-msgid "Musical interests:"
-msgstr "Intereses musicales:"
+#: ../../include/datetime.php:308
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "año"
+msgstr[1] "años"
 
-#: ../../include/identity.php:1359
-msgid "Books, literature:"
-msgstr "Libros, literatura:"
+#: ../../include/datetime.php:311
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mes"
+msgstr[1] "meses"
 
-#: ../../include/identity.php:1361
-msgid "Television:"
-msgstr "Televisión:"
+#: ../../include/datetime.php:314
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "semana"
+msgstr[1] "semanas"
 
-#: ../../include/identity.php:1363
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cine/danza/cultura/entretenimiento:"
+#: ../../include/datetime.php:317
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "día"
+msgstr[1] "días"
 
-#: ../../include/identity.php:1365
-msgid "Love/Romance:"
-msgstr "Vida sentimental/amorosa:"
+#: ../../include/datetime.php:320
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
 
-#: ../../include/identity.php:1367
-msgid "Work/employment:"
-msgstr "Trabajo:"
+#: ../../include/datetime.php:323
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
 
-#: ../../include/identity.php:1369
-msgid "School/education:"
-msgstr "Estudios:"
+#: ../../include/datetime.php:326
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segundo"
+msgstr[1] "segundos"
 
-#: ../../include/identity.php:1389
-msgid "Like this thing"
-msgstr "Me gusta esto"
+#: ../../include/datetime.php:563
+#, php-format
+msgid "%1$s's birthday"
+msgstr "Cumpleaños de %1$s"
 
-#: ../../include/identity.php:1799 ../../mod/cover_photo.php:236
-msgid "cover photo"
-msgstr "Imagen de portada del perfil"
+#: ../../include/datetime.php:564
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Feliz cumpleaños %1$s"
 
 #: ../../include/oembed.php:267
 msgid "Embedded content"
@@ -4258,62 +4043,291 @@ msgstr "Visible para las conexiones permitidas."
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4494 ../../mod/display.php:36
+#: ../../include/items.php:4581 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/admin.php:141
 #: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/items.php:5030 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:5117 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
-#: ../../include/items.php:5046
+#: ../../include/items.php:5133
 msgid "Privacy group is empty."
 msgstr "El grupo de canales está vacío."
 
-#: ../../include/items.php:5053
+#: ../../include/items.php:5140
 #, php-format
 msgid "Privacy group: %s"
 msgstr "Grupo de canales: %s"
 
-#: ../../include/items.php:5063 ../../mod/connedit.php:701
+#: ../../include/items.php:5150 ../../mod/connedit.php:701
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:5065
+#: ../../include/items.php:5152
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/items.php:5491 ../../mod/cover_photo.php:229
+#: ../../include/items.php:5578 ../../mod/cover_photo.php:229
 msgid "female"
 msgstr "mujer"
 
-#: ../../include/items.php:5492 ../../mod/cover_photo.php:230
+#: ../../include/items.php:5579 ../../mod/cover_photo.php:230
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../include/items.php:5493 ../../mod/cover_photo.php:231
+#: ../../include/items.php:5580 ../../mod/cover_photo.php:231
 msgid "male"
 msgstr "hombre"
 
-#: ../../include/items.php:5494 ../../mod/cover_photo.php:232
+#: ../../include/items.php:5581 ../../mod/cover_photo.php:232
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../include/items.php:5496 ../../mod/cover_photo.php:234
+#: ../../include/items.php:5583 ../../mod/cover_photo.php:234
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../include/items.php:5498
+#: ../../include/items.php:5585
 msgid "profile photo"
 msgstr "foto del perfil"
 
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
+msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr "Nombre vacío"
+
+#: ../../include/identity.php:69
+msgid "Name too long"
+msgstr "Nombre demasiado largo"
+
+#: ../../include/identity.php:181
+msgid "No account identifier"
+msgstr "Ningún identificador de la cuenta"
+
+#: ../../include/identity.php:193
+msgid "Nickname is required."
+msgstr "Se requiere un sobrenombre (alias)."
+
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Sobrenombre en uso. Por favor, elija otro."
+
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio."
+
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
+msgstr "No ha sido posible recuperar la identidad creada"
+
+#: ../../include/identity.php:346
+msgid "Default Profile"
+msgstr "Perfil principal"
+
+#: ../../include/identity.php:784
+msgid "Requested channel is not available."
+msgstr "El canal solicitado no está disponible."
+
+#: ../../include/identity.php:830 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
+msgstr "El perfil solicitado no está disponible."
+
+#: ../../include/identity.php:925 ../../mod/profiles.php:691
+msgid "Change profile photo"
+msgstr "Cambiar la foto del perfil"
+
+#: ../../include/identity.php:933
+msgid "Create New Profile"
+msgstr "Crear un nuevo perfil"
+
+#: ../../include/identity.php:950 ../../mod/profiles.php:766
+msgid "Profile Image"
+msgstr "Imagen del perfil"
+
+#: ../../include/identity.php:953
+msgid "Visible to everybody"
+msgstr "Visible para todos"
+
+#: ../../include/identity.php:954 ../../mod/profiles.php:689
+#: ../../mod/profiles.php:770
+msgid "Edit visibility"
+msgstr "Editar visibilidad"
+
+#: ../../include/identity.php:1030 ../../include/identity.php:1288
+msgid "Gender:"
+msgstr "Género:"
+
+#: ../../include/identity.php:1031 ../../include/identity.php:1332
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../include/identity.php:1032 ../../include/identity.php:1343
+msgid "Homepage:"
+msgstr "Página personal:"
+
+#: ../../include/identity.php:1033
+msgid "Online Now"
+msgstr "Ahora en línea"
+
+#: ../../include/identity.php:1121 ../../include/identity.php:1199
+#: ../../mod/ping.php:318
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../include/identity.php:1122 ../../include/identity.php:1200
+msgid "F d"
+msgstr "d F"
+
+#: ../../include/identity.php:1167 ../../include/identity.php:1239
+#: ../../mod/ping.php:341
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../include/identity.php:1178
+msgid "Birthday Reminders"
+msgstr "Recordatorios de cumpleaños"
+
+#: ../../include/identity.php:1179
+msgid "Birthdays this week:"
+msgstr "Cumpleaños de esta semana:"
+
+#: ../../include/identity.php:1232
+msgid "[No description]"
+msgstr "[Sin descripción]"
+
+#: ../../include/identity.php:1250
+msgid "Event Reminders"
+msgstr "Recordatorios de eventos"
+
+#: ../../include/identity.php:1251
+msgid "Events this week:"
+msgstr "Eventos de esta semana:"
+
+#: ../../include/identity.php:1286 ../../mod/settings.php:1047
+msgid "Full Name:"
+msgstr "Nombre completo:"
+
+#: ../../include/identity.php:1293
+msgid "Like this channel"
+msgstr "Me gusta este canal"
+
+#: ../../include/identity.php:1317
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/identity.php:1318
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/identity.php:1325
+msgid "Birthday:"
+msgstr "Cumpleaños:"
+
+#: ../../include/identity.php:1329 ../../mod/directory.php:302
+msgid "Age:"
+msgstr "Edad:"
+
+#: ../../include/identity.php:1338
+#, php-format
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
+
+#: ../../include/identity.php:1341
+msgid "Sexual Preference:"
+msgstr "Orientación sexual:"
+
+#: ../../include/identity.php:1345 ../../mod/directory.php:318
+msgid "Hometown:"
+msgstr "Lugar de nacimiento:"
+
+#: ../../include/identity.php:1347
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: ../../include/identity.php:1349
+msgid "Political Views:"
+msgstr "Posición política:"
+
+#: ../../include/identity.php:1351
+msgid "Religion:"
+msgstr "Religión:"
+
+#: ../../include/identity.php:1353 ../../mod/directory.php:320
+msgid "About:"
+msgstr "Sobre mí:"
+
+#: ../../include/identity.php:1355
+msgid "Hobbies/Interests:"
+msgstr "Aficciones/Intereses:"
+
+#: ../../include/identity.php:1357
+msgid "Likes:"
+msgstr "Me gusta:"
+
+#: ../../include/identity.php:1359
+msgid "Dislikes:"
+msgstr "No me gusta:"
+
+#: ../../include/identity.php:1361
+msgid "Contact information and Social Networks:"
+msgstr "Información de contacto y redes sociales:"
+
+#: ../../include/identity.php:1363
+msgid "My other channels:"
+msgstr "Mis otros canales:"
+
+#: ../../include/identity.php:1365
+msgid "Musical interests:"
+msgstr "Intereses musicales:"
+
+#: ../../include/identity.php:1367
+msgid "Books, literature:"
+msgstr "Libros, literatura:"
+
+#: ../../include/identity.php:1369
+msgid "Television:"
+msgstr "Televisión:"
+
+#: ../../include/identity.php:1371
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cine/danza/cultura/entretenimiento:"
+
+#: ../../include/identity.php:1373
+msgid "Love/Romance:"
+msgstr "Vida sentimental/amorosa:"
+
+#: ../../include/identity.php:1375
+msgid "Work/employment:"
+msgstr "Trabajo:"
+
+#: ../../include/identity.php:1377
+msgid "School/education:"
+msgstr "Estudios:"
+
+#: ../../include/identity.php:1397
+msgid "Like this thing"
+msgstr "Me gusta esto"
+
+#: ../../include/identity.php:1807 ../../mod/cover_photo.php:236
+msgid "cover photo"
+msgstr "Imagen de portada del perfil"
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí"
@@ -5464,7 +5478,7 @@ msgstr "Foto del perfil 128px"
 msgid "Timezone"
 msgstr "Huso horario"
 
-#: ../../mod/id.php:27 ../../mod/profiles.php:713
+#: ../../mod/id.php:27 ../../mod/profiles.php:730
 msgid "Homepage URL"
 msgstr "Dirección de la página personal"
 
@@ -7505,15 +7519,15 @@ msgstr "Estado civil"
 msgid "Romantic Partner"
 msgstr "Pareja sentimental"
 
-#: ../../mod/profiles.php:430 ../../mod/profiles.php:718
+#: ../../mod/profiles.php:430 ../../mod/profiles.php:735
 msgid "Likes"
 msgstr "Me gusta"
 
-#: ../../mod/profiles.php:434 ../../mod/profiles.php:719
+#: ../../mod/profiles.php:434 ../../mod/profiles.php:736
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: ../../mod/profiles.php:438
+#: ../../mod/profiles.php:438 ../../mod/profiles.php:743
 msgid "Work/Employment"
 msgstr "Trabajo:"
 
@@ -7521,11 +7535,11 @@ msgstr "Trabajo:"
 msgid "Religion"
 msgstr "Religión"
 
-#: ../../mod/profiles.php:445 ../../mod/profiles.php:715
+#: ../../mod/profiles.php:445
 msgid "Political Views"
 msgstr "Ideas políticas"
 
-#: ../../mod/profiles.php:453 ../../mod/profiles.php:712
+#: ../../mod/profiles.php:453
 msgid "Sexual Preference"
 msgstr "Preferencia sexual"
 
@@ -7541,9 +7555,9 @@ msgstr "Intereses"
 msgid "Profile updated."
 msgstr "Perfil actualizado."
 
-#: ../../mod/profiles.php:646
-msgid "Hide your contact/friend list from viewers of this profile?"
-msgstr "¿Ocultar su lista de contactos a los visitantes de este perfil?"
+#: ../../mod/profiles.php:644
+msgid "Hide your connections list from viewers of this profile"
+msgstr "Ocultar la lista de conexiones a los visitantes del perfil"
 
 #: ../../mod/profiles.php:686
 msgid "Edit Profile Details"
@@ -7554,13 +7568,9 @@ msgid "View this profile"
 msgstr "Ver este perfil"
 
 #: ../../mod/profiles.php:690
-msgid "Change Cover Photo"
+msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../mod/profiles.php:691
-msgid "Change Profile Photo"
-msgstr "Cambiar la foto del perfil"
-
 #: ../../mod/profiles.php:692
 msgid "Create a new profile using these settings"
 msgstr "Crear un nuevo perfil usando estos ajustes"
@@ -7573,149 +7583,145 @@ msgstr "Clonar este perfil"
 msgid "Delete this profile"
 msgstr "Eliminar este perfil"
 
-#: ../../mod/profiles.php:696
+#: ../../mod/profiles.php:695
+msgid "Add profile things"
+msgstr "Añadir cosas al perfil"
+
+#: ../../mod/profiles.php:698
+msgid "Relation"
+msgstr "Relación"
+
+#: ../../mod/profiles.php:701
 msgid "Import profile from file"
 msgstr "Importar perfil desde un fichero"
 
-#: ../../mod/profiles.php:697
+#: ../../mod/profiles.php:702
 msgid "Export profile to file"
 msgstr "Exportar perfil a un fichero"
 
-#: ../../mod/profiles.php:698
-msgid "Profile Name"
+#: ../../mod/profiles.php:703
+msgid "Your gender"
+msgstr "Género"
+
+#: ../../mod/profiles.php:704
+msgid "Marital status"
+msgstr "Estado civil"
+
+#: ../../mod/profiles.php:705
+msgid "Sexual preference"
+msgstr "Preferencia sexual"
+
+#: ../../mod/profiles.php:708
+msgid "Profile name"
 msgstr "Nombre del perfil"
 
-#: ../../mod/profiles.php:699
-msgid "Your Full Name"
+#: ../../mod/profiles.php:710
+msgid "This is your default profile."
+msgstr "Este es su perfil principal."
+
+#: ../../mod/profiles.php:712
+msgid "Your full name"
 msgstr "Nombre completo"
 
-#: ../../mod/profiles.php:700
+#: ../../mod/profiles.php:713
 msgid "Title/Description"
 msgstr "Título o descripción"
 
-#: ../../mod/profiles.php:701
-msgid "Your Gender"
-msgstr "Género"
-
-#: ../../mod/profiles.php:702
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#: ../../mod/profiles.php:703
-msgid "Street Address"
+#: ../../mod/profiles.php:716
+msgid "Street address"
 msgstr "Dirección"
 
-#: ../../mod/profiles.php:704
+#: ../../mod/profiles.php:717
 msgid "Locality/City"
 msgstr "Ciudad"
 
-#: ../../mod/profiles.php:705
-msgid "Postal/Zip Code"
+#: ../../mod/profiles.php:718
+msgid "Region/State"
+msgstr "Región o Estado"
+
+#: ../../mod/profiles.php:719
+msgid "Postal/Zip code"
 msgstr "Código postal"
 
-#: ../../mod/profiles.php:706
+#: ../../mod/profiles.php:720
 msgid "Country"
 msgstr "País"
 
-#: ../../mod/profiles.php:707
-msgid "Region/State"
-msgstr "Región o Estado"
-
-#: ../../mod/profiles.php:708
-msgid "<span class=\"heart\">&hearts;</span> Marital Status"
-msgstr "<span class=\"heart\">&hearts;</span> Estado sentimental"
-
-#: ../../mod/profiles.php:709
+#: ../../mod/profiles.php:725
 msgid "Who (if applicable)"
 msgstr "Quién (si es aplicable)"
 
-#: ../../mod/profiles.php:710
+#: ../../mod/profiles.php:725
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Por ejemplo: ana123, María González, sara@ejemplo.com"
 
-#: ../../mod/profiles.php:711
-msgid "Since [date]"
-msgstr "Desde [fecha]"
+#: ../../mod/profiles.php:726
+msgid "Since (date)"
+msgstr "Desde (fecha)"
+
+#: ../../mod/profiles.php:729
+msgid "Tell us about yourself"
+msgstr "Háblenos de usted"
 
-#: ../../mod/profiles.php:714
+#: ../../mod/profiles.php:731
 msgid "Hometown"
 msgstr "Lugar de nacimiento"
 
-#: ../../mod/profiles.php:716
-msgid "Religious Views"
+#: ../../mod/profiles.php:732
+msgid "Political views"
+msgstr "Ideas políticas"
+
+#: ../../mod/profiles.php:733
+msgid "Religious views"
 msgstr "Creencias religiosas"
 
-#: ../../mod/profiles.php:720
+#: ../../mod/profiles.php:734
+msgid "Keywords used in directory listings"
+msgstr "Palabras clave utilizadas en los listados de directorios"
+
+#: ../../mod/profiles.php:734
 msgid "Example: fishing photography software"
 msgstr "Por ejemplo: software de fotografía submarina"
 
-#: ../../mod/profiles.php:721
-msgid "Used in directory listings"
-msgstr "Visible en el directorio público del canal"
-
-#: ../../mod/profiles.php:722
-msgid "Tell us about yourself..."
-msgstr "Háblenos de usted..."
-
-#: ../../mod/profiles.php:723
-msgid "Hobbies/Interests"
-msgstr "Aficiones/Intereses"
-
-#: ../../mod/profiles.php:724
-msgid "Contact information and Social Networks"
-msgstr "Información de contacto y redes sociales"
-
-#: ../../mod/profiles.php:725
-msgid "My other channels"
-msgstr "Mis otros canales"
-
-#: ../../mod/profiles.php:726
+#: ../../mod/profiles.php:737
 msgid "Musical interests"
 msgstr "Preferencias musicales"
 
-#: ../../mod/profiles.php:727
+#: ../../mod/profiles.php:738
 msgid "Books, literature"
 msgstr "Libros, literatura"
 
-#: ../../mod/profiles.php:728
+#: ../../mod/profiles.php:739
 msgid "Television"
 msgstr "Televisión"
 
-#: ../../mod/profiles.php:729
-msgid "Film/dance/culture/entertainment"
-msgstr "Cine/danza/cultura/entretenimiento"
+#: ../../mod/profiles.php:740
+msgid "Film/Dance/Culture/Entertainment"
+msgstr "Cine, danza, cultura, entretenimiento"
 
-#: ../../mod/profiles.php:730
-msgid "Love/romance"
-msgstr "Vida sentimental/amorosa"
+#: ../../mod/profiles.php:741
+msgid "Hobbies/Interests"
+msgstr "Aficiones/Intereses"
 
-#: ../../mod/profiles.php:731
-msgid "Work/employment"
-msgstr "Trabajo"
+#: ../../mod/profiles.php:742
+msgid "Love/Romance"
+msgstr "Vida sentimental o amorosa"
 
-#: ../../mod/profiles.php:732
-msgid "School/education"
+#: ../../mod/profiles.php:744
+msgid "School/Education"
 msgstr "Estudios"
 
-#: ../../mod/profiles.php:738
-msgid "This is your default profile."
-msgstr "Este es su perfil principal."
-
-#: ../../mod/profiles.php:749
-msgid "Age: "
-msgstr "Edad:"
-
-#: ../../mod/profiles.php:792
-msgid "Edit/Manage Profiles"
-msgstr "Modificar/gestionar perfiles"
+#: ../../mod/profiles.php:745
+msgid "Contact information and social networks"
+msgstr "Información de contacto y redes sociales"
 
-#: ../../mod/profiles.php:793
-msgid "Add profile things"
-msgstr "Añadir cosas al perfil"
+#: ../../mod/profiles.php:746
+msgid "My other channels"
+msgstr "Mis otros canales"
 
-#: ../../mod/profiles.php:794
-msgid "Include desirable objects in your profile"
-msgstr "Añadir objetos interesantes en su perfil"
+#: ../../mod/profiles.php:777
+msgid "Create New"
+msgstr "Crear un nuevo perfil"
 
 #: ../../mod/profperm.php:29 ../../mod/profperm.php:58
 msgid "Invalid profile identifier."
@@ -9146,7 +9152,7 @@ msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para
 
 #: ../../mod/siteinfo.php:73
 msgid "Bug reports and issues: please visit"
-msgstr "Informes de errores e incidencias: por, favor visite"
+msgstr "Informes de errores e incidencias: por favor visite"
 
 #: ../../mod/siteinfo.php:75
 msgid "$projectname issues"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 8873e3c7a..8791b3ce6 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -398,42 +398,6 @@ $a->strings["__ctx:noun__ Like"] = array(
 	0 => "Me gusta",
 	1 => "Me gusta",
 );
-$a->strings["Miscellaneous"] = "Varios";
-$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
-$a->strings["Required"] = "Obligatorio";
-$a->strings["never"] = "nunca";
-$a->strings["less than a second ago"] = "hace un instante";
-$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s";
-$a->strings["__ctx:relative_date__ year"] = array(
-	0 => "año",
-	1 => "años",
-);
-$a->strings["__ctx:relative_date__ month"] = array(
-	0 => "mes",
-	1 => "meses",
-);
-$a->strings["__ctx:relative_date__ week"] = array(
-	0 => "semana",
-	1 => "semanas",
-);
-$a->strings["__ctx:relative_date__ day"] = array(
-	0 => "día",
-	1 => "días",
-);
-$a->strings["__ctx:relative_date__ hour"] = array(
-	0 => "hora",
-	1 => "horas",
-);
-$a->strings["__ctx:relative_date__ minute"] = array(
-	0 => "minuto",
-	1 => "minutos",
-);
-$a->strings["__ctx:relative_date__ second"] = array(
-	0 => "segundo",
-	1 => "segundos",
-);
-$a->strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
-$a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 $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";
@@ -614,6 +578,7 @@ $a->strings["For Administrators"] = "Para los administradores";
 $a->strings["For Developers"] = "Para los desarrolladores";
 $a->strings["Site"] = "Sitio";
 $a->strings["Accounts"] = "Cuentas";
+$a->strings["Member registrations waiting for confirmation"] = "Inscripciones en espera de aprobación";
 $a->strings["Channels"] = "Canales";
 $a->strings["Security"] = "Seguridad";
 $a->strings["Plugins"] = "Extensiones";
@@ -623,7 +588,6 @@ $a->strings["Profile Fields"] = "Campos del perfil";
 $a->strings["DB updates"] = "Actualizaciones de la base de datos";
 $a->strings["Logs"] = "Informes";
 $a->strings["Plugin Features"] = "Extensiones";
-$a->strings["User registrations waiting for confirmation"] = "Registros de usuarios pendientes de confirmación";
 $a->strings["View Photo"] = "Ver foto";
 $a->strings["Edit Album"] = "Editar álbum";
 $a->strings["prev"] = "anterior";
@@ -731,61 +695,44 @@ $a->strings["Name:"] = "Nombre:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Por favor, visite %s para aprobar o rechazar la sugerencia.";
 $a->strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
-$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
-$a->strings["Empty name"] = "Nombre vacío";
-$a->strings["Name too long"] = "Nombre demasiado largo";
-$a->strings["No account identifier"] = "Ningún identificador de la cuenta";
-$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
-$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
-$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
-$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
-$a->strings["Default Profile"] = "Perfil principal";
-$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
-$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
-$a->strings["Change profile photo"] = "Cambiar la foto del perfil";
-$a->strings["Create New Profile"] = "Crear un nuevo perfil";
-$a->strings["Profile Image"] = "Imagen del perfil";
-$a->strings["Visible to everybody"] = "Visible para todos";
-$a->strings["Edit visibility"] = "Editar visibilidad";
-$a->strings["Gender:"] = "Género:";
-$a->strings["Status:"] = "Estado:";
-$a->strings["Homepage:"] = "Página personal:";
-$a->strings["Online Now"] = "Ahora en línea";
-$a->strings["g A l F d"] = "g A l d F";
-$a->strings["F d"] = "d F";
-$a->strings["[today]"] = "[hoy]";
-$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
-$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:";
-$a->strings["[No description]"] = "[Sin descripción]";
-$a->strings["Event Reminders"] = "Recordatorios de eventos";
-$a->strings["Events this week:"] = "Eventos de esta semana:";
-$a->strings["Full Name:"] = "Nombre completo:";
-$a->strings["Like this channel"] = "Me gusta este canal";
-$a->strings["j F, Y"] = "j F Y";
-$a->strings["j F"] = "j F";
-$a->strings["Birthday:"] = "Cumpleaños:";
-$a->strings["Age:"] = "Edad:";
-$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
-$a->strings["Sexual Preference:"] = "Orientación sexual:";
-$a->strings["Hometown:"] = "Lugar de nacimiento:";
-$a->strings["Tags:"] = "Etiquetas:";
-$a->strings["Political Views:"] = "Posición política:";
-$a->strings["Religion:"] = "Religión:";
-$a->strings["About:"] = "Sobre mí:";
-$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:";
-$a->strings["Likes:"] = "Me gusta:";
-$a->strings["Dislikes:"] = "No me gusta:";
-$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
-$a->strings["My other channels:"] = "Mis otros canales:";
-$a->strings["Musical interests:"] = "Intereses musicales:";
-$a->strings["Books, literature:"] = "Libros, literatura:";
-$a->strings["Television:"] = "Televisión:";
-$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:";
-$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
-$a->strings["Work/employment:"] = "Trabajo:";
-$a->strings["School/education:"] = "Estudios:";
-$a->strings["Like this thing"] = "Me gusta esto";
-$a->strings["cover photo"] = "Imagen de portada del perfil";
+$a->strings["Miscellaneous"] = "Varios";
+$a->strings["Birthday"] = "Cumpleaños";
+$a->strings["Age: "] = "Edad:";
+$a->strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
+$a->strings["Required"] = "Obligatorio";
+$a->strings["never"] = "nunca";
+$a->strings["less than a second ago"] = "hace un instante";
+$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s";
+$a->strings["__ctx:relative_date__ year"] = array(
+	0 => "año",
+	1 => "años",
+);
+$a->strings["__ctx:relative_date__ month"] = array(
+	0 => "mes",
+	1 => "meses",
+);
+$a->strings["__ctx:relative_date__ week"] = array(
+	0 => "semana",
+	1 => "semanas",
+);
+$a->strings["__ctx:relative_date__ day"] = array(
+	0 => "día",
+	1 => "días",
+);
+$a->strings["__ctx:relative_date__ hour"] = array(
+	0 => "hora",
+	1 => "horas",
+);
+$a->strings["__ctx:relative_date__ minute"] = array(
+	0 => "minuto",
+	1 => "minutos",
+);
+$a->strings["__ctx:relative_date__ second"] = array(
+	0 => "segundo",
+	1 => "segundos",
+);
+$a->strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
+$a->strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 $a->strings["Embedded content"] = "Contenido incorporado";
 $a->strings["Embedding disabled"] = "Incrustación deshabilitada";
 $a->strings["channel"] = "el canal";
@@ -1024,6 +971,61 @@ $a->strings["male"] = "hombre";
 $a->strings["%1\$s updated his %2\$s"] = "%1\$s ha actualizado su %2\$s";
 $a->strings["%1\$s updated their %2\$s"] = "%1\$s ha actualizado su %2\$s";
 $a->strings["profile photo"] = "foto del perfil";
+$a->strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
+$a->strings["Empty name"] = "Nombre vacío";
+$a->strings["Name too long"] = "Nombre demasiado largo";
+$a->strings["No account identifier"] = "Ningún identificador de la cuenta";
+$a->strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
+$a->strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
+$a->strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros usuarios de este sitio.";
+$a->strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
+$a->strings["Default Profile"] = "Perfil principal";
+$a->strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
+$a->strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
+$a->strings["Change profile photo"] = "Cambiar la foto del perfil";
+$a->strings["Create New Profile"] = "Crear un nuevo perfil";
+$a->strings["Profile Image"] = "Imagen del perfil";
+$a->strings["Visible to everybody"] = "Visible para todos";
+$a->strings["Edit visibility"] = "Editar visibilidad";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página personal:";
+$a->strings["Online Now"] = "Ahora en línea";
+$a->strings["g A l F d"] = "g A l d F";
+$a->strings["F d"] = "d F";
+$a->strings["[today]"] = "[hoy]";
+$a->strings["Birthday Reminders"] = "Recordatorios de cumpleaños";
+$a->strings["Birthdays this week:"] = "Cumpleaños de esta semana:";
+$a->strings["[No description]"] = "[Sin descripción]";
+$a->strings["Event Reminders"] = "Recordatorios de eventos";
+$a->strings["Events this week:"] = "Eventos de esta semana:";
+$a->strings["Full Name:"] = "Nombre completo:";
+$a->strings["Like this channel"] = "Me gusta este canal";
+$a->strings["j F, Y"] = "j F Y";
+$a->strings["j F"] = "j F";
+$a->strings["Birthday:"] = "Cumpleaños:";
+$a->strings["Age:"] = "Edad:";
+$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
+$a->strings["Sexual Preference:"] = "Orientación sexual:";
+$a->strings["Hometown:"] = "Lugar de nacimiento:";
+$a->strings["Tags:"] = "Etiquetas:";
+$a->strings["Political Views:"] = "Posición política:";
+$a->strings["Religion:"] = "Religión:";
+$a->strings["About:"] = "Sobre mí:";
+$a->strings["Hobbies/Interests:"] = "Aficciones/Intereses:";
+$a->strings["Likes:"] = "Me gusta:";
+$a->strings["Dislikes:"] = "No me gusta:";
+$a->strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
+$a->strings["My other channels:"] = "Mis otros canales:";
+$a->strings["Musical interests:"] = "Intereses musicales:";
+$a->strings["Books, literature:"] = "Libros, literatura:";
+$a->strings["Television:"] = "Televisión:";
+$a->strings["Film/dance/culture/entertainment:"] = "Cine/danza/cultura/entretenimiento:";
+$a->strings["Love/Romance:"] = "Vida sentimental/amorosa:";
+$a->strings["Work/employment:"] = "Trabajo:";
+$a->strings["School/education:"] = "Estudios:";
+$a->strings["Like this thing"] = "Me gusta esto";
+$a->strings["cover photo"] = "Imagen de portada del perfil";
 $a->strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
 $a->strings["network"] = "red";
 $a->strings["RSS"] = "RSS";
@@ -1800,50 +1802,48 @@ $a->strings["Sexual Preference"] = "Preferencia sexual";
 $a->strings["Homepage"] = "Página personal";
 $a->strings["Interests"] = "Intereses";
 $a->strings["Profile updated."] = "Perfil actualizado.";
-$a->strings["Hide your contact/friend list from viewers of this profile?"] = "¿Ocultar su lista de contactos a los visitantes de este perfil?";
+$a->strings["Hide your connections list from viewers of this profile"] = "Ocultar la lista de conexiones a los visitantes del perfil";
 $a->strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
 $a->strings["View this profile"] = "Ver este perfil";
-$a->strings["Change Cover Photo"] = "Cambiar la imagen de portada del perfil";
-$a->strings["Change Profile Photo"] = "Cambiar la foto del perfil";
+$a->strings["Change cover photo"] = "Cambiar la imagen de portada del perfil";
 $a->strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes";
 $a->strings["Clone this profile"] = "Clonar este perfil";
 $a->strings["Delete this profile"] = "Eliminar este perfil";
+$a->strings["Add profile things"] = "Añadir cosas al perfil";
+$a->strings["Relation"] = "Relación";
 $a->strings["Import profile from file"] = "Importar perfil desde un fichero";
 $a->strings["Export profile to file"] = "Exportar perfil a un fichero";
-$a->strings["Profile Name"] = "Nombre del perfil";
-$a->strings["Your Full Name"] = "Nombre completo";
+$a->strings["Your gender"] = "Género";
+$a->strings["Marital status"] = "Estado civil";
+$a->strings["Sexual preference"] = "Preferencia sexual";
+$a->strings["Profile name"] = "Nombre del perfil";
+$a->strings["This is your default profile."] = "Este es su perfil principal.";
+$a->strings["Your full name"] = "Nombre completo";
 $a->strings["Title/Description"] = "Título o descripción";
-$a->strings["Your Gender"] = "Género";
-$a->strings["Birthday"] = "Cumpleaños";
-$a->strings["Street Address"] = "Dirección";
+$a->strings["Street address"] = "Dirección";
 $a->strings["Locality/City"] = "Ciudad";
-$a->strings["Postal/Zip Code"] = "Código postal";
-$a->strings["Country"] = "País";
 $a->strings["Region/State"] = "Región o Estado";
-$a->strings["<span class=\"heart\">&hearts;</span> Marital Status"] = "<span class=\"heart\">&hearts;</span> Estado sentimental";
+$a->strings["Postal/Zip code"] = "Código postal";
+$a->strings["Country"] = "País";
 $a->strings["Who (if applicable)"] = "Quién (si es aplicable)";
 $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Por ejemplo: ana123, María González, sara@ejemplo.com";
-$a->strings["Since [date]"] = "Desde [fecha]";
+$a->strings["Since (date)"] = "Desde (fecha)";
+$a->strings["Tell us about yourself"] = "Háblenos de usted";
 $a->strings["Hometown"] = "Lugar de nacimiento";
-$a->strings["Religious Views"] = "Creencias religiosas";
+$a->strings["Political views"] = "Ideas políticas";
+$a->strings["Religious views"] = "Creencias religiosas";
+$a->strings["Keywords used in directory listings"] = "Palabras clave utilizadas en los listados de directorios";
 $a->strings["Example: fishing photography software"] = "Por ejemplo: software de fotografía submarina";
-$a->strings["Used in directory listings"] = "Visible en el directorio público del canal";
-$a->strings["Tell us about yourself..."] = "Háblenos de usted...";
-$a->strings["Hobbies/Interests"] = "Aficiones/Intereses";
-$a->strings["Contact information and Social Networks"] = "Información de contacto y redes sociales";
-$a->strings["My other channels"] = "Mis otros canales";
 $a->strings["Musical interests"] = "Preferencias musicales";
 $a->strings["Books, literature"] = "Libros, literatura";
 $a->strings["Television"] = "Televisión";
-$a->strings["Film/dance/culture/entertainment"] = "Cine/danza/cultura/entretenimiento";
-$a->strings["Love/romance"] = "Vida sentimental/amorosa";
-$a->strings["Work/employment"] = "Trabajo";
-$a->strings["School/education"] = "Estudios";
-$a->strings["This is your default profile."] = "Este es su perfil principal.";
-$a->strings["Age: "] = "Edad:";
-$a->strings["Edit/Manage Profiles"] = "Modificar/gestionar perfiles";
-$a->strings["Add profile things"] = "Añadir cosas al perfil";
-$a->strings["Include desirable objects in your profile"] = "Añadir objetos interesantes en su perfil";
+$a->strings["Film/Dance/Culture/Entertainment"] = "Cine, danza, cultura, entretenimiento";
+$a->strings["Hobbies/Interests"] = "Aficiones/Intereses";
+$a->strings["Love/Romance"] = "Vida sentimental o amorosa";
+$a->strings["School/Education"] = "Estudios";
+$a->strings["Contact information and social networks"] = "Información de contacto y redes sociales";
+$a->strings["My other channels"] = "Mis otros canales";
+$a->strings["Create New"] = "Crear un nuevo perfil";
 $a->strings["Invalid profile identifier."] = "Identificador del perfil no válido";
 $a->strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
 $a->strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo.";
@@ -2167,7 +2167,7 @@ $a->strings["Last background fetch: "] = "Última actualización en segundo plan
 $a->strings["Current load average: "] = "Carga media actual:";
 $a->strings["Running at web location"] = "Corriendo en el sitio web";
 $a->strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre \$Projectname.";
-$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por, favor visite";
+$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por favor visite";
 $a->strings["\$projectname issues"] = "Problemas en \$projectname";
 $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com";
 $a->strings["Site Administrators"] = "Administradores del sitio";