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

include/bbcode.php

@@ -193,6 +193,9 @@ function translate_design_element($type) {
 		case 'block':
 			$ret =  t('block');
 			break;
+		case 'menu':
+			$ret =  t('menu');
+			break;
 	}
 
 	return $ret;
@@ -958,4 +961,4 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true) {
 
 function strip_bbimage($s) {
 		$Text = preg_replace("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/ism", '', $Text);
-}
+}