Merge branch 'master' into tres

Conflicts:
	include/Import/refimport.php
	include/activities.php
	include/attach.php
	include/event.php
	include/externals.php
	include/identity.php
	include/items.php
	include/notifier.php
	include/photos.php
	include/taxonomy.php
	include/zot.php
	mod/channel.php
	mod/connedit.php
	mod/events.php
	mod/item.php
	mod/like.php
	mod/manage.php
	mod/mood.php
	mod/ping.php
	mod/poke.php
	mod/subthread.php
	mod/tagger.php
	mod/thing.php

1 files changed, 1 insertions, 1 deletions

diff --git a/mod/help.php b/mod/help.php
index 0081e54e7..3d7c0a628 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -97,7 +97,7 @@ function help_content(&$a) {
 	$content = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $content);
 
 	return replace_macros(get_markup_template("help.tpl"), array(
-		'$content' => $content
+		'$content' => translate_projectname($content)
 	));
 
 }