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, 15 insertions, 2 deletions

diff --git a/include/language.php b/include/language.php
index 1e8528dc1..7dbe3dd02 100644
--- a/include/language.php
+++ b/include/language.php
@@ -159,13 +159,26 @@ function t($s, $ctx = '') {
 	if (x($a->strings, $cs)) {
 		$t = $a->strings[$cs];
 
-		return is_array($t) ? $t[0] : $t;
+		return ((is_array($t)) ? translate_projectname($t[0]) : translate_projectname($t));
 	}
 
-	return $s;
+	return translate_projectname($s);
 }
 
 /**
+ * @brief translate product name
+ *  Merging strings from different project names is problematic so we'll do that with a string replacement
+ */
+
+function translate_projectname($s) {
+
+	return str_replace(array('$projectname','$Projectname'),array(PLATFORM_NAME,ucfirst(PLATFORM_NAME)),$s);
+
+}
+
+
+
+/**
  * @brief
  *
  * @param string $singular