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

Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php

view/es/messages.po

@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-17 16:47-0700\n"
-"PO-Revision-Date: 2015-10-18 15:17+0000\n"
+"POT-Creation-Date: 2015-10-23 00:04-0700\n"
+"PO-Revision-Date: 2015-10-31 19:26+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"
@@ -4530,6 +4530,10 @@ msgstr "Normas de Registro"
 msgid "Location"
 msgstr "Localización"
 
+#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Proyecto"
+
 #: ../../mod/pubsites.php:26
 msgid "View hub ratings"
 msgstr "Ver las valoraciones del sitio"

view/es/strings.php

@@ -1067,6 +1067,7 @@ $a->strings["Site URL"] = "Dirección del sitio";
 $a->strings["Access Type"] = "Tipo de Acceso";
 $a->strings["Registration Policy"] = "Normas de Registro";
 $a->strings["Location"] = "Localización";
+$a->strings["Project"] = "Proyecto";
 $a->strings["View hub ratings"] = "Ver las valoraciones del sitio";
 $a->strings["Rate"] = "Valorar";
 $a->strings["View ratings"] = "Ver valoraciones";