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

2 files changed, 25 insertions, 25 deletions

diff --git a/view/es/messages.po b/view/es/messages.po
index cc6d56196..6fe80de48 100644
--- a/view/es/messages.po
+++ b/view/es/messages.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-18 00:04-0700\n"
-"PO-Revision-Date: 2015-09-22 14:10+0000\n"
+"POT-Creation-Date: 2015-10-02 00:04-0700\n"
+"PO-Revision-Date: 2015-10-04 08:23+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"
@@ -1091,7 +1091,7 @@ msgstr "Gracias,"
 #: ../../include/network.php:1590 ../../include/enotify.php:63
 #, php-format
 msgid "%s Administrator"
-msgstr "%s Administrador"
+msgstr "Administrador de %s"
 
 #: ../../include/network.php:1646
 msgid "No Subject"
@@ -3008,51 +3008,51 @@ msgstr[1] "Se abstienen"
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../../include/items.php:1038 ../../include/items.php:1084
+#: ../../include/items.php:1101 ../../include/items.php:1147
 msgid "(Unknown)"
 msgstr "(Desconocido)"
 
-#: ../../include/items.php:1310
+#: ../../include/items.php:1373
 msgid "Visible to anybody on the internet."
 msgstr "Visible para cualquiera en internet."
 
-#: ../../include/items.php:1312
+#: ../../include/items.php:1375
 msgid "Visible to you only."
 msgstr "Visible sólo para usted."
 
-#: ../../include/items.php:1314
+#: ../../include/items.php:1377
 msgid "Visible to anybody in this network."
 msgstr "Visible para cualquiera en esta red."
 
-#: ../../include/items.php:1316
+#: ../../include/items.php:1379
 msgid "Visible to anybody authenticated."
 msgstr "Visible para cualquiera que haya sido autenticado."
 
-#: ../../include/items.php:1318
+#: ../../include/items.php:1381
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr "Visible para cualquiera en %s."
 
-#: ../../include/items.php:1320
+#: ../../include/items.php:1383
 msgid "Visible to all connections."
 msgstr "Visible para todas las conexiones."
 
-#: ../../include/items.php:1322
+#: ../../include/items.php:1385
 msgid "Visible to approved connections."
 msgstr "Visible para las conexiones permitidas."
 
-#: ../../include/items.php:1324
+#: ../../include/items.php:1387
 msgid "Visible to specific connections."
 msgstr "Visible para conexiones específicas."
 
-#: ../../include/items.php:4223 ../../mod/thing.php:74
+#: ../../include/items.php:4286 ../../mod/thing.php:74
 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
 #: ../../mod/display.php:36
 msgid "Item not found."
 msgstr "Elemento no encontrado."
 
-#: ../../include/items.php:4296 ../../include/attach.php:137
+#: ../../include/items.php:4359 ../../include/attach.php:137
 #: ../../include/attach.php:184 ../../include/attach.php:247
 #: ../../include/attach.php:261 ../../include/attach.php:305
 #: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3095,38 +3095,38 @@ msgstr "Elemento no encontrado."
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
-#: ../../include/items.php:4700 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4763 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr "Colección no encontrada."
 
-#: ../../include/items.php:4716
+#: ../../include/items.php:4779
 msgid "Collection is empty."
 msgstr "La colección está vacía."
 
-#: ../../include/items.php:4723
+#: ../../include/items.php:4786
 #, php-format
 msgid "Collection: %s"
 msgstr "Colección: %s"
 
-#: ../../include/items.php:4733 ../../mod/connedit.php:674
+#: ../../include/items.php:4796 ../../mod/connedit.php:674
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../include/items.php:4735
+#: ../../include/items.php:4798
 msgid "Connection not found."
 msgstr "Conexión no encontrada"
 
-#: ../../include/zot.php:677
+#: ../../include/zot.php:684
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:693
+#: ../../include/zot.php:700
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la signatura del canal"
 
-#: ../../include/zot.php:2161
+#: ../../include/zot.php:2208
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No ha sido posible de verificar la signatura del sitio para %s"
@@ -6524,7 +6524,7 @@ msgstr "IMPORTANTE: Debe crear [manualmente] una tarea programada para las actua
 msgid "OpenID protocol error. No ID returned."
 msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
 
-#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:287
 #, php-format
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
@@ -8564,7 +8564,7 @@ msgstr "Descartar"
 msgid "Please login."
 msgstr "Por favor, inicie sesión."
 
-#: ../../mod/post.php:235
+#: ../../mod/post.php:236
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please"
 " logout and retry."
diff --git a/view/es/strings.php b/view/es/strings.php
index f1821ad49..fb7b1fca3 100644
--- a/view/es/strings.php
+++ b/view/es/strings.php
@@ -245,7 +245,7 @@ $a->strings["view full size"] = "Ver en el tamaño original";
 $a->strings["\$Projectname Notification"] = "Notificación de \$Projectname";
 $a->strings["\$projectname"] = "\$projectname";
 $a->strings["Thank You,"] = "Gracias,";
-$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%s Administrator"] = "Administrador de %s";
 $a->strings["No Subject"] = "Sin asunto";
 $a->strings["General Features"] = "Características generales";
 $a->strings["Content Expiration"] = "Caducidad del contenido";