9 files changed, 33 insertions, 11 deletions
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 550b018fe..928694769 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -30,7 +30,7 @@ $default_timezone = '{{$timezone}}';
 // What is your site name?
 
 $a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['sitename'] = "Hubzilla";
 $a->config['system']['location_hash'] = '{{$site_id}}';
 
 
diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
index ca1a4985d..d28bed717 100644
--- a/view/de/update_fail_eml.tpl
+++ b/view/de/update_fail_eml.tpl
@@ -1,13 +1,13 @@
 Hallo, 
 ich bin der Webserver für {{$sitename}};
    
-Die RedMatrix-Entwickler haben kürzlich das Update {{$update}} veröffentlicht, 
+Die Hubzilla-Entwickler haben kürzlich das Update {{$update}} veröffentlicht, 
 aber als ich versuchte, es zu installieren, ging irgendwas furchtbar schief.  
 Das muss so bald als möglich gelöst werden und erfordert einen manuellen Eingriff. 
-Bitte kontaktiere einen Red-Entwickler, wenn Du nicht weißt, wie Du das Problem 
+Bitte kontaktiere einen Hubzilla-Entwickler, wenn Du nicht weißt, wie Du das Problem 
 selbst beheben kannst. Meine Datenbank ist eventuell ungültig. 
 
 Die Fehlermeldung ist '{{$error}}'.   
 
 Bitte entschuldige die Unannehmlichkeit, 
-	Dein Web-Server auf {{$siteurl}}
-\ No newline at end of file
+	Dein Hubzilla-Server auf {{$siteurl}}
diff --git a/view/es/messages.po b/view/es/messages.po
index 6c2093830..4ed1d6c44 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-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"
@@ -4531,6 +4531,10 @@ 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"
 
diff --git a/view/es/strings.php b/view/es/strings.php
index 8b0b1758a..be750b0ff 100644
--- a/view/es/strings.php
+++ b/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";
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index a3b4c0644..430d97a47 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -31,7 +31,7 @@ $default_timezone = '{{$timezone}}';
 // Quel sera le nom de votre site?
 
 $a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Matrice Rouge";
+$a->config['system']['sitename'] = "Hubzilla";
 $a->config['system']['location_hash'] = '{{$site_id}}';
 
 // Vos choix sont REGISTER_OPEN, REGISTER_APPROVE, ou REGISTER_CLOSED.
diff --git a/view/js/main.js b/view/js/main.js
index fd03802c5..8bd4357cc 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -836,10 +836,20 @@ function dropItem(url, object) {
 function dosubthread(ident) {
 	unpause();
 	$('#like-rotator-' + ident.toString()).spin('tiny');
-	$.get('subthread/' + ident.toString(), NavUpdate );
+	$.get('subthread/sub/' + ident.toString(), NavUpdate );
 	liking = 1;
 }
 
+
+function dounsubthread(ident) {
+	unpause();
+	$('#like-rotator-' + ident.toString()).spin('tiny');
+	$.get('subthread/unsub/' + ident.toString(), NavUpdate );
+	liking = 1;
+}
+
+
+
 function dostar(ident) {
 	ident = ident.toString();
 	$('#like-rotator-' + ident).spin('tiny');
diff --git a/view/nl/messages.po b/view/nl/messages.po
index 0b3d7e3fd..6f55daf17 100644
--- a/view/nl/messages.po
+++ b/view/nl/messages.po
@@ -9,8 +9,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 13:28+0000\n"
+"POT-Creation-Date: 2015-10-23 00:04-0700\n"
+"PO-Revision-Date: 2015-10-26 15:27+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"
@@ -4527,6 +4527,10 @@ msgid "Location"
 msgstr "Locatie"
 
 #: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr "Project"
+
+#: ../../mod/pubsites.php:26
 msgid "View hub ratings"
 msgstr "Bekijk hubbeoordelingen"
 
diff --git a/view/nl/strings.php b/view/nl/strings.php
index 865de908e..295164d17 100644
--- a/view/nl/strings.php
+++ b/view/nl/strings.php
@@ -1067,6 +1067,7 @@ $a->strings["Site URL"] = "URL hub";
 $a->strings["Access Type"] = "Toegangstype";
 $a->strings["Registration Policy"] = "Registratiebeleid";
 $a->strings["Location"] = "Locatie";
+$a->strings["Project"] = "Project";
 $a->strings["View hub ratings"] = "Bekijk hubbeoordelingen";
 $a->strings["Rate"] = "Beoordeel";
 $a->strings["View ratings"] = "Bekijk beoordelingen";
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 26434b20a..4add59a0d 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -49,7 +49,9 @@
     {{include file="field_input.tpl" field=$frontpage}}
     {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
     {{include file="field_checkbox.tpl" field=$login_on_homepage}}
-
+	{{if $directory_server}}
+		{{include file="field_select.tpl" field=$directory_server}}
+	{{/if}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>