Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

2016-08-10 23:54:54 +02:00 · 2016-08-10 23:54:54 +02:00 · b8af78d877
commit b8af78d877
--- a/util/messages.po
+++ b/util/messages.po
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@ -223,7 +223,7 @@ function frio_remote_nav($a,&$nav) {

 	} elseif(!local_user() && remote_user()) {
 		$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
-		$nav['remote'] = t("Remote");
+		$nav['remote'] = t("Guest");

 	} elseif(get_my_url ()) {
 		$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`