Merge remote-tracking branch 'upstream/master'

12 files changed, 187 insertions, 94 deletions

diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl
index 17bd2c01c..ba07b19da 100644
--- a/view/es/follow_notify_eml.tpl
+++ b/view/es/follow_notify_eml.tpl
@@ -1,13 +1,14 @@
 
-Estimado/a $myname,
+Dear {{$myname}},
 
-Tienes un nuevo seguidor en $sitename -  '$requestor'.
+You have a new follower at {{$sitename}} -  '{{$requestor}}'.
 
-Puedes visitar su perfil en $url.
+You may visit their profile at {{$url}}.
 
-Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud.
+Please login to your site to approve or ignore/cancel the request.
 
-$siteurl
+{{$siteurl}}
 
+Regards,
 
-	$sitename 
+	{{$sitename}} administrator
diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl
index 0dc867efd..1c647b994 100644
--- a/view/es/friend_complete_eml.tpl
+++ b/view/es/friend_complete_eml.tpl
@@ -1,19 +1,22 @@
 
-Estimado/a $username,
+Dear {{$username}},
 
-	Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'.
+	Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted 
+your connection request at '{{$sitename}}'.
 
-Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico
-sin restricción alguna.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
 
-Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make 
+any changes to this relationship. 
 
-$siteurl
+{{$siteurl}}
 
-[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general 
-- y asignar derechos de visualización a '$fn'].
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
 
+Sincerely,
 
-	$sitename
+	{{$sitename}} Administrator
 
  
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/es/htconfig.tpl
@@ -0,0 +1,70 @@
+<?php
+
+// Set the following for your MySQL installation
+// Copy or rename this file to .htconfig.php
+
+$db_host = '{{$dbhost}}';
+$db_port = '{{$dbport}}';
+$db_user = '{{$dbuser}}';
+$db_pass = '{{$dbpass}}';
+$db_data = '{{$dbdata}}';
+
+/*
+ * Notice: Many of the following settings will be available in the admin panel 
+ * after a successful site install. Once they are set in the admin panel, they
+ * are stored in the DB - and the DB setting will over-ride any corresponding
+ * setting in this file
+ *
+ * The command-line tool util/config is able to query and set the DB items 
+ * directly if for some reason the admin panel is not available and a system
+ * setting requires modification. 
+ *
+ */ 
+
+
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY  = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY    = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl
index a2964808c..2c2428d68 100644
--- a/view/es/intro_complete_eml.tpl
+++ b/view/es/intro_complete_eml.tpl
@@ -1,21 +1,22 @@
 
-Estimado/a $username,
+Dear {{$username}},
 
-	'$fn' en '$dfrn_url' ha aceptado tu petición
-conexión a '$sitename'.
+	'{{$fn}}' at '{{$dfrn_url}}' has accepted 
+your connection request at '{{$sitename}}'.
 
-	'$fn' ha optado por aceptarte come "fan", que restringe ciertas 
-formas de comunicación, como mensajes privados y algunas interacciones 
-con el perfil. Si eres una "celebridad" o una página de comunidad, 
-estos ajustes se aplican automáticamente 
+	'{{$fn}}' has chosen to accept you a "fan", which restricts 
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
 
-	'$fn' puede optar por extender esto en una relación más permisiva
-en el futuro.
+	'{{$fn}}' may choose to extend this into a two-way or more permissive 
+relationship in the future. 
 
-	Empezarás a recibir las actualizaciones públicas de estado de '$fn', 
-que aparecerán en tu página "Red" en
+	You will start receiving public status updates from '{{$fn}}', 
+which will appear on your 'Matrix' page at  
 
-$siteurl
+{{$siteurl}}
 
+Sincerely,
 
-	$sitename
+	{{$sitename}} Administrator
diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl
index 607744bfe..3b79d2791 100644
--- a/view/es/lostpass_eml.tpl
+++ b/view/es/lostpass_eml.tpl
@@ -1,34 +1,32 @@
 
-Estimado/a $username,
-	
-	Se ha recibido una solicitud en $sitename recientemente para restablecer
-tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de
-verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador.
+Dear {{$username}},
+	A request was recently received at {{$sitename}} to reset your account 
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar. 
 
-Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora
-y/o elimina este mensaje.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email. 
 
-Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien
-emitió esta solicitud.
+Your password will not be changed unless we can verify that you
+issued this request. 
 
-Sigue este enlace para verificar tu identidad:
+Follow this link to verify your identity:
 
-$reset_link
+{{$reset_link}}
 
-A continuación recibirás un mensaje con la nueva contraseña.
+You will then receive a follow-up message containing the new password.
 
-Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de 
-configuración.
+You may change that password from your account settings page after logging in.
 
-Los datos de acceso son los siguientes:
+The login details are as follows:
 
-Sitio:	$siteurl
-Nombre:	$email
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
 
 
 
 
-Saludos,
-	La administración de $sitename
+Sincerely,
+	{{$sitename}} Administrator
 
  
diff --git a/view/es/messages.po b/view/es/messages.po
index 54de3ee64..8a29cf695 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -49,7 +49,7 @@ msgstr "Permiso denegado"
 #: ../../mod/crepair.php:113 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/notes.php:20 ../../mod/fsuggest.php:78 ../../mod/item.php:113
 #: ../../mod/message.php:9 ../../mod/message.php:42
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:21
+#: ../../mod/dfrn_confirm.php:53 ../../mod/viewconnections.php:21
 #: ../../mod/group.php:19 ../../mod/attach.php:33 ../../mod/common.php:9
 #: ../../addon/facebook/facebook.php:331 ../../include/items.php:2874
 msgid "Permission denied."
@@ -1141,7 +1141,7 @@ msgstr "Eliminar término"
 
 #: ../../mod/search.php:71 ../../mod/photos.php:752 ../../mod/display.php:7
 #: ../../mod/dfrn_request.php:594 ../../mod/directory.php:31
-#: ../../mod/viewcontacts.php:16 ../../mod/community.php:16
+#: ../../mod/viewconnections.php:16 ../../mod/community.php:16
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
@@ -1795,7 +1795,7 @@ msgid "Edit contact notes"
 msgstr "Editar notas de contacto"
 
 #: ../../mod/contacts.php:315 ../../mod/contacts.php:430
-#: ../../mod/viewcontacts.php:61
+#: ../../mod/viewconnections.php:61
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Ver el perfil de %s [%s]"
@@ -3630,11 +3630,11 @@ msgstr "Bienvenido de nuevo"
 msgid "%s welcomes %s"
 msgstr "%s te da la bienvenida a %s"
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:567
+#: ../../mod/viewconnections.php:25 ../../include/text.php:567
 msgid "View Contacts"
 msgstr "Ver contactos"
 
-#: ../../mod/viewcontacts.php:40
+#: ../../mod/viewconnections.php:40
 msgid "No contacts."
 msgstr "Ningún contacto."
 
diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl
index 7959846b7..0d94be3c2 100644
--- a/view/es/passchanged_eml.tpl
+++ b/view/es/passchanged_eml.tpl
@@ -1,19 +1,20 @@
 
-Estimado/a $username,
+Dear {{$username}},
+	Your password has been changed as requested. Please retain this 
+information for your records (or change your password immediately to 
+something that you will remember).
 
-    Tu contraseña ha sido modificada como has solicitado. Anota esta información
-(o cambia inmediatamente la contraseña con algo que recuerdes).
 
+Your login details are as follows:
 
-Tus datos de acceso son los siguientes:
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$new_password}}
 
-Sitio:	$siteurl
-Nombre:	$email
-Contraseña:	$new_password
+You may change that password from your account settings page after logging in.
 
-Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
 
-
-	$sitename
+Sincerely,
+	{{$sitename}} Administrator
 
  
diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl
index 7c7a90b40..4b397201c 100644
--- a/view/es/register_open_eml.tpl
+++ b/view/es/register_open_eml.tpl
@@ -1,21 +1,19 @@
 
-Estimado/a $username,
+An account has been created at {{$sitename}} for this email address. 
+The login details are as follows:
 
-    Gracias por registrarte en $sitename. Tu cuenta ha sido creada.
+Site Location:	{{$siteurl}}
+Login:	{{$email}}
+Password: (the password which was provided during registration)
 
+If this account was created without your knowledge and is not desired, you may 
+visit this site and reset the password. This will allow you to remove the 
+account from the links on the Settings page, and we 
+apologise for any inconvenience. 
 
-Los datos de acceso son los siguientes:
+Thank you and welcome to {{$sitename}}.
 
-Sitio:	$siteurl
-Nombre:	$email
-Contraseña:	$password
-
-
-Después de acceder puedes cambiar tu contraseña en la página de "Configuración".
-
-Toma un momento para revisar las otras configuraciones de la cuenta en esa página.
-
-
-Gracias y bienvenido/a $sitename.
+Sincerely,
+	{{$sitename}} Administrator
 
  
diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl
index 9f2cc4d9b..85d9a12d3 100644
--- a/view/es/register_verify_eml.tpl
+++ b/view/es/register_verify_eml.tpl
@@ -1,22 +1,25 @@
 
-Se ha recibido la solicitud de registro de un nuevo usuario en
-$sitename que requiere tu aprobación.
+A new user registration request was received at {{$sitename}} which requires 
+your approval. 
 
-Los datos de acceso son los siguientes:
 
-Nombre Completo:	$username
-Sitio:	$siteurl
-Nombre:	$email
+The login details are as follows:
 
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+IP Address: {{$details}}
 
-Para aprobar esta solicitud, visita el siguiente enlace:
+To approve this request please visit the following link:
 
-$siteurl/regmod/allow/$hash 
 
-Para denegar la solicitud y eliminar la cuenta, por favor visita:
+{{$siteurl}}/regmod/allow/{{$hash}} 
 
-$siteurl/regmod/deny/$hash
 
+To deny the request and remove the account, please visit:
 
-Gracias.
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
 
diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl
index 6161c45c1..d01b8ff27 100644
--- a/view/es/request_notify_eml.tpl
+++ b/view/es/request_notify_eml.tpl
@@ -1,13 +1,17 @@
 
-Estimado/a $myname,
+Dear {{$myname}},
 
-Acabas de recibir una solicitud de conexión de '$requestor' en $sitename.
+You have just received a connection request at {{$sitename}} 
 
-Puedes visitar su perfil en $url.
+from '{{$requestor}}'.
 
-Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud.
+You may visit their profile at {{$url}}.
 
-$siteurl
+Please login to your site to view the complete introduction 
+and approve or ignore/cancel the request.
 
+{{$siteurl}}
 
-	$sitename
+Regards,
+
+	{{$sitename}} administrator
diff --git a/view/es/strings.php b/view/es/strings.php
index d2b8e240e..bd3e6997f 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -1,8 +1,9 @@
 <?php
 
+if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	return ($n != 1);
-}
+}}
 ;
 $a->strings["Not Found"] = "No se ha encontrado";
 $a->strings["Page not found."] = "Página no encontrada.";
diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/es/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey, 

+I'm the web server at {{$sitename}};

+   

+The Red Matrix developers released update {{$update}} recently, 

+but when I tried to install it, something went terribly wrong.  

+This needs to be fixed soon and it requires human intervention. 

+Please contact a Red developer if you can not figure out how to 

+fix it on your own. My database might be invalid. 

+

+The error message is '{{$error}}'.   

+

+Apologies for the inconvenience, 

+	your web server at {{$siteurl}}
\ No newline at end of file