From: Zach Prezkuta Date: Sat, 22 Dec 2012 19:57:29 +0000 (-0700) Subject: Implement Smarty3 X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=96ed0a77912e049799dc81761f1dbe4a9eec5757;p=friendica.git Implement Smarty3 --- diff --git a/boot.php b/boot.php index 563067ad63..e8561a6150 100644 --- a/boot.php +++ b/boot.php @@ -380,9 +380,13 @@ if(! class_exists('App')) { 'videoheight' => 350, 'force_max_items' => 0, 'thread_allow' => true, - 'stylesheet' => '' + 'stylesheet' => '', + 'template_engine' => 'internal', ); + public $smarty3_ldelim = '{{'; + public $smarty3_rdelim = '}}'; + private $scheme; private $hostname; private $baseurl; @@ -613,6 +617,16 @@ if(! class_exists('App')) { if(!isset($this->page['htmlhead'])) $this->page['htmlhead'] = ''; $tpl = get_markup_template('head.tpl'); + + // If we're using Smarty, then doing replace_macros() will replace + // any unrecognized variables with a blank string. Since we delay + // replacing $stylesheet until later, we need to replace it now + // with another variable name + if($this->theme['template_engine'] === 'smarty3') + $stylesheet = $this->smarty3_ldelim . '$stylesheet' . $this->smarty3_rdelim; + else + $stylesheet = '$stylesheet'; + $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! '$local_user' => local_user(), @@ -621,7 +635,8 @@ if(! class_exists('App')) { '$comment' => t('Comment'), '$showmore' => t('show more'), '$showfewer' => t('show fewer'), - '$update_interval' => $interval + '$update_interval' => $interval, + '$stylesheet' => $stylesheet )) . $this->page['htmlhead']; } @@ -955,7 +970,15 @@ if(! function_exists('login')) { } - $o .= replace_macros($tpl,array( + $includes = array( + '$field_input' => 'field_input.tpl', + '$field_password' => 'field_password.tpl', + '$field_openid' => 'field_openid.tpl', + '$field_checkbox' => 'field_checkbox.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($tpl,$includes + array( '$dest_url' => $dest_url, '$logout' => t('Logout'), @@ -1324,16 +1347,25 @@ if(! function_exists('profile_sidebar')) { $tpl = get_markup_template('profile_vcard.tpl'); - $o .= replace_macros($tpl, array( + + $includes = array( + '$diaspora_vcard' => 'diaspora_vcard.tpl' + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + if($a->theme['template_engine'] === 'internal') + $location = template_escape($location); + + $o .= replace_macros($tpl, $includes + array( '$profile' => $profile, '$connect' => $connect, '$wallmessage' => $wallmessage, - '$location' => template_escape($location), + '$location' => $location, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, - '$diaspora' => $diaspora, + '$diaspora_info' => $diaspora, '$contact_block' => $contact_block, )); diff --git a/include/conversation.php b/include/conversation.php index e4f3ec9ff6..9cc6a83427 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -581,33 +581,54 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { list($categories, $folders) = get_cats_and_terms($item); + if($a->theme['template_engine'] === 'internal') { + $profile_name_e = template_escape($profile_name); + $item['title_e'] = template_escape($item['title']); + $body_e = template_escape($body); + $tags_e = template_escape($tags); + $hashtags_e = template_escape($hashtags); + $mentions_e = template_escape($mentions); + $location_e = template_escape($location); + $owner_name_e = template_escape($owner_name); + } + else { + $profile_name_e = $profile_name; + $item['title_e'] = $item['title']; + $body_e = $body; + $tags_e = $tags; + $hashtags_e = $hashtags; + $mentions_e = $mentions; + $location_e = $location; + $owner_name_e = $owner_name; + } + $tmp_item = array( 'template' => $tpl, 'id' => (($preview) ? 'P0' : $item['item_id']), 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $profile_name_e, 'sparkle' => $sparkle, 'lock' => $lock, 'thumb' => $profile_avatar, - 'title' => template_escape($item['title']), - 'body' => template_escape($body), - 'tags' => template_escape($tags), - 'hashtags' => template_escape($hashtags), - 'mentions' => template_escape($mentions), + 'title' => $item['title_e'], + 'body' => $body_e, + 'tags' => $tags_e, + 'hashtags' => $hashtags_e, + 'mentions' => $mentions_e, 'txt_cats' => t('Categories:'), 'txt_folders' => t('Filed under:'), 'has_cats' => ((count($categories)) ? 'true' : ''), 'has_folders' => ((count($folders)) ? 'true' : ''), 'categories' => $categories, 'folders' => $folders, - 'text' => strip_tags(template_escape($body)), + 'text' => strip_tags($body_e), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => '', - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name_e, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, 'plink' => get_plink($item), @@ -682,7 +703,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$live_update' => $live_update_div, - '$remove' => t('remove'), '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, @@ -856,12 +876,27 @@ function format_like($cnt,$arr,$type,$id) { if($cnt == 1) $o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ; else { - $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"'; - $o .= (($type === 'like') ? - sprintf( t('%2$d people like this.'), $spanatts, $cnt) - : - sprintf( t('%2$d people don\'t like this.'), $spanatts, $cnt) ); - $o .= EOL ; + //$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"'; + switch($type) { + case 'like': +// $phrase = sprintf( t('%2$d people like this.'), $spanatts, $cnt); + $mood = t('like this'); + break; + case 'dislike': +// $phrase = sprintf( t('%2$d people don\'t like this.'), $spanatts, $cnt); + $mood = t('don\'t like this'); + break; + } + $tpl = get_markup_template("voting_fakelink.tpl"); + $phrase = replace_macros($tpl, array( + '$vote_id' => $type . 'list-' . $id, + '$count' => $cnt, + '$people' => t('people'), + '$vote_mood' => $mood + )); + $o .= $phrase; +// $o .= EOL ; + $total = count($arr); if($total >= MAX_LIKERS) $arr = array_slice($arr, 0, MAX_LIKERS - 1); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php new file mode 100644 index 0000000000..2a294e9e24 --- /dev/null +++ b/include/friendica_smarty.php @@ -0,0 +1,36 @@ +root = $_SERVER['DOCUMENT_ROOT'] . '/'; + $this->root = ''; + + $this->setTemplateDir($this->root . 'view/smarty3/'); + $this->setCompileDir($this->root . 'view/smarty3/compiled/'); + $this->setConfigDir($this->root . 'view/smarty3/config/'); + $this->setCacheDir($this->root . 'view/smarty3/cache/'); + + $this->left_delimiter = $a->smarty3_ldelim; + $this->right_delimiter = $a->smarty3_rdelim; + } + + function parsed($template = '') { + if($template) { + return $this->fetch('string:' . $template); + } + return $this->fetch('file:' . $this->root . $this->filename); + } +} + + + diff --git a/include/text.php b/include/text.php index 4212e23ca4..0591390a84 100644 --- a/include/text.php +++ b/include/text.php @@ -9,19 +9,38 @@ // depending on the order in which they were declared in the array. require_once("include/template_processor.php"); +require_once("include/friendica_smarty.php"); if(! function_exists('replace_macros')) { function replace_macros($s,$r) { global $t; - - //$ts = microtime(); - $r = $t->replace($s,$r); - //$tt = microtime() - $ts; - - //$a = get_app(); - //$a->page['debug'] .= "$tt
\n"; - return template_unescape($r); +// $ts = microtime(); + $a = get_app(); + + if($a->theme['template_engine'] === 'smarty3') { + $template = ''; + if(gettype($s) === 'string') { + $template = $s; + $s = new FriendicaSmarty(); + } + foreach($r as $key=>$value) { + if($key[0] === '$') { + $key = substr($key, 1); + } + $s->assign($key, $value); + } + $output = $s->parsed($template); + } + else { + $r = $t->replace($s,$r); + + $output = template_unescape($r); + } +// $tt = microtime() - $ts; +// $a = get_app(); +// $a->page['debug'] .= "$tt
\n"; + return $output; }} @@ -421,29 +440,78 @@ if(! function_exists('get_intltext_template')) { function get_intltext_template($s) { global $lang; + $a = get_app(); + $engine = ''; + if($a->theme['template_engine'] === 'smarty3') + $engine = "/smarty3"; + if(! isset($lang)) $lang = 'en'; - if(file_exists("view/$lang/$s")) - return file_get_contents("view/$lang/$s"); - elseif(file_exists("view/en/$s")) - return file_get_contents("view/en/$s"); + if(file_exists("view/$lang$engine/$s")) + return file_get_contents("view/$lang$engine/$s"); + elseif(file_exists("view/en$engine/$s")) + return file_get_contents("view/en$engine/$s"); else - return file_get_contents("view/$s"); + return file_get_contents("view$engine/$s"); }} if(! function_exists('get_markup_template')) { -function get_markup_template($s) { - $a=get_app(); +function get_markup_template($s, $root = '') { +// $ts = microtime(); + $a = get_app(); + + if($a->theme['template_engine'] === 'smarty3') { + $template_file = get_template_file($a, 'smarty3/' . $s, $root); + + $template = new FriendicaSmarty(); + $template->filename = $template_file; + +// $tt = microtime() - $ts; +// $a->page['debug'] .= "$tt
\n"; + return $template; + } + else { + $template_file = get_template_file($a, $s, $root); +// $file_contents = file_get_contents($template_file); +// $tt = microtime() - $ts; +// $a->page['debug'] .= "$tt
\n"; +// return $file_contents; + return file_get_contents($template_file); + } +}} + +if(! function_exists("get_template_file")) { +function get_template_file($a, $filename, $root = '') { $theme = current_theme(); - - if(file_exists("view/theme/$theme/$s")) - return file_get_contents("view/theme/$theme/$s"); - elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s")) - return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s"); + + // Make sure $root ends with a slash / + if($root !== '' && $root[strlen($root)-1] !== '/') + $root = $root . '/'; + + if(file_exists($root . "view/theme/$theme/$filename")) + $template_file = $root . "view/theme/$theme/$filename"; + elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename")) + $template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename"; else - return file_get_contents("view/$s"); + $template_file = $root . "view/$filename"; + return $template_file; +}} + +if(! function_exists("set_template_includes")) { +function set_template_includes($engine, $includes) { + if($engine === 'smarty3') { + $a = get_app(); + foreach($includes as $name=>$path) { +// $sm_includes[$name] = $_SERVER['DOCUMENT_ROOT'] . '/' . get_template_file($a, 'smarty3/' . $path); + $sm_includes[$name] = get_template_file($a, 'smarty3/' . $path); + } + return $sm_includes; + } + else { + return $includes; + } }} diff --git a/mod/admin.php b/mod/admin.php index bd0d14bef7..69b2896772 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -439,7 +439,16 @@ function admin_page_site(&$a) { ); $t = get_markup_template("admin_site.tpl"); - return replace_macros($t, array( + + $includes = array( + '$field_checkbox' => 'field_checkbox.tpl', + '$field_input' => 'field_input.tpl', + '$field_select' => 'field_select.tpl', + '$field_textarea' => 'field_textarea.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + return replace_macros($t, $includes + array( '$title' => t('Administration'), '$page' => t('Site'), '$submit' => t('Submit'), @@ -488,7 +497,7 @@ function admin_page_site(&$a) { '$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")), '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$form_security_token' => get_form_security_token("admin_site"), - + )); } @@ -1109,7 +1118,14 @@ readable."); } } - return replace_macros($t, array( + $includes = array( + '$field_checkbox' => 'field_checkbox.tpl', + '$field_input' => 'field_input.tpl', + '$field_select' => 'field_select.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + return replace_macros($t, $includes + array( '$title' => t('Administration'), '$page' => t('Logs'), '$submit' => t('Submit'), @@ -1168,7 +1184,14 @@ function admin_page_remoteupdate(&$a) { } $tpl = get_markup_template("admin_remoteupdate.tpl"); - return replace_macros($tpl, array( + + $includes = array( + '$field_input' => 'field_input.tpl', + '$field_password' => 'field_password.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + return replace_macros($tpl, $includes + array( '$baseurl' => $a->get_baseurl(true), '$submit' => t("Update now"), '$close' => t("Close"), @@ -1181,7 +1204,7 @@ function admin_page_remoteupdate(&$a) { '$ftppath' => array('ftppath', t("FTP Path"), '/',''), '$ftpuser' => array('ftpuser', t("FTP User"), '',''), '$ftppwd' => array('ftppwd', t("FTP Password"), '',''), - '$remotefile'=>array('remotefile','', $u['2'],'') + '$remotefile'=>array('remotefile','', $u['2'],''), )); } diff --git a/mod/contacts.php b/mod/contacts.php index 3ef7b53043..1a57afbf5a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -346,7 +346,12 @@ function contacts_content(&$a) { $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); - $o .= replace_macros($tpl,array( + $includes = array( + '$field_checkbox' => 'field_checkbox.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($tpl,$includes + array( '$header' => t('Contact Editor'), '$tab_str' => $tab_str, '$submit' => t('Submit'), @@ -388,7 +393,7 @@ function contacts_content(&$a) { '$dir_icon' => $dir_icon, '$alt_text' => $alt_text, '$sparkle' => $sparkle, - '$url' => $url + '$url' => $url, )); @@ -571,7 +576,13 @@ function contacts_content(&$a) { } $tpl = get_markup_template("contacts-template.tpl"); - $o .= replace_macros($tpl,array( + + $includes = array( + '$contact_template' => 'contact_template.tpl', + ); + $includes = set_template_includes($a->theme['template_engine'], $includes); + + $o .= replace_macros($tpl,$includes + array( '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$tabs' => $t, '$total' => $total, diff --git a/mod/content.php b/mod/content.php index c4b0ca2f62..4210843dd2 100644 --- a/mod/content.php +++ b/mod/content.php @@ -447,6 +447,23 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { $shareable = false; $body = prepare_body($item,true); + + if($a->theme['template_engine'] === 'internal') { + $name_e = template_escape($profile_name); + $title_e = template_escape($item['title']); + $body_e = template_escape($body); + $text_e = strip_tags(template_escape($body)); + $location_e = template_escape($location); + $owner_name_e = template_escape($owner_name); + } + else { + $name_e = $profile_name; + $title_e = $item['title']; + $body_e = $body; + $text_e = strip_tags($body); + $location_e = $location; + $owner_name_e = $owner_name; + } //$tmp_item = replace_macros($tpl,array( $tmp_item = array( @@ -455,17 +472,17 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $name_e, 'sparkle' => $sparkle, 'lock' => $lock, 'thumb' => $profile_avatar, - 'title' => template_escape($item['title']), - 'body' => template_escape($body), - 'text' => strip_tags(template_escape($body)), + 'title' => $title_e, + 'body' => $body_e, + 'text' => $text_e, 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => '', - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name_e, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, 'plink' => get_plink($item), @@ -802,6 +819,24 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { $body = prepare_body($item,true); //$tmp_item = replace_macros($template, + + if($a->theme['template_engine'] === 'internal') { + $body_e = template_escape($body); + $text_e = strip_tags(template_escape($body)); + $name_e = template_escape($profile_name); + $title_e = template_escape($item['title']); + $location_e = template_escape($location); + $owner_name_e = template_escape($owner_name); + } + else { + $body_e = $body; + $text_e = strip_tags($body); + $name_e = $profile_name; + $title_e = $item['title']; + $location_e = $location; + $owner_name_e = $owner_name; + } + $tmp_item = array( // collapse comments in template. I don't like this much... 'comment_firstcollapsed' => $comment_firstcollapsed, @@ -811,8 +846,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), 'tags' => $tags, - 'body' => template_escape($body), - 'text' => strip_tags(template_escape($body)), + 'body' => $body_e, + 'text' => $text_e, 'id' => $item['item_id'], 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), @@ -821,19 +856,19 @@ function render_content(&$a, $items, $mode, $update, $preview = false) { 'vwall' => t('via Wall-To-Wall:'), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), - 'name' => template_escape($profile_name), + 'name' => $name_e, 'thumb' => $profile_avatar, 'osparkle' => $osparkle, 'sparkle' => $sparkle, - 'title' => template_escape($item['title']), + 'title' => $title_e, 'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), 'lock' => $lock, - 'location' => template_escape($location), + 'location' => $location_e, 'indent' => $indent, 'shiny' => $shiny, 'owner_url' => $owner_url, 'owner_photo' => $owner_photo, - 'owner_name' => template_escape($owner_name), + 'owner_name' => $owner_name_e, 'plink' => get_plink($item), 'edpost' => $edpost, 'isstarred' => $isstarred, diff --git a/mod/directory.php b/mod/directory.php index 833a4f81cc..3e138570cb 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -143,16 +143,23 @@ function directory_content(&$a) { $tpl = get_markup_template('directory_item.tpl'); + if($a->theme['template_engine'] === 'internal') { + $location_e = template_escape($location); + } + else { + $location_e = $location; + } + $entry = replace_macros($tpl,array( '$id' => $rr['id'], - '$profile-link' => $profile_link, + '$profile_link' => $profile_link, '$photo' => $a->get_cached_avatar_image($rr[$photo]), - '$alt-text' => $rr['name'], + '$alt_text' => $rr['name'], '$name' => $rr['name'], '$details' => $pdesc . $details, - '$page-type' => $page_type, + '$page_type' => $page_type, '$profile' => $profile, - '$location' => template_escape($location), + '$location' => $location_e, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, diff --git a/mod/display.php b/mod/display.php index 6305dd44e7..32c4bcae9f 100644 --- a/mod/display.php +++ b/mod/display.php @@ -16,7 +16,7 @@ function display_content(&$a, $update = 0) { $o = ''; - $a->page['htmlhead'] .= get_markup_template('display-head.tpl'); + $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); if($update) { diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 5ee813b4d6..92c6bd3b4b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -55,9 +55,17 @@ function fbrowser_content($a){ global $a; $types = Photo::supportedTypes(); $ext = $types[$rr['type']]; + + if($a->theme['template_engine'] === 'internal') { + $filename_e = template_escape($rr['filename']); + } + else { + $filename_e = $rr['filename']; + } + return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, - template_escape($rr['filename']), + $filename_e, $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext ); } @@ -83,7 +91,15 @@ function fbrowser_content($a){ function files2($rr){ global $a; list($m1,$m2) = explode("/",$rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); - return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); + + if($a->theme['template_engine'] === 'internal') { + $filename_e = template_escape($rr['filename']); + } + else { + $filename_e = $rr['filename']; + } + + return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); } $files = array_map("files2", $files); //echo "
"; var_dump($files); killme();
diff --git a/mod/filer.php b/mod/filer.php
index c0cca9e6df..7b0fd59d58 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -25,6 +25,12 @@ function filer_content(&$a) {
 		$filetags = file_tag_file_to_list($filetags,'file');
                 $filetags = explode(",", $filetags);
 		$tpl = get_markup_template("filer_dialog.tpl");
+
+		$includes = array(
+			'$field_combobox' => 'field_combobox.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
 			'$submit' => t('Save'),
diff --git a/mod/group.php b/mod/group.php
index a282dbccf5..f5a37819ed 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -82,7 +82,16 @@ function group_content(&$a) {
 		$switchtotext = 400;
 
 	$tpl = get_markup_template('group_edit.tpl');
-	$context = array('$submit' => t('Submit'));
+
+	$includes = array(
+			'$field_input' => 'field_input.tpl',
+			'$groupeditortpl' => 'groupeditor.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$context = $includes + array(
+			'$submit' => t('Submit'),
+	);
 
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
 		
@@ -217,15 +226,16 @@ function group_content(&$a) {
 		}
 	}
 
-	$context['$groupeditor'] = $groupeditor;
 	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
+		$context['$groupeditor'] = $groupeditor;
 		$tpl = get_markup_template('groupeditor.tpl');
 		echo replace_macros($tpl, $context);
 		killme();
 	}
 	
+	$context['$groupedit_info'] = $groupeditor;
 	return replace_macros($tpl, $context);
 
 }
diff --git a/mod/hostxrd.php b/mod/hostxrd.php
index 9b2411f266..4121764f1a 100644
--- a/mod/hostxrd.php
+++ b/mod/hostxrd.php
@@ -14,10 +14,18 @@ function hostxrd_init(&$a) {
 		set_config('system','site_pubkey', $res['pubkey']);
 	}
 
-	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace(array(
-		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+	//$tpl = file_get_contents('view/xrd_host.tpl');
+	/*echo str_replace(array(
+		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
+	$tpl = get_markup_template('xrd_host.tpl');
+	echo replace_macros($tpl, array(
+		'$zhost' => $a->get_hostname(),
+		'$zroot' => z_root(),
+		'$domain' => z_path(),
+		'$zot_post' => z_root() . '/post',
+		'$bigkey' => salmon_key(get_config('system','site_pubkey')),
+	));
 	session_write_close();
 	exit();
 
-}
\ No newline at end of file
+}
diff --git a/mod/install.php b/mod/install.php
index 91b5e3d2d4..ab6d7d204f 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -220,7 +220,14 @@ function install_content(&$a) {
 			
 
 			$tpl = get_markup_template('install_db.tpl');
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' 	=> 'field_input.tpl',
+				'$field_password' => 'field_password.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl,$includes + array(
 				'$title' => $install_title,
 				'$pass' => t('Database connection'),
 				'$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
@@ -260,7 +267,13 @@ function install_content(&$a) {
 			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 			
 			$tpl = get_markup_template('install_settings.tpl');
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$title' => $install_title,
 				'$pass' => t('Site settings'),
 
diff --git a/mod/message.php b/mod/message.php
index 744a3eb3f7..7ca3fba70a 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -282,23 +282,25 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
-			'$header' => t('Send Private Message'),
-			'$to' => t('To:'),
-			'$showinputs' => 'true', 
-			'$prefill' => $prefill,
-			'$autocomp' => $autocomp,
-			'$preid' => $preid,
-			'$subject' => t('Subject:'),
-			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
-			'$select' => $select,
-			'$parent' => '',
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait'),
-			'$submit' => t('Submit')
+			'$reply' => array(
+				'header' => t('Send Private Message'),
+				'to' => t('To:'),
+				'showinputs' => 'true', 
+				'prefill' => $prefill,
+				'autocomp' => $autocomp,
+				'preid' => $preid,
+				'subject' => t('Subject:'),
+				'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+				'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+				'readonly' => '',
+				'yourmessage' => t('Your message:'),
+				'select' => $select,
+				'parent' => '',
+				'upload' => t('Upload photo'),
+				'insert' => t('Insert web link'),
+				'wait' => t('Please wait'),
+				'submit' => t('Submit')
+			)
 		));
 
 		return $o;
@@ -346,6 +348,17 @@ function message_content(&$a) {
 			else {
 				$partecipants = sprintf( t("%s and You"), $rr['from-name']);
 			}
+
+			if($a->theme['template_engine'] === 'internal') {
+				$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''));
+				$body_e = template_escape($rr['body']);
+				$to_name_e = template_escape($rr['name']);
+			}
+			else {
+				$subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '');
+				$body_e = $rr['body'];
+				$to_name_e = $rr['name'];
+			}
 			
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
@@ -353,10 +366,10 @@ function message_content(&$a) {
 				'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
 				'$sparkle' => ' sparkle',
 				'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
-				'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '')),
+				'$subject' => $subject_e,
 				'$delete' => t('Delete conversation'),
-				'$body' => template_escape($rr['body']),
-				'$to_name' => template_escape($rr['name']),
+				'$body' => $body_e,
+				'$to_name' => $to_name_e,
 				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
                                 '$ago' => relative_date($rr['mailcreated']),
 				'$seen' => $rr['mailseen'],
@@ -371,6 +384,10 @@ function message_content(&$a) {
 
 		$o .= $header;
 
+		$plaintext = true;
+		if( local_user() && feature_enabled(local_user(),'richtext') )
+			$plaintext = false;
+
 		$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
 			WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
@@ -408,14 +425,18 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl(true)
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl(true)
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 
@@ -440,16 +461,29 @@ function message_content(&$a) {
 			if($extracted['images'])
 				$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
 
+			if($a->theme['template_engine'] === 'internal') {
+				$from_name_e = template_escape($message['from-name']);
+				$subject_e = template_escape($message['title']);
+				$body_e = template_escape(smilies(bbcode($message['body'])));
+				$to_name_e = template_escape($message['name']);
+			}
+			else {
+				$from_name_e = $message['from-name'];
+				$subject_e = $message['title'];
+				$body_e = smilies(bbcode($message['body']));
+				$to_name_e = $message['name'];
+			}
+
 			$mails[] = array(
 				'id' => $message['id'],
-				'from_name' => template_escape($message['from-name']),
+				'from_name' => $from_name_e,
 				'from_url' => $from_url,
 				'sparkle' => $sparkle,
 				'from_photo' => $message['from-photo'],
-				'subject' => template_escape($message['title']),
-				'body' => template_escape(smilies(bbcode($message['body']))),
+				'subject' => $subject_e,
+				'body' => $body_e,
 				'delete' => t('Delete message'),
-				'to_name' => template_escape($message['name']),
+				'to_name' => $to_name_e,
 				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
                                 'ago' => relative_date($message['created']),
 			);
@@ -462,7 +496,21 @@ function message_content(&$a) {
 		$parent = '';
 
 		$tpl = get_markup_template('mail_display.tpl');
-		$o = replace_macros($tpl, array(
+
+		$includes = array(
+			'$mail_conv' => 'mail_conv.tpl',
+			'$prv_message' => 'prv_message.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		if($a->theme['template_engine'] === 'internal') {
+			$subjtxt_e = template_escape($message['title']);
+		}
+		else {
+			$subjtxt_e = $message['title'];
+		}
+
+		$o = replace_macros($tpl, $includes + array(
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
@@ -472,20 +520,22 @@ function message_content(&$a) {
 			'$mails' => $mails,
 			
 			// reply
-			'$header' => t('Send Reply'),
-			'$to' => t('To:'),
-			'$showinputs' => '',
-			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
-			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-			'$yourmessage' => t('Your message:'),
-			'$text' => '',
-			'$select' => $select,
-			'$parent' => $parent,
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$submit' => t('Submit'),
-			'$wait' => t('Please wait')
+			'$reply_info' => array(
+				'header' => t('Send Reply'),
+				'to' => t('To:'),
+				'showinputs' => '',
+				'subject' => t('Subject:'),
+				'subjtxt' => $subjtxt_e,
+				'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+				'yourmessage' => t('Your message:'),
+				'text' => '',
+				'select' => $select,
+				'parent' => $parent,
+				'upload' => t('Upload photo'),
+				'insert' => t('Insert web link'),
+				'submit' => t('Submit'),
+				'wait' => t('Please wait'),
+			),
 
 		));
 
diff --git a/mod/nogroup.php b/mod/nogroup.php
index bd1ec82ed2..885ba62c63 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -53,8 +53,15 @@ function nogroup_content(&$a) {
 			);
 		}
 	}
+
 	$tpl = get_markup_template("nogroup-template.tpl");
-	$o .= replace_macros($tpl,array(
+
+	$includes = array(
+		'$contact_template' => 'contact_template.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl,$includes + array(
 		'$header' => t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
diff --git a/mod/notifications.php b/mod/notifications.php
index b8029fd03f..03a39a268e 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -144,7 +144,13 @@ function notifications_content(&$a) {
 				if($rr['fid']) {
 
 					$return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-					$notif_content .= replace_macros($sugg,array(
+
+					$includes = array(
+						'$field_checkbox' => 'field_checkbox.tpl',
+					);
+					$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+					$notif_content .= replace_macros($sugg,$includes + array(
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => t('Friend Suggestion'),
 						'$intro_id' => $rr['intro_id'],
@@ -161,7 +167,7 @@ function notifications_content(&$a) {
 						'$note' => $rr['note'],
 						'$request' => $rr['frequest'] . '?addr=' . $return_addr,
 						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard')
+						'$discard' => t('Discard'),
 
 					));
 
@@ -190,7 +196,12 @@ function notifications_content(&$a) {
 					));
 				}			
 
-				$notif_content .= replace_macros($tpl,array(
+				$includes = array(
+					'$field_checkbox' => 'field_checkbox.tpl',
+				);
+				$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+				$notif_content .= replace_macros($tpl,$includes + array(
 					'$str_notifytype' => t('Notification type: '),
 					'$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
 					'$dfrn_text' => $dfrn_text,	
@@ -207,7 +218,7 @@ function notifications_content(&$a) {
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
 					'$ignore' => t('Ignore'),
-					'$discard' => t('Discard')
+					'$discard' => t('Discard'),
 
 				));
 			}
@@ -215,9 +226,14 @@ function notifications_content(&$a) {
 		else
 			info( t('No introductions.') . EOL);
 
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -301,9 +317,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more network notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Network Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -331,9 +352,14 @@ function notifications_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('System Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 
@@ -426,9 +452,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more personal notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Personal Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -507,9 +538,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more home notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Home Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 	}
diff --git a/mod/notify.php b/mod/notify.php
index ae8273a1d3..3abc1185cf 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -61,13 +61,18 @@ function notify_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('System Notifications'),
-			'$tabs' => '', // $tabs,
+			'$tabs_data' => '', // $tabs,
 			'$notif_content' => $notif_content,
 		));
 
 	return $o;
 
 
-}
\ No newline at end of file
+}
diff --git a/mod/photos.php b/mod/photos.php
index efccb0e10a..8ac4d85903 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1039,6 +1039,16 @@ function photos_content(&$a) {
 
 
 		$tpl = get_markup_template('photos_upload.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$albumselect_e = template_escape($albumselect);
+			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+		}
+		else {
+			$albumselect_e = $albumselect;
+			$aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+		}
+
 		$o .= replace_macros($tpl,array(
 			'$pagename' => t('Upload Photos'),
 			'$sessid' => session_id(),
@@ -1047,9 +1057,9 @@ function photos_content(&$a) {
 			'$newalbum' => t('New album name: '),
 			'$existalbumtext' => t('or existing album name: '),
 			'$nosharetext' => t('Do not show a status post for this upload'),
-			'$albumselect' => template_escape($albumselect),
+			'$albumselect' => $albumselect_e,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),
+			'$aclselect' => $aclselect_e,
 			'$uploader' => $ret['addon_text'],
 			'$default' => (($ret['default_upload']) ? $default_upload : ''),
 			'$uploadurl' => $ret['post_url']
@@ -1092,10 +1102,18 @@ function photos_content(&$a) {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
 					$edit_tpl = get_markup_template('album_edit.tpl');
+
+					if($a->theme['template_engine'] === 'internal') {
+						$album_e = template_escape($album);
+					}
+					else {
+						$album_e = $album;
+					}
+
 					$o .= replace_macros($edit_tpl,array(
 						'$nametext' => t('New album name: '),
 						'$nickname' => $a->data['user']['nickname'],
-						'$album' => template_escape($album),
+						'$album' => $album_e,
 						'$hexalbum' => bin2hex($album),
 						'$submit' => t('Submit'),
 						'$dropsubmit' => t('Delete Album')
@@ -1135,6 +1153,15 @@ function photos_content(&$a) {
 				
 				$ext = $phototypes[$rr['type']];
 
+				if($a->theme['template_engine'] === 'internal') {
+					$imgalt_e = template_escape($rr['filename']);
+					$desc_e = template_escape($rr['desc']);
+				}
+				else {
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['desc'];
+				}
+
 				$o .= replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					'$twist' => ' ' . $twist . rand(2,4),
@@ -1142,8 +1169,8 @@ function photos_content(&$a) {
 						. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
 					'$phototitle' => t('View Photo'),
 					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
-					'$imgalt' => template_escape($rr['filename']),
-					'$desc'=> template_escape($rr['desc'])
+					'$imgalt' => $imgalt_e,
+					'$desc'=> $desc_e
 				));
 
 		}
@@ -1344,20 +1371,32 @@ function photos_content(&$a) {
 		$edit = Null;
 		if(($cmd === 'edit') && ($can_post)) {
 			$edit_tpl = get_markup_template('photo_edit.tpl');
+
+			if($a->theme['template_engine'] === 'internal') {
+				$album_e = template_escape($ph[0]['album']);
+				$caption_e = template_escape($ph[0]['desc']);
+				$aclselect_e = template_escape(populate_acl($ph[0]));
+			}
+			else {
+				$album_e = $ph[0]['album'];
+				$caption_e = $ph[0]['desc'];
+				$aclselect_e = populate_acl($ph[0]);
+			}
+
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
 				'$rotatecw' => t('Rotate CW (right)'),
 				'$rotateccw' => t('Rotate CCW (left)'),
-				'$album' => template_escape($ph[0]['album']),
+				'$album' => $album_e,
 				'$newalbum' => t('New album name'), 
 				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
 				'$capt_label' => t('Caption'),
-				'$caption' => template_escape($ph[0]['desc']),
+				'$caption' => $caption_e,
 				'$tag_label' => t('Add a Tag'),
 				'$tags' => $link_item['tag'],
 				'$permissions' => t('Permissions'),
-				'$aclselect' => template_escape(populate_acl($ph[0])),
+				'$aclselect' => $aclselect_e,
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
@@ -1488,14 +1527,25 @@ function photos_content(&$a) {
 						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
+					if($a->theme['template_engine'] === 'internal') {
+						$name_e = template_escape($profile_name);
+						$title_e = template_escape($item['title']);
+						$body_e = template_escape(bbcode($item['body']));
+					}
+					else {
+						$name_e = $profile_name;
+						$title_e = $item['title'];
+						$body_e = bbcode($item['body']);
+					}
+
 					$comments .= replace_macros($template,array(
 						'$id' => $item['item_id'],
 						'$profile_url' => $profile_link,
-						'$name' => template_escape($profile_name),
+						'$name' => $name_e,
 						'$thumb' => $profile_avatar,
 						'$sparkle' => $sparkle,
-						'$title' => template_escape($item['title']),
-						'$body' => template_escape(bbcode($item['body'])),
+						'$title' => $title_e,
+						'$body' => $body_e,
 						'$ago' => relative_date($item['created']),
 						'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 						'$drop' => $drop,
@@ -1531,20 +1581,34 @@ function photos_content(&$a) {
 		}
 		
 		$photo_tpl = get_markup_template('photo_view.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$album_e = array($album_link,template_escape($ph[0]['album']));
+			$tags_e = template_escape($tags);
+			$like_e = template_escape($like);
+			$dislike_e = template_escape($dislike);
+		}
+		else {
+			$album_e = array($album_link,$ph[0]['album']);
+			$tags_e = $tags;
+			$like_e = $like;
+			$dislike_e = $dislike;
+		}
+
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $ph[0]['id'],
-			'$album' => array($album_link,template_escape($ph[0]['album'])),
+			'$album' => $album_e,
 			'$tools' => $tools,
 			'$lock' => $lock,
 			'$photo' => $photo,
 			'$prevlink' => $prevlink,
 			'$nextlink' => $nextlink,
 			'$desc' => $ph[0]['desc'],
-			'$tags' => template_escape($tags),
+			'$tags' => $tags_e,
 			'$edit' => $edit,	
 			'$likebuttons' => $likebuttons,
-			'$like' => template_escape($like),
-			'$dislike' => template_escape($dislike),
+			'$like' => $like_e,
+			'$dislike' => $dikslike_e,
 			'$comments' => $comments,
 			'$paginate' => $paginate,
 		));
@@ -1588,16 +1652,25 @@ function photos_content(&$a) {
 				$twist = 'rotright';
 			$ext = $phototypes[$rr['type']];
 			
+			if($a->theme['template_engine'] === 'internal') {
+				$alt_e = template_escape($rr['filename']);
+				$name_e = template_escape($rr['album']);
+			}
+			else {
+				$alt_e = $rr['filename'];
+				$name_e = $rr['album'];
+			}
+
 			$photos[] = array(
 				'id'       => $rr['id'],
 				'twist'    => ' ' . $twist . rand(2,4),
 				'link'  	=> $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
 				'title' 	=> t('View Photo'),
 				'src'     	=> $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext,
-				'alt'     	=> template_escape($rr['filename']),
+				'alt'     	=> $alt_e,
 				'album'	=> array(
 					'link'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-					'name'  => template_escape($rr['album']),
+					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
 				
@@ -1606,7 +1679,13 @@ function photos_content(&$a) {
 	}
 	
 	$tpl = get_markup_template('photos_recent.tpl'); 
-	$o .= replace_macros($tpl,array(
+
+	$includes = array(
+		'$photo_top' => 'photo_top.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl,$includes + array(
 		'$title' => t('Recent Photos'),
 		'$can_post' => $can_post,
 		'$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
diff --git a/mod/poco.php b/mod/poco.php
index cb9abb340d..abe2c8e35d 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -147,7 +147,13 @@ function poco_init(&$a) {
 
 	if($format === 'xml') {
 		header('Content-type: text/xml');
-		echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
+
+		$includes = array(
+			'$poco_entry_xml' => 'poco_entry_xml.tpl'
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify($includes + array('$response' => $ret)));
 		http_status_exit(500);
 	}
 	if($format === 'json') {
@@ -159,4 +165,4 @@ function poco_init(&$a) {
 		http_status_exit(500);
 
 
-}
\ No newline at end of file
+}
diff --git a/mod/profile.php b/mod/profile.php
index 25871c2405..15a0224212 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,6 +33,7 @@ function profile_init(&$a) {
 		auto_redir($a, $which);
 	}
 
+	$a->theme["template_engine"] = 'internal'; // reset the template engine to the default in case the user's theme doesn't specify one
 	profile_load($a,$which,$profile);
 
 	$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index d1f77a3db4..cf99181465 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -313,8 +313,8 @@ function profile_photo_crop_ui_head(&$a, $ph){
 	$a->config['imagecrop'] = $hash;
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->config['imagecrop_ext'] = $ph->getExt();
-	$a->page['htmlhead'] .= get_markup_template("crophead.tpl");
-	$a->page['end'] .= get_markup_template("cropend.tpl");
+	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
+	$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
 	return;
 }}
 
diff --git a/mod/settings.php b/mod/settings.php
index 7cfdbb1cd5..09a45f832a 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -554,7 +554,13 @@ function settings_content(&$a) {
 		
 		if(($a->argc > 2) && ($a->argv[2] === 'add')) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Submit'),
@@ -580,7 +586,13 @@ function settings_content(&$a) {
 			$app = $r[0];
 			
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Update'),
@@ -663,12 +675,17 @@ function settings_content(&$a) {
 
 
 		$tpl = get_markup_template("settings_features.tpl");
-		$o .= replace_macros($tpl, array(
+
+		$includes = array(
+			'$field_yesno'	=> 'field_yesno.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($tpl, $includes + array(
 			'$form_security_token' => get_form_security_token("settings_features"),
 			'$title'	=> t('Additional Features'),
 			'$features' => $arr,
 			'$submit'   => t('Submit'),
-			'$field_yesno'	=> 'field_yesno.tpl',
 		));
 		return $o;
 	}
@@ -715,7 +732,17 @@ function settings_content(&$a) {
 			$mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
 		}
 	
-		$o .= replace_macros($tpl, array(
+
+		$includes = array(
+			'$field_checkbox' => 'field_checkbox.tpl',
+			'$field_input' => 'field_input.tpl',
+			'$field_select'	=> 'field_select.tpl',
+			'$field_custom' => 'field_custom.tpl',
+			'$field_password' => 'field_password.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($tpl, $includes + array(
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 			
 			'$title'	=> t('Connector Settings'),
@@ -805,7 +832,15 @@ function settings_content(&$a) {
 		}
 		
 		$tpl = get_markup_template("settings_display.tpl");
-		$o = replace_macros($tpl, array(
+
+		$includes = array(
+			'$field_themeselect' => 'field_themeselect.tpl',
+			'$field_checkbox' => 'field_checkbox.tpl',
+			'$field_input' => 'field_input.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o = replace_macros($tpl, $includes + array(
 			'$ptitle' 	=> t('Display Settings'),
 			'$form_security_token' => get_form_security_token("settings_display"),
 			'$submit' 	=> t('Submit'),
@@ -891,7 +926,13 @@ function settings_content(&$a) {
 
 
 	$pageset_tpl = get_markup_template('pagetypes.tpl');
-	$pagetype = replace_macros($pageset_tpl,array(
+
+	$includes = array(
+		'$field_radio' => 'field_radio.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$pagetype = replace_macros($pageset_tpl,$includes + array(
 		'$page_normal' 	=> array('page-flags', t('Normal Account Page'), PAGE_NORMAL, 
 									t('This account is a normal personal profile'), 
 									($a->user['page-flags'] == PAGE_NORMAL)),
@@ -1012,7 +1053,17 @@ function settings_content(&$a) {
 	require_once('include/group.php');
 	$group_select = mini_group_select(local_user(),$a->user['def_gid']);
 
-	$o .= replace_macros($stpl,array(
+	$includes = array(
+		'$field_password' => 'field_password.tpl',
+		'$field_input' => 'field_input.tpl',
+		'$field_custom' => 'field_custom.tpl',
+		'$field_checkbox' => 'field_checkbox.tpl',
+		'$field_yesno' => 'field_yesno.tpl',
+		'$field_intcheckbox' => 'field_intcheckbox.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($stpl,$includes + array(
 		'$ptitle' 	=> t('Account Settings'),
 
 		'$submit' 	=> t('Submit'),
diff --git a/mod/uimport.php b/mod/uimport.php
index 3f11023df2..d28198f69a 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -60,13 +60,19 @@ function uimport_content(&$a) {
 	
 	
     $tpl = get_markup_template("uimport.tpl");
-    return replace_macros($tpl, array(
+
+	$includes = array(
+		'$field_custom' => 'field_custom.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+    return replace_macros($tpl, $includes + array(
         '$regbutt' => t('Import'),
         '$import' => array(
             'title' => t("Move account"),
-            'text' => t("You can import an account from another Friendica server. 

-                            You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here.

-                            This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"),
+			'intro' => t("You can import an account from another Friendica server."),
+			'instruct' => t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
+			'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"),
             'field' => array('accountfile', t('Account file'),'', t('To export your accont, go to "Settings->Export your porsonal data" and select "Export account"')),
         ),  
     ));
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 8e261e7115..f54a76be4c 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -72,7 +72,13 @@ function viewcontacts_content(&$a) {
 
 
 	$tpl = get_markup_template("viewcontact_template.tpl");
-	$o .= replace_macros($tpl, array(
+
+	$includes = array(
+		'$contact_template' => 'contact_template.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl, $includes + array(
 		'$title' => t('View Contacts'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),
diff --git a/mod/xrd.php b/mod/xrd.php
index 2fa6bcd99b..7cfb643df1 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -28,7 +28,8 @@ function xrd_init(&$a) {
 	header("Content-type: text/xml");
 
 	if(get_config('system','diaspora_enabled')) {
-		$tpl = file_get_contents('view/xrd_diaspora.tpl');
+		//$tpl = file_get_contents('view/xrd_diaspora.tpl');
+		$tpl = get_markup_template('xrd_diaspora.tpl');
 		$dspr = replace_macros($tpl,array(
 			'$baseurl' => $a->get_baseurl(),
 			'$dspr_guid' => $r[0]['guid'],
@@ -38,7 +39,8 @@ function xrd_init(&$a) {
 	else
 		$dspr = '';
 
-	$tpl = file_get_contents('view/xrd_person.tpl');
+	//$tpl = file_get_contents('view/xrd_person.tpl');
+	$tpl = get_markup_template('xrd_person.tpl');
 
 	$o = replace_macros($tpl, array(
 		'$nick'        => $r[0]['nickname'],
diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py
new file mode 100755
index 0000000000..6037d04ea2
--- /dev/null
+++ b/mods/friendica-to-smarty-tpl.py
@@ -0,0 +1,198 @@
+#!/usr/bin/python
+#
+# Script to convert Friendica internal template files into Smarty template files
+# Copyright 2012 Zach Prezkuta
+# Licensed under GPL v3
+
+import os, re, string
+
+ldelim = '{{'
+rdelim = '}}'
+
+def fToSmarty(matches):
+	match = matches.group(0)
+	if match == '$j':
+		return match
+	match = string.replace(match, '[', '')
+	match = string.replace(match, ']', '')
+
+	ldel = ldelim
+	rdel = rdelim
+	if match.find("'") > -1:
+		match = string.replace(match, "'", '')
+		ldel = "'" + ldel
+		rdel = rdel + "'"
+	elif match.find('"') > -1:
+		match = string.replace(match, '"', '')
+		ldel = '"' + ldel
+		rdel = rdel + '"'
+
+	return ldel + match + rdel
+
+
+def fix_element(element):
+	# Much of the positioning here is important, e.g. if you do element.find('if ') before you do
+	# element.find('endif'), then you may get some multiply-replaced delimiters
+
+	if element.find('endif') > -1:
+		element = ldelim + '/if' + rdelim
+		return element
+
+	if element.find('if ') > -1:
+		element = string.replace(element, '{{ if', ldelim + 'if')
+		element = string.replace(element, '{{if', ldelim + 'if')
+		element = string.replace(element, ' }}', rdelim)
+		element = string.replace(element, '}}', rdelim)
+		return element
+
+	if element.find('else') > -1:
+		element = ldelim + 'else' + rdelim
+		return element
+
+	if element.find('endfor') > -1:
+		element = ldelim + '/foreach' + rdelim
+		return element
+
+	if element.find('for ') > -1:
+		element = string.replace(element, '{{ for ', ldelim + 'foreach ')
+		element = string.replace(element, '{{for ', ldelim + 'foreach ')
+		element = string.replace(element, ' }}', rdelim)
+		element = string.replace(element, '}}', rdelim)
+		return element
+
+	if element.find('endinc') > -1:
+		element = ''
+		return element
+
+	if element.find('inc ') > -1:
+		parts = element.split(' ')
+		element = ldelim + 'include file="'
+
+		# We need to find the file name. It'll either be in parts[1] if the element was written as {{ inc file.tpl }}
+		# or it'll be in parts[2] if the element was written as {{inc file.tpl}}
+		if parts[0].find('inc') > -1:
+			first = 0
+		else:
+			first = 1
+
+		if parts[first+1][0] == '$':
+			# This takes care of elements where the filename is a variable, e.g. {{ inc $file }}
+			element += 'file:' + ldelim + parts[first+1].rstrip('}') + rdelim
+		else:
+			# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
+			element += parts[first+1].rstrip('}') 
+
+		element += '"'
+
+		if len(parts) > first + 1 and parts[first+2] == 'with':
+			# Take care of variable substitutions, e.g. {{ inc file.tpl with $var=this_var }}
+			element += ' ' + parts[first+3].rstrip('}')[1:]
+
+		element += rdelim
+		return element
+
+
+def convert(filename, tofilename, php_tpl):
+	for line in filename:
+		newline = ''
+		st_pos = 0
+		brack_pos = line.find('{{')
+
+		if php_tpl:
+			# If php_tpl is True, this script will only convert variables in quotes, like '$variable'
+			# or "$variable". This is for .tpl files that produce PHP scripts, where you don't want
+			# all the PHP variables converted into Smarty variables
+			pattern1 = re.compile(r"""
+([\'\"]\$\[[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+\][\'\"])
+""", re.VERBOSE)
+			pattern2 = re.compile(r"""
+([\'\"]\$[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+[\'\"])
+""", re.VERBOSE)
+		else:
+			# Compile the pattern for bracket-style variables, e.g. $[variable.key|filter:arg1:arg2|filter2:arg1:arg2]
+			# Note that dashes are only allowed in array keys if the key doesn't start
+			# with a number, e.g. $[variable.key-id] is ok but $[variable.12-id] isn't
+			#
+			# Doesn't currently process the argument position key 'x', i.e. filter:arg1:x:arg2 doesn't get
+			# changed to arg1|filter:variable:arg2 like Smarty requires
+			#
+			# Filter arguments can be variables, e.g. $variable, but currently can't have array keys with dashes
+			# like filter:$variable.key-name
+			pattern1 = re.compile(r"""
+(\$\[[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+\])
+""", re.VERBOSE)
+
+			# Compile the pattern for normal style variables, e.g. $variable.key
+			pattern2 = re.compile(r"""
+(\$[a-zA-Z]\w*
+(\.
+(\d+|[a-zA-Z][\w-]*)
+)*
+(\|[\w\$:\.]*)*
+)
+""", re.VERBOSE)
+
+		while brack_pos > -1:
+			if brack_pos > st_pos:
+				line_segment = line[st_pos:brack_pos]
+				line_segment = pattern2.sub(fToSmarty, line_segment)
+				newline += pattern1.sub(fToSmarty, line_segment)
+
+			end_brack_pos = line.find('}}', brack_pos)
+			if end_brack_pos < 0:
+				print "Error: no matching bracket found"
+
+			newline += fix_element(line[brack_pos:end_brack_pos + 2])
+			st_pos = end_brack_pos + 2
+
+			brack_pos = line.find('{{', st_pos)
+
+		line_segment = line[st_pos:]
+		line_segment = pattern2.sub(fToSmarty, line_segment)
+		newline += pattern1.sub(fToSmarty, line_segment)
+		newline = newline.replace("{#", ldelim + "*")
+		newline = newline.replace("#}", "*" + rdelim)
+		tofilename.write(newline)
+
+
+path = raw_input('Path to template folder to convert: ')
+if path[-1:] != '/':
+	path = path + '/'
+
+outpath = path + 'smarty3/'
+
+if not os.path.exists(outpath):
+	os.makedirs(outpath)
+
+files = os.listdir(path)
+for a_file in files:
+	if a_file == 'htconfig.tpl':
+		php_tpl = True
+	else:
+		php_tpl = False
+
+	filename = os.path.join(path,a_file)
+	ext = a_file.split('.')[-1]
+	if os.path.isfile(filename) and ext == 'tpl':
+		with open(filename, 'r') as f:
+			newfilename = os.path.join(outpath,a_file)
+			with open(newfilename, 'w') as outf:
+				print "Converting " + filename + " to " + newfilename
+				convert(f, outf, php_tpl)
+
+
diff --git a/object/Item.php b/object/Item.php
index 0c84146f9b..4da5b8a59f 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -216,6 +216,23 @@ class Item extends BaseObject {
 
         list($categories, $folders) = get_cats_and_terms($item);
 
+		if($a->theme['template_engine'] === 'internal') {
+			$body_e = template_escape($body);
+			$text_e = strip_tags(template_escape($body));
+			$name_e = template_escape($profile_name);
+			$title_e = template_escape($item['title']);
+			$location_e = template_escape($location);
+			$owner_name_e = template_escape($this->get_owner_name());
+		}
+		else {
+			$body_e = $body;
+			$text_e = strip_tags($body);
+			$name_e = $profile_name;
+			$title_e = $item['title'];
+			$location_e = $location;
+			$owner_name_e = $this->get_owner_name();
+		}
+
 		$tmp_item = array(
 			'template' => $this->get_template(),
 			
@@ -229,8 +246,8 @@ class Item extends BaseObject {
 			'has_folders' => ((count($folders)) ? 'true' : ''),
             'categories' => $categories,
             'folders' => $folders,            
-			'body' => template_escape($body),
-			'text' => strip_tags(template_escape($body)),
+			'body' => $body_e,
+			'text' => $text_e,
 			'id' => $this->get_id(),
 			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
@@ -240,20 +257,20 @@ class Item extends BaseObject {
 			'vwall' => t('via Wall-To-Wall:'),
 			'profile_url' => $profile_link,
 			'item_photo_menu' => item_photo_menu($item),
-			'name' => template_escape($profile_name),
+			'name' => $name_e,
 			'thumb' => $profile_avatar,
 			'osparkle' => $osparkle,
 			'sparkle' => $sparkle,
-			'title' => template_escape($item['title']),
+			'title' => $title_e,
 			'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 			'lock' => $lock,
-			'location' => template_escape($location),
+			'location' => $location_e,
 			'indent' => $indent,
 			'shiny' => $shiny,
 			'owner_url' => $this->get_owner_url(),
 			'owner_photo' => $this->get_owner_photo(),
-			'owner_name' => template_escape($this->get_owner_name()),
+			'owner_name' => $owner_name_e,
 			'plink' => get_plink($item),
 			'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
 			'isstarred' => $isstarred,
@@ -268,6 +285,7 @@ class Item extends BaseObject {
 			'comment' => $this->get_comment_box($indent),
 			'previewing' => ($conv->is_preview() ? ' preview ' : ''),
 			'wait' => t('Please wait'),
+			'remove' => t('remove'),
 			'thread_level' => $thread_level
 		);
 
@@ -467,11 +485,20 @@ class Item extends BaseObject {
 	 * Set template
 	 */
 	private function set_template($name) {
+		$a = get_app();
+
 		if(!x($this->available_templates, $name)) {
 			logger('[ERROR] Item::set_template : Template not available ("'. $name .'").', LOGGER_DEBUG);
 			return false;
 		}
-		$this->template = $this->available_templates[$name];
+
+		if($a->theme['template_engine'] === 'smarty3') {
+			$template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
+		}
+		else {
+			$template_file = $this->available_templates[$name];
+		}
+		$this->template = $template_file;
 	}
 
 	/**
diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl
index b777cf4201..db1b00c112 100644
--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
@@ -4,9 +4,9 @@
 	

     
 
-	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$debugging }}{{ endinc }}
+	{{ inc $field_input with $field=$logfile }}{{ endinc }}
+	{{ inc $field_select with $field=$loglevel }}{{ endinc }}
 	
 	

 	
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl
index 874c6e6267..844cbad272 100644
--- a/view/admin_remoteupdate.tpl
+++ b/view/admin_remoteupdate.tpl
@@ -84,10 +84,10 @@
 		
Your friendica installation is not writable by web server.

 		{{ if $canftp }}
 			
You can try to update via FTP

-			{{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
-			{{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
-			{{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
+			{{ inc $field_input with $field=$ftphost }}{{ endinc }}
+			{{ inc $field_input with $field=$ftppath }}{{ endinc }}
+			{{ inc $field_input with $field=$ftpuser }}{{ endinc }}
+			{{ inc $field_password with $field=$ftppwd }}{{ endinc }}
 			

 		{{ endif }}
 	{{ endif }}
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 11122cb474..16f5b580de 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -41,55 +41,55 @@
 	
     
 
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+	{{ inc $field_input with $field=$sitename }}{{ endinc }}
+	{{ inc $field_textarea with $field=$banner }}{{ endinc }}
+	{{ inc $field_select with $field=$language }}{{ endinc }}
+	{{ inc $field_select with $field=$theme }}{{ endinc }}
+	{{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
+	{{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
 	
 	

 	
 	
$registration

-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
+	{{ inc $field_input with $field=$register_text }}{{ endinc }}
+	{{ inc $field_select with $field=$register_policy }}{{ endinc }}
+	{{ inc $field_input with $field=$daily_registrations }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
 	
 	

 
 	
$upload

-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
+	{{ inc $field_input with $field=$maximagesize }}{{ endinc }}
+	{{ inc $field_input with $field=$maximagelength }}{{ endinc }}
+	{{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
 	
 	
$corporate

-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
+	{{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
+	{{ inc $field_input with $field=$allowed_email }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
+	{{ inc $field_input with $field=$global_directory }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
 	
 	

 	
 	
$advanced

-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
+	{{ inc $field_input with $field=$proxy }}{{ endinc }}
+	{{ inc $field_input with $field=$proxyuser }}{{ endinc }}
+	{{ inc $field_input with $field=$timeout }}{{ endinc }}
+	{{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
+	{{ inc $field_input with $field=$poll_interval }}{{ endinc }}
+	{{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
+	{{ inc $field_input with $field=$abandon_days }}{{ endinc }}
 	
 	

 	
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
index 0ea7eb13b7..1cabd295da 100644
--- a/view/api_friends_xml.tpl
+++ b/view/api_friends_xml.tpl
@@ -1,5 +1,7 @@
+
+
 
-	{{for $users as $user }}
-	{{inc api_user_xml.tpl }}{{endinc}}
+	{{for $users as $u }}
+	{{inc $api_user_xml with $user=$u }}{{endinc}}
 	{{endfor}}
 
diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl
index 4a32b411b5..df55d807ad 100644
--- a/view/api_timeline_xml.tpl
+++ b/view/api_timeline_xml.tpl
@@ -10,7 +10,7 @@
   $status.in_reply_to_screen_name
   $status.geo
   $status.favorited
-{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  $status.statusnet_html
+{{ inc $api_user_xml with $user=$status.user }}{{ endinc }}  $status.statusnet_html
   $status.statusnet_conversation_id
   $status.url
   $status.coordinates
diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..082efc7458
--- /dev/null
+++ b/view/ca/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da {{$username}},
+
+	'{{$from}}' ha comentat un element/conversació que estàs seguint.
+
+-----
+{{$body}}
+-----
+
+Accedeix a {{$siteurl}} per a veure la conversa completa:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..6958365209
--- /dev/null
+++ b/view/ca/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da {{$myname}},
+
+Tens un nou seguidor en {{$sitename}} -  '{{$requestor}}'.
+
+Pots visitar el seu perfil en {{$url}}.
+
+Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}} 
diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..58bd14fea0
--- /dev/null
+++ b/view/ca/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da {{$username}},
+
+	Grans noticies... '{{$fn}}' a '{{$dfrn_url}}' ha acceptat la teva sol·licitud de connexió en '{{$sitename}}'.
+
+Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic
+sense cap restricció.
+
+Visita la teva pàgina de 'Contactes' en {{$sitename}} si desitja realizar qualsevol canvi en aquesta relació.
+
+{{$siteurl}}
+
+[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general 
+- i assignar drets de visualització a '{{$fn}}'].
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..c0fa7b3e09
--- /dev/null
+++ b/view/ca/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Meva Xarxa d'Amics";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..bc26e3eb1b
--- /dev/null
+++ b/view/ca/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Apreciat/da {{$username}},
+
+	'{{$fn}}' en '{{$dfrn_url}}' ha acceptat la teva petició
+connexió a '{{$sitename}}'.
+
+	'{{$fn}}' ha optat per acceptar-te com a "fan", que restringeix certes 
+formes de comunicació, com missatges privats i algunes interaccions 
+amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, 
+aquests ajustos s'aplican automàticament 
+
+	'{{$fn}}' pot optar per extendre aixó en una relació més permisiva
+en el futur.
+
+	Començaràs a rebre les actualizacions públiques de estatus de '{{$fn}}', 
+que apareixeran a la teva pàgina "Xarxa" en
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..469c429da4
--- /dev/null
+++ b/view/ca/smarty3/lostpass_eml.tpl
@@ -0,0 +1,35 @@
+
+Apreciat/da {{$username}},
+	
+	S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir
+la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de
+verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador.
+
+Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora
+i/o elimina aquest missatge.
+
+La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui
+va emetre aquesta sol·licitud.
+
+Segueix aquest enllaç per verificar la teva identitat:
+
+{{$reset_link}}
+
+A continuació rebràs un missatge amb la nova contrasenya.
+
+Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de
+configuració.
+
+Les dades d'accés són els següents:
+
+
+Lloc:	{{$siteurl}}
+Nom:	{{$email}}
+
+
+
+
+Salutacions,
+	L'administració de {{$sitename}}
+
+ 
diff --git a/view/ca/smarty3/mail_received_html_body_eml.tpl b/view/ca/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..d3c9d7b853
--- /dev/null
+++ b/view/ca/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Mensaje de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Accedeix a {{$siteurl}} per a llegir i respondre als teus missatges privats.
{{$siteName}}

+
+
diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..a3fa3cd381
--- /dev/null
+++ b/view/ca/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Accedeix a {{$siteurl}} per a llegir i respondre als teus missatges privats.
+
+	{{$siteName}}
diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..f0d62d9a1c
--- /dev/null
+++ b/view/ca/smarty3/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Apreciat/da {{$username}},
+
+    La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació
+(o canvía immediatament la contrasenya amb quelcom que recordis).
+
+
+Les teves dades d'accés son les següents:
+
+Lloc:	{{$siteurl}}
+Nom:	{{$email}}
+Contrasenya:	{{$new_password}}
+
+Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil.
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..7da9a2b888
--- /dev/null
+++ b/view/ca/smarty3/register_open_eml.tpl
@@ -0,0 +1,22 @@
+
+Apreciat/da {{$username}},
+
+	Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat.
+
+
+Les dades d'accés són les següents:
+
+
+Lloc:	{{$siteurl}}
+Nom:	{{$email}}
+Contrasenya:	{{$password}}
+
+
+Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració".
+
+Pren un moment per revisar les altres configuracions del compte en aquesta pàgina.
+
+
+Gràcies i benvingut/da {{$sitename}}.
+
+ 
diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..651e8eff78
--- /dev/null
+++ b/view/ca/smarty3/register_verify_eml.tpl
@@ -0,0 +1,23 @@
+
+S'ha rebut la sol·licitud de registre d'un nou usuari en
+{{$sitename}} que requereix la teva aprovació.
+
+Les dades d'accés són els següents:
+
+Nom Complet: {{$username}}
+Lloc: {{$siteurl}}
+Nom: {{$email}}
+
+
+Per aprovar aquesta sol·licitud, visita el següent enllaç:
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+Per denegar la sol·licitud i eliminar el compte, per favor visita:
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Gràcies.
+
+
diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..18dc3ef0d4
--- /dev/null
+++ b/view/ca/smarty3/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Apreciat/da {{$myname}},
+
+Acabes de rebre una sol·licitud de connexió de '{{$requestor}}' en {{$sitename}}.
+
+Pots visitar el seu perfil en {{$url}}.
+
+Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..cd75464416
--- /dev/null
+++ b/view/ca/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Apreciat/da {{$username}},
+
+	'{{$from}}' ha escrit quelcom en el mur del teu perfil.
+
+-----
+{{$body}}
+-----
+
+Accedeix a  {{$siteurl}} per a veure o esborrar l'element:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index c68ca7f1db..a11e252b4a 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -65,7 +65,7 @@
 	{{ endif }}
 	

 
-	{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+	{{inc $field_checkbox with $field=$hidden }}{{endinc}}
 
 

 
$lbl_info1

diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
index ecb342bf44..efd426bba3 100644
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
@@ -14,8 +14,8 @@
 $tabs
 
 
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
+{{ for $contacts as $c }}
+	{{ inc $contact_template with $contact=$c }}{{ endinc }}
 {{ endfor }}
 

 
diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..baa7c180a3
--- /dev/null
+++ b/view/cs/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na {{$siteurl}} pro zobrazení kompletní konverzace:
+
+{{$display}}
+
+Díky,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..867e63332d
--- /dev/null
+++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica zpráva
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} okomentoval položku/konverzaci, kterou následujete.
{{$from}}
{{$body}}
Přihlaste se na pro zobrazení kompletní konverzace.
Díky,
{{$sitename}} administrátor

+
+
diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..baa7c180a3
--- /dev/null
+++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' okommentoval položku/konverzaci, kterou následujete.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na {{$siteurl}} pro zobrazení kompletní konverzace:
+
+{{$display}}
+
+Díky,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..1430e83118
--- /dev/null
+++ b/view/cs/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Milý/Milá {{$username}},
+
+Máte nového následovatele na {{$sitename}} -  '{{$requestor}}'.
+
+Můžete si prohlédnout jeho/její profil na {{$url}}.
+
+Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti.
+
+{{$siteurl}}
+
+S pozdravem,
+
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..fc953b76cd
--- /dev/null
+++ b/view/cs/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,17 @@
+
+Milý/Milá {{$username}},
+
+        Skvělé zprávy... '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'.
+
+Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení.
+
+Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na {{$sitename}}.
+
+{{$siteurl}}
+
+(Nyní můžete například vytvořit separátní profil s informacemi, které nebudou viditelné veřejně, a nastavit právo pro zobrazení tohoto profilu pro '{{$fn}}').
+
+S pozdravem,
+
+        {{$sitename}} administrátor
+
diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..c9baae798f
--- /dev/null
+++ b/view/cs/smarty3/htconfig.tpl
@@ -0,0 +1,73 @@
+path na 'adresar/podadresar'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Vyberte platnou defaultní časovou zónu. Pokud si nejste jistí, použijte use "Europe/Prague".
+// Toto nastavení lze změnit i později a používá se pouze pro časové značky anonymních čtenářů.
+
+$default_timezone = '{{$timezone}}';
+
+// Jak se jmenuje Váš web?
+
+$a->config['sitename'] = "Moje síť přátel";
+
+// Nastavení defaultního jazyka webu
+
+$a->config['system']['language'] = 'cs';
+
+// Vaše možnosti jsou REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Ujistěte se, že jste si vytvořili Váš osobníúčet dříve, než nastavíte 
+// REGISTER_CLOSED. 'register_text' (pokud je nastaven) se bude zobrazovat jako první text na 
+// registrační stránce. REGISTER_APPROVE vyžaduje aby byl nastaven 'admin_email'
+// na e-mailovou adresu již existující registrované osoby, která může autorizovat
+// a/nebo schvalovat/odmítat žádosti o registraci.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximální velikost importované zprávy, 0 je neomezeno
+
+$a->config['max_import_size'] = 200000;
+
+// maximální velikost nahrávaných fotografií
+
+$a->config['system']['maximagesize'] = 800000;
+
+// cesta k PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// URL adresy globálního adresáře.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - také zvaný jako  pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) je defaultně povolen. 
+// Šifrování bude zajištěno pouze pokud je toto nastaveno na true a
+// PHP mcrypt extension jsou nainstalována na obou systémech 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// defaultní systémové grafické téma
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+
diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..e770362faf
--- /dev/null
+++ b/view/cs/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,17 @@
+
+Milý/Milá {{$username}},
+
+
+	'{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'.
+
+	'{{$fn}}' Vás označil za svého "fanouška", což jistým způsobem omezuje komunikaci (například v oblasti soukromých zpráv a některých profilových interakcí. Pokud je toto celebritní nebo komunitní stránka, bylo toto nastavení byla přijato automaticky. 
+
+	'{{$fn}}' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní.
+
+	Nyní začnete dostávat veřejné aktualizace statusu od '{{$fn}}', které se objeví ve Vaší stránce "Síť" na webu
+
+{{$siteurl}}
+
+S pozdravem,
+
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..28f8517505
--- /dev/null
+++ b/view/cs/smarty3/lostpass_eml.tpl
@@ -0,0 +1,23 @@
+
+Milý/Milá {{$username}},
+	Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.  
+Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte.
+
+Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy.
+
+Klikněte na tento odkaz pro prověření Vaší identity:
+
+{{$reset_link}}
+
+Poté obdržíte další zprávu obsahující nové heslo.
+
+Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení.
+
+Přihlašovací údaje jsou tato:
+
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+
+S pozdravem,
+
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/mail_received_html_body_eml.tpl b/view/cs/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..b52abc3b1f
--- /dev/null
+++ b/view/cs/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Zpráva
+	
+
+
+
+	
+	
+
+        
+
+
+        
+                
+        
+        
+        
+        
+        
+        
+
Friendica
{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Přihlaste se na {{$siteurl}} pro čtení a zaslání odpovědí na Vaše soukromé zprávy.
Díky,
{{$siteName}} administrátor

+
+
diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..0b4c585cf9
--- /dev/null
+++ b/view/cs/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
+
+{{$title}}
+
+{{$textversion}}
+
+Přihlaste se na {{$siteurl}} pro čtení a zaslání odpovědí na Vaše soukromé zprávy.
+
+Díky,
+{{$siteName}} administrátor
diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..75db8ebbff
--- /dev/null
+++ b/view/cs/smarty3/passchanged_eml.tpl
@@ -0,0 +1,14 @@
+
+Milý/Milá {{$username}},
+        Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
+ 
+Vaše přihlašovací údaje jsou tato:
+
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+Heslo:	 	    {{$new_password}}
+
+Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte.
+
+S pozdravem,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..fa1f828c13
--- /dev/null
+++ b/view/cs/smarty3/register_open_eml.tpl
@@ -0,0 +1,23 @@
+Milý/milá {{$username}},
+	Díky za registraci na {{$sitename}}. Váš účet byl vytvořen.
+Vaše přihlašovací údaje jsou tato:
+
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+Heslo:		    {{$password}}
+
+Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte.
+
+Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce.
+
+Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt.
+
+Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. 
+
+Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. 
+Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. 
+
+Díky a vítejte na {{$sitename}}.
+
+S pozdravem,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..9186e7332a
--- /dev/null
+++ b/view/cs/smarty3/register_verify_eml.tpl
@@ -0,0 +1,22 @@
+
+Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.
+
+Přihlašovací údaje jsou tato:
+
+Celé jméno:	    {{$username}}
+Adresa webu:	    {{$siteurl}}
+Přihlašovací jméno: {{$email}}
+
+Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Díky.
diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..f120891e80
--- /dev/null
+++ b/view/cs/smarty3/request_notify_eml.tpl
@@ -0,0 +1,15 @@
+
+Milý/Milá {{$username}},
+
+Právě jste obdržel/obdržela požadavek na spojení na webu {{$sitename}} 
+
+od '{{$requestor}}'.
+
+Můžete navštívit jeho/její profil na následujícím odkazu {{$url}}.
+
+Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost.
+
+{{$siteurl}}
+
+S pozdravem,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..2578a4e7c6
--- /dev/null
+++ b/view/cs/smarty3/wall_received_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' obohatil Vaši profilovou zeď.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na  {{$siteurl}} k zobrazení nebo smazání této položky:
+
+{{$display}}
+
+Díky,
+        {{$sitename}} administrátor
diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl
new file mode 100644
index 0000000000..ebbc2a9e1e
--- /dev/null
+++ b/view/cs/smarty3/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Friendica zpráva
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
{{$from}} obohatil Vaši profilovou zeď.
{{$from}}
{{$body}}
Přihlaste se na {{$siteurl}} k zobrazení nebo smazání této položky.
Díky,
{{$sitename}} administrátor

+
+
diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl
new file mode 100644
index 0000000000..c8ac0216c3
--- /dev/null
+++ b/view/cs/smarty3/wall_received_text_body_eml.tpl
@@ -0,0 +1,14 @@
+Milý/Milá {{$username}},
+
+        '{{$from}}' obohatil Vaši profilovou zeď.
+
+-----
+{{$body}}
+-----
+
+Přihlaste se na  {{$siteurl}} k zobrazení nebo smazání této položky:
+
+{{$display}}
+
+Díky,
+	{{$sitename}} administrátor
diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..f902d96b4e
--- /dev/null
+++ b/view/de/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,17 @@
+
+Hallo {{$username}},
+
+'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
+
+-----
+{{$body}}
+-----
+
+Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an:
+
+{{$display}}
+
+Danke für die Aufmerksamkeit
+        {{$sitename}} Administrator
+ 
+
diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..b4b994c640
--- /dev/null
+++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Nachricht
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} hat einen Beitrag kommentiert dem du auch folgst.
{{$from}}
{{$body}}
Bitte melde dich an um die komplette Unterhaltung anzuzeigen.
Beste Grüße,
{{$sitename}} Administrator

+
+
diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..19f81a5e3a
--- /dev/null
+++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,16 @@
+Hallo {{$username}},
+
+'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst.
+
+-----
+{{$body}}
+-----
+
+Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an:
+
+{{$display}}
+
+Danke fŸr die Aufmerksamkeit
+        {{$sitename}} Administrator
+ 
+
diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..2fd04bb658
--- /dev/null
+++ b/view/de/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Hallo {{$myname}},
+
+Du hast einen neuen Anhänger auf {{$sitename}} -  '{{$requestor}}'.
+
+Du kannst das Profil unter {{$url}} besuchen.
+
+Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen.
+
+{{$siteurl}}
+
+beste Grüße,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..72234dc67b
--- /dev/null
+++ b/view/de/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Hallo {{$username}},
+
+	Großartige Neuigkeiten... '{{$fn}}' auf '{{$dfrn_url}}' hat 
+deine Kontaktanfrage auf '{{$sitename}}' bestätigt.
+
+Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
+ohne Einschränkungen austauschen.
+
+Rufe deine 'Kontakte' Seite auf {{$sitename}} auf, wenn du 
+Änderungen an diesem Kontakt vornehmen willst. 
+
+{{$siteurl}}
+
+[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält,
+die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '{{$fn}}' zum Betrachten freigeben].
+
+Beste Grüße,
+
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..75d6a77e89
--- /dev/null
+++ b/view/de/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..f5eaef66b5
--- /dev/null
+++ b/view/de/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Hallo {{$username}},
+
+	'{{$fn}}' auf '{{$dfrn_url}}' hat deine Verbindungsanfrage 
+auf '{{$sitename}}' akzeptiert.
+
+	'{{$fn}}' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen 
+Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil
+Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen
+automatisch angewandt.
+
+	'{{$fn}}' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende 
+Beziehung in der Zukunft erweitert wird. 
+
+	Du empfängst ab sofort die öffentlichen Beiträge von '{{$fn}}', 
+auf deiner "Netzwerk" Seite.  
+
+{{$siteurl}}
+
+Beste Grüße,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..a507afbda4
--- /dev/null
+++ b/view/de/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Hallo {{$username}},
+	Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines 
+Passworts empfangen. Um diese zu bestätigen folge bitte dem Link
+weiter unten oder kopiere ihn in die Adressleiste deines Browsers. 
+
+Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE
+bitte diese Mail und den Link. 
+
+Dein Passwort wird nicht geändert werden solange wir nicht überprüfen
+konnten, dass du die Anfrage gestellt hast. 
+
+Folge diesem Link um deine Identität zu verifizieren:
+
+{{$reset_link}}
+
+Du wirst eine weitere Email erhalten mit dem neuen Passwort.
+
+Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern.
+
+Die Login-Details sind die folgenden:
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+
+
+Grüße,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/mail_received_html_body_eml.tpl b/view/de/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..a769686103
--- /dev/null
+++ b/view/de/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,26 @@
+
+
+
+	Friendica Nachricht
+	
+
+
+
+	
+	
+
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$fromi}} hat dir eine private Nachricht auf {{$siteName}} gesendet.
{{$from}}
{{$title}}
{{$htmlversion}}
Bitte melde dich auf {{$siteurl}}/message an um die Nachricht zu bearbeiten.
Beste Grüße,
{{$siteName}} Administrator

+
+
diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..7daa6fbf90
--- /dev/null
+++ b/view/de/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,11 @@
+Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten.
+	
+{{$title}}
+
+{{$textversion}}
+
+Bitte melde dich unter {{$siteurl}} an um deine privaten Nachrichte zu lesen und zu
+beantworten.
+
+Viele Gr٤e,
+{{$siteName}} Administrator
diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..eb08c20b7e
--- /dev/null
+++ b/view/de/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Hallo {{$username}},
+	Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese 
+Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort 
+in etwas, was du dir merken kannst).
+
+
+Deine Login Daten wurden wie folgt geändert:
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+Passwort:	{{$new_password}}
+
+Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
+
+
+Beste Grüße,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..af0a0b9bb4
--- /dev/null
+++ b/view/de/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Hallo {{$username}},
+	Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. 
+Hier die Login Details:
+
+
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+Passwort:	{{$password}}
+
+Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, 
+nachdem du dich erstmalig eingeloggt hast.
+
+Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
+
+Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, 
+damit andere Leute dich einfacher finden können.
+
+Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
+sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und 
+vielleicht auch in welchen Land du lebst; falls du nicht konkreter
+werden möchtest.
+
+Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. 
+Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
+ein paar neue und interessante Freunde zu finden.  
+
+
+Danke und willkommen auf {{$sitename}}.
+
+Beste Grüße,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..78d4aa6b72
--- /dev/null
+++ b/view/de/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Eine Neuanmeldung auf {{$sitename}} benötigt 
+deine Aufmerksamkeit. 
+
+
+Die Login-Einzelheiten sind die folgenden:
+
+Kompletter Name:	{{$username}}
+Adresse der Seite:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+Um die Anfrage zu bestätigen besuche bitte:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Danke!
diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..de2182e9db
--- /dev/null
+++ b/view/de/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Hallo {{$myname}},
+
+du hast eine Kontaktanfrage von '{{$requestor}}' auf {{$sitename}} 
+
+erhalten.
+
+Du kannst sein/ihr Profil unter {{$url}} finden.
+
+Bitte melde dich an um die komplette Vorstellung einzusehen 
+und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
+
+{{$siteurl}}
+
+Beste Grüße,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..5b614709a7
--- /dev/null
+++ b/view/de/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hi, 
+ich bin {{$sitename}}.   
+Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, 
+aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.  
+Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen. 
+Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein. 
+
+Die Fehlermeldung lautet '{{$error}}'.   
+
+Tut mir Leid! 
+Deine friendica Instanz auf {{$siteurl}}
\ No newline at end of file
diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..e90d67261f
--- /dev/null
+++ b/view/de/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Hallo {{$username}},
+
+'{{$from}}' hat etwas auf deiner Profilwand gepostet.
+
+-----
+{{$body}}
+-----
+
+Bitte melde dich unter {{$siteurl}} an um den Eintrag anzusehen oder zu löschen.
+
+{{$display}}
+
+Besten Dank!
+        {{$sitename}} Administrator
+
+ 
+
diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl
new file mode 100644
index 0000000000..e6e7f27073
--- /dev/null
+++ b/view/de/smarty3/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Friendica Nachricht
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
{{$from}} hat etwas auf deine Pinnwand gepostet.
{{$from}}
{{$body}}
Bitte melde dich auf {{$siteurl}} an um den Eintrag anzusehen oder ihn zu löschen.
Beste Grüße,
{{$sitename}} Administrator

+
+
diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl
new file mode 100644
index 0000000000..f53dc6c9c3
--- /dev/null
+++ b/view/de/smarty3/wall_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Hallo {{$username}},
+
+        '{{$from}}' hat etwas auf deiner Pinnwand gepostet.
+
+-----
+{{$body}}
+-----
+
+Bitte melde dich auf {{$siteurl}} an um den Beitrag anzusehen oder ihn zu löschen:
+
+{{$display}}
+
+Besten Dank!
+    {{$sitename}} Administrator
+
+ 
+
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index b45da4465e..d496cb2add 100644
--- a/view/directory_item.tpl
+++ b/view/directory_item.tpl
@@ -2,7 +2,7 @@
 

 	
 
 		

-			$alt-text
+			$alt_text
 		

 	

 
diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..ba07b19dad
--- /dev/null
+++ b/view/en/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Dear {{$myname}},
+
+You have a new follower at {{$sitename}} -  '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+	{{$sitename}} administrator
diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..229b4fee86
--- /dev/null
+++ b/view/en/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+	Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted 
+your connection request at '{{$sitename}}'.
+
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
+
+Please visit your 'Contacts' page at {{$sitename}} if you wish to make 
+any changes to this relationship. 
+
+{{$siteurl}}
+
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
+
+Sincerely,
+
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..745bf03fe1
--- /dev/null
+++ b/view/en/smarty3/htconfig.tpl
@@ -0,0 +1,71 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
+// By default allow pseudonyms
+
+$a->config['system']['no_regfullname'] = true;
diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..c3bc4697ec
--- /dev/null
+++ b/view/en/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+	'{{$fn}}' at '{{$dfrn_url}}' has accepted 
+your connection request at '{{$sitename}}'.
+
+	'{{$fn}}' has chosen to accept you a "fan", which restricts 
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
+
+	'{{$fn}}' may choose to extend this into a two-way or more permissive 
+relationship in the future. 
+
+	You will start receiving public status updates from '{{$fn}}', 
+which will appear on your 'Network' page at  
+
+{{$siteurl}}
+
+Sincerely,
+
+	{{$sitename}} Administrator
diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..3b79d27910
--- /dev/null
+++ b/view/en/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Dear {{$username}},
+	A request was recently received at {{$sitename}} to reset your account 
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar. 
+
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email. 
+
+Your password will not be changed unless we can verify that you
+issued this request. 
+
+Follow this link to verify your identity:
+
+{{$reset_link}}
+
+You will then receive a follow-up message containing the new password.
+
+You may change that password from your account settings page after logging in.
+
+The login details are as follows:
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+
+
+Sincerely,
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..0d94be3c2b
--- /dev/null
+++ b/view/en/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Dear {{$username}},
+	Your password has been changed as requested. Please retain this 
+information for your records (or change your password immediately to 
+something that you will remember).
+
+
+Your login details are as follows:
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$new_password}}
+
+You may change that password from your account settings page after logging in.
+
+
+Sincerely,
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..bfc1082bfb
--- /dev/null
+++ b/view/en/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Dear {{$username}},
+	Thank you for registering at {{$sitename}}. Your account has been created. 
+The login details are as follows:
+
+
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+Password:	{{$password}}
+
+You may change your password from your account "Settings" page after logging 
+in.
+
+Please take a few moments to review the other account settings on that page.
+
+You may also wish to add some basic information to your default profile 
+(on the "Profiles" page) so that other people can easily find you.
+
+We recommend setting your full name, adding a profile photo,
+adding some profile "keywords" (very useful in making new friends) - and 
+perhaps what country you live in; if you do not wish to be more specific
+than that.
+
+We fully respect your right to privacy, and none of these items are necessary. 
+If you are new and do not know anybody here, they may help
+you to make some new and interesting friends.  
+
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+	{{$sitename}} Administrator
+
+ 
diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..dbdd1a997d
--- /dev/null
+++ b/view/en/smarty3/register_verify_eml.tpl
@@ -0,0 +1,26 @@
+
+A new user registration request was received at {{$sitename}} which requires 
+your approval. 
+
+
+The login details are as follows:
+
+Full Name:	{{$username}}
+Site Location:	{{$siteurl}}
+Login Name:	{{$email}}
+
+
+To approve this request please visit the following link:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+To deny the request and remove the account, please visit:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
+
diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..d01b8ff276
--- /dev/null
+++ b/view/en/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Dear {{$myname}},
+
+You have just received a connection request at {{$sitename}} 
+
+from '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to view the complete introduction 
+and approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+	{{$sitename}} administrator
diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..a0983b6b90
--- /dev/null
+++ b/view/en/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hey, 
+I'm {{$sitename}};   
+The friendica developers released update {{$update}} recently, 
+but when I tried to install it, something went terribly wrong.  
+This needs to be fixed soon and I can't do it alone. Please contact a 
+friendica developer if you can not help me on your own. My database might be invalid. 
+
+The error message is '{{$error}}'.   
+
+I'm sorry, 
+your friendica server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..dd313c1f75
--- /dev/null
+++ b/view/eo/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Kara {{$myname}},
+
+Vi havas novan abonanton ĉe {{$sitename}} -  '{{$requestor}}'.
+
+Vi povas viziti ilian profilon ĉe {{$url}}.
+
+Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton.
+
+{{$siteurl}}
+
+Salutoj,
+
+	[{{$sitename}}] administranto
\ No newline at end of file
diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..2987a8dc57
--- /dev/null
+++ b/view/eo/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Kara {{$username}},
+
+	Boegaj novaĵoj.... '{{$fn}}' ĉe '{{$dfrn_url}}' aprobis 
+vian kontaktpeton ĉe '{{$sitename}}'.
+
+Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn
+senkatene.
+
+Bonvolu viziti vian 'Kontaktoj' paĝon ĉe {{$sitename}} se vi volas 
+ŝangi la rilaton. 
+
+{{$siteurl}}
+
+[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne
+haveblas al la komuna publiko - kaj rajtigi '{{$fn}}' al ĝi]'
+
+Salutoj,
+
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..eab7623a40
--- /dev/null
+++ b/view/eo/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Kara {{$username}},
+
+	'{{$fn}}' ĉe '{{$dfrn_url}}' akceptis 
+vian kontaktpeton ĉe '{{$sitename}}'.
+
+	'{{$fn}}' elektis vin kiel "admiranto", kio malpermesas 
+kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj
+agoj. Se tio estas konto de komunumo aÅ­ de eminentulo, tiaj agordoj
+aŭtomate aktiviĝis.
+
+	'{{$fn}}' eblas konverti la rilaton al ambaÅ­direkta rilato 
+aÅ­ apliki pli da permesoj. 
+
+	Vi ekricevos publikajn afiŝojn de '{{$fn}}', 
+kiuj aperos sur via 'Reto' paĝo ĉe  
+
+{{$siteurl}}
+
+Salutoj,
+
+	{{$sitename}} administranto
\ No newline at end of file
diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..ddde9fe514
--- /dev/null
+++ b/view/eo/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Kara {{$username}},
+	{{$sitename}} ricevis peton por rekomencigi vian pasvorton. 
+Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon 
+aŭ alglui ĝin en la adreskampo de via retumilo. 
+
+Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la 
+sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. 
+
+Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi
+kiu petis la ŝanĝon. 
+
+Sekvu ĉi tion ligilon por konfirmi vian identecon:
+
+{{$reset_link}}
+
+Poste, vi ricevos mesaĝon enhavonte la novan pasvorton.
+
+Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti.
+
+La akreditaĵoj estas:
+
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+
+
+
+
+Salutoj,
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..173828d561
--- /dev/null
+++ b/view/eo/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Kara {{$username}},
+	Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun 
+informon (aŭ tuj ŝanĝu vian pasvorton al 
+iu kiun vi povas memori).
+
+
+Jen viaj legitimaĵoj:
+
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+Pasvorto:»{{$new_password}}
+
+Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
+
+
+Salutoj,
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..84fc9ad908
--- /dev/null
+++ b/view/eo/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Kara {{$username}},
+	Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. 
+Jen viaj legitimaĵoj:
+
+
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+Pasvorto:»{{$password}}
+
+Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas  
+ensalutita.
+
+Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn.
+
+Eble vi volas aldoni kelkajn bazajn informojn al via profilo 
+(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj.
+
+Ni rekomendas agordi vian plenan noman, aldoni profilbildon,
+kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj 
+eble en kiu lando vi loĝas, se vi ne volas pli specifa
+ol tio.
+
+Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. 
+Se vi novas kaj ne konas iun ĉi tie, ili eble helpas 
+vin trovi novajn kaj interesajn amikojn.  
+
+
+Dankon kaj bonvenon ĉe {{$sitename}}.
+
+Salutoj,
+	{{$sitename}} administranto
+
+ 
\ No newline at end of file
diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..4e960b9168
--- /dev/null
+++ b/view/eo/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Nova peto por registrado atendas ĉe {{$sitename}} 
+kaj bezonas vian aprobon. 
+
+
+Jen la detaloj de la peto:
+
+Plena Nomo:»{{$username}}
+Retejo:»{{$siteurl}}
+Salutnomo:»{{$email}}
+
+
+Aprobonte la peton, bonvolu klaki tiun ligilon:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Malaprobonte kaj forviŝonte la konton, bonvolu klaki:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Dankon!
diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..d026ba66e3
--- /dev/null
+++ b/view/eo/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Kara {{$myname}},
+
+Vi ĵus ricevis kontaktpeton ĉe {{$sitename}} 
+
+de '{{$requestor}}'.
+
+Vi eblas viziti la profilon de la petanto ĉe {{$url}}.
+
+Bonvolu ensaluti en la retejo por vidi la plenan prezenton 
+kaj aprobi aÅ­ ignori/nuligi la peton.
+
+{{$siteurl}}
+
+Salutoj,
+
+	{{$sitename}} administranto
\ No newline at end of file
diff --git a/view/eo/smarty3/update_fail_eml.tpl b/view/eo/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..4b7f240f91
--- /dev/null
+++ b/view/eo/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Saluton! 
+Mi estas {{$sitename}}.   
+La programistoj de Frienda eldonis ĝisdatigon {{$update}} antaŭ ne longe, 
+sed kiam mi provis instali ĝin, io terure malsukcesis.  
+Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti 
+Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas. 
+
+La erarmesaĝo estas '{{$error}}'.   
+
+Mi bedaÅ­ras, 
+via Friendica servilo ĉe {{$siteurl}}
\ No newline at end of file
diff --git a/view/es/smarty3/cmnt_received_eml.tpl b/view/es/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..d78eae2179
--- /dev/null
+++ b/view/es/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Estimado/a {{$username}},
+
+	'{{$from}}' ha comentado un elemento/conversación que estás siguiendo.
+
+-----
+{{$body}}
+-----
+
+Accede a {{$siteurl}} para ver la conversación completa:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..86e09003ad
--- /dev/null
+++ b/view/es/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Estimado/a {{$myname}},
+
+Tienes un nuevo seguidor en {{$sitename}} -  '{{$requestor}}'.
+
+Puedes visitar su perfil en {{$url}}.
+
+Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}} 
diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..be3c817771
--- /dev/null
+++ b/view/es/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,19 @@
+
+Estimado/a {{$username}},
+
+	Grandes noticias... '{{$fn}}' a '{{$dfrn_url}}' ha aceptado tu solicitud de conexión en '{{$sitename}}'.
+
+Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico
+sin restricción alguna.
+
+Visita tu página de 'Contactos' en {{$sitename}} si desear realizar cualquier cambio en esta relación.
+
+{{$siteurl}}
+
+[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general 
+- y asignar derechos de visualización a '{{$fn}}'].
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/es/smarty3/htconfig.tpl b/view/es/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..5696245c77
--- /dev/null
+++ b/view/es/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Mia Rete di Amici";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..3add926fe5
--- /dev/null
+++ b/view/es/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,21 @@
+
+Estimado/a {{$username}},
+
+	'{{$fn}}' en '{{$dfrn_url}}' ha aceptado tu petición
+conexión a '{{$sitename}}'.
+
+	'{{$fn}}' ha optado por aceptarte come "fan", que restringe ciertas 
+formas de comunicación, como mensajes privados y algunas interacciones 
+con el perfil. Si eres una "celebridad" o una página de comunidad, 
+estos ajustes se aplican automáticamente 
+
+	'{{$fn}}' puede optar por extender esto en una relación más permisiva
+en el futuro.
+
+	Empezarás a recibir las actualizaciones públicas de estado de '{{$fn}}', 
+que aparecerán en tu página "Red" en
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..41545bf2d6
--- /dev/null
+++ b/view/es/smarty3/lostpass_eml.tpl
@@ -0,0 +1,34 @@
+
+Estimado/a {{$username}},
+	
+	Se ha recibido una solicitud en {{$sitename}} recientemente para restablecer
+tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de
+verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador.
+
+Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora
+y/o elimina este mensaje.
+
+Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien
+emitió esta solicitud.
+
+Sigue este enlace para verificar tu identidad:
+
+{{$reset_link}}
+
+A continuación recibirás un mensaje con la nueva contraseña.
+
+Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de 
+configuración.
+
+Los datos de acceso son los siguientes:
+
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+
+
+
+
+Saludos,
+	La administración de {{$sitename}}
+
+ 
diff --git a/view/es/smarty3/mail_received_html_body_eml.tpl b/view/es/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..4f80df28fc
--- /dev/null
+++ b/view/es/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Mensaje de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Accede a {{$siteurl}} para leer y responder a tus mensajes privados.
{{$siteName}}

+
+
diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..22b77b7246
--- /dev/null
+++ b/view/es/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,9 @@
+Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Accede a {{$siteurl}} para leer y responder a tus mensajes privados.
+
+	{{$siteName}}
diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..eb93eb369e
--- /dev/null
+++ b/view/es/smarty3/passchanged_eml.tpl
@@ -0,0 +1,19 @@
+
+Estimado/a {{$username}},
+
+    Tu contraseña ha sido modificada como has solicitado. Anota esta información
+(o cambia inmediatamente la contraseña con algo que recuerdes).
+
+
+Tus datos de acceso son los siguientes:
+
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+Contraseña:	{{$new_password}}
+
+Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
+
+
+	{{$sitename}}
+
+ 
diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..c65b13497c
--- /dev/null
+++ b/view/es/smarty3/register_open_eml.tpl
@@ -0,0 +1,21 @@
+
+Estimado/a {{$username}},
+
+    Gracias por registrarte en {{$sitename}}. Tu cuenta ha sido creada.
+
+
+Los datos de acceso son los siguientes:
+
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+Contraseña:	{{$password}}
+
+
+Después de acceder puedes cambiar tu contraseña en la página de "Configuración".
+
+Toma un momento para revisar las otras configuraciones de la cuenta en esa página.
+
+
+Gracias y bienvenido/a {{$sitename}}.
+
+ 
diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..10c35863e6
--- /dev/null
+++ b/view/es/smarty3/register_verify_eml.tpl
@@ -0,0 +1,22 @@
+
+Se ha recibido la solicitud de registro de un nuevo usuario en
+{{$sitename}} que requiere tu aprobación.
+
+Los datos de acceso son los siguientes:
+
+Nombre Completo:	{{$username}}
+Sitio:	{{$siteurl}}
+Nombre:	{{$email}}
+
+
+Para aprobar esta solicitud, visita el siguiente enlace:
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+Para denegar la solicitud y eliminar la cuenta, por favor visita:
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Gracias.
+
diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..cb787a8a69
--- /dev/null
+++ b/view/es/smarty3/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+
+Estimado/a {{$myname}},
+
+Acabas de recibir una solicitud de conexión de '{{$requestor}}' en {{$sitename}}.
+
+Puedes visitar su perfil en {{$url}}.
+
+Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud.
+
+{{$siteurl}}
+
+
+	{{$sitename}}
diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..8f495d9efa
--- /dev/null
+++ b/view/es/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Estimado/a {{$username}},
+
+	'{{$from}}' ha escrito algo en el muro de tu perfil.
+
+-----
+{{$body}}
+-----
+
+Accede a  {{$siteurl}} para ver o borrar el elemento:
+
+{{$display}}
+
+
+	{{$sitename}}
+
+ 
+
diff --git a/view/field.tpl b/view/field.tpl
index 35f5afd39c..6119ccf22b 100644
--- a/view/field.tpl
+++ b/view/field.tpl
@@ -1,4 +1,4 @@
 
  {{ if $field.0==select }}
- {{ inc field_select.tpl }}{{ endinc }}
+ {{ inc $field_select }}{{ endinc }}
  {{ endif }}
diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl
index ae837d6b74..f7a253ba50 100644
--- a/view/filer_dialog.tpl
+++ b/view/filer_dialog.tpl
@@ -1,4 +1,4 @@
-{{ inc field_combobox.tpl }}{{ endinc }}
+{{ inc $field_combobox }}{{ endinc }}
 

 	
 

diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..bd7c441eac
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Cher(e) {{$username}},
+
+	« {{$from}} » a commenté un élément ou une conversation que vous suivez.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète :
+
+{{$display}}
+
+Merci,
+	L'administrateur de {{$sitename}}
+
+ 
+
diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..408b643ec4
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Message de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} a commenté un élément ou une conversation que vous suivez.
{{$from}}
{{$body}}
Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète
Merci,
L'administrateur de {{$sitename}}

+
+
\ No newline at end of file
diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..76828474bf
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,15 @@
+
+Cher(e) {{$username}},
+
+	« {{$from}} » a commenté un éléŽment ou une conversation que vous suivez.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète :
+
+{{$display}}
+
+Merci,
+	L'administrateur de {{$sitename}}
\ No newline at end of file
diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..05fec413ea
--- /dev/null
+++ b/view/fr/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Cher(e) {{$myname}},
+
+Une nouvelle personne - {{$requestor}} - vous suit désormais sur {{$sitename}}.
+
+Vous pouvez consulter son profil sur {{$url}}.
+
+Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande.
+
+{{$siteurl}}
+
+Cordialement,
+
+	l'administrateur de {{$sitename}}
diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..e0c0078e55
--- /dev/null
+++ b/view/fr/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,23 @@
+
+Cher(e) {{$username}},
+
+	Grande nouvelle… « {{$fn}} » (de « {{$dfrn_url}} ») a accepté votre 
+demande de connexion à « {{$sitename}} ».
+
+Vous êtes désormais dans une relation réciproque et pouvez échanger des 
+photos, des humeurs et des messages sans restriction.
+
+Merci de visiter votre page « Contacts » sur {{$sitename}} pour toute 
+modification que vous souhaiteriez apporter à cette relation.
+
+{{$siteurl}}
+
+[Par exemple, vous pouvez créer un profil spécifique avec des informations
+cachées au grand public - et ainsi assigner des droits privilégiés à 
+« {{$fn}} »]/
+
+Sincèremment,
+
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..75d6a77e89
--- /dev/null
+++ b/view/fr/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "My Friend Network";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..e3ca253258
--- /dev/null
+++ b/view/fr/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Cher(e) {{$username}},
+
+	« {{$fn}} » du site « {{$dfrn_url}} » a accepté votre
+demande de mise en relation sur « {{$sitename}} ».
+
+	« {{$fn}} » a décidé de vous accepter comme « fan », ce qui restreint
+certains de vos moyens de communication - tels que les messages privés et
+certaines interactions avec son profil. S'il s'agit de la page d'une
+célébrité et/ou communauté, ces réglages ont été définis automatiquement.
+
+	« {{$fn}} » pourra choisir d'étendre votre relation à quelque chose de 
+plus permissif dans l'avenir.
+
+	Vous allez commencer à recevoir les mises à jour publiques du 
+statut de « {{$fn}} », lesquelles apparaîtront sur votre page « Réseau » sur
+
+{{$siteurl}}
+
+Sincèrement votre,
+
+	l'administrateur de {{$sitename}}
diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..0674e08ccd
--- /dev/null
+++ b/view/fr/smarty3/lostpass_eml.tpl
@@ -0,0 +1,34 @@
+
+Cher(e) {{$username}},
+
+	Nous avons récemment reçu, chez {{$sitename}}, une demande de remise
+à zéro du mot de passe protégeant votre compte. Pour confirmer cette 
+demande, merci de cliquer sur le lien de vérification suivant, ou de le
+coller dans la barre d'adresse de votre navigateur web.
+
+Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre
+le lien en question, et d'ignorer/supprimer ce courriel.
+
+Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu
+nous assurer que vous êtes bien à l'origine de cette demande.
+
+Merci de suivre le lien suivant pour confirmer votre identité :
+
+{{$reset_link}}
+
+Vous recevrez en retour un message avec votre nouveau mot de passe.
+
+Vous pourrez ensuite changer ce mot de passe, après connexion, dans la 
+page des réglages du compte.
+
+Les informations du compte concerné sont :
+
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+
+
+
+Sincèrement votre,
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/mail_received_html_body_eml.tpl b/view/fr/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..cf1c28627f
--- /dev/null
+++ b/view/fr/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Message de Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} vous a envoyé un message à {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Veuillez Ouvrir une session sur {{$siteurl}} pour lire et répondre à vos messages privés.
Merci,
{{$siteName}} Administrateur

+
+
diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..71c545ed61
--- /dev/null
+++ b/view/fr/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+{{$from}} vous a envoyé un message à {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+
+Veuillez ouvrir une session sur {{$siteurl}} pour lire et répondre à vos messages privés.
+
+Merci,
+{{$siteName}} Administrateur
diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..28eed70f15
--- /dev/null
+++ b/view/fr/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Cher(e) {{$username}},
+
+	Votre mot de passe a été modifié comme demandé. Merci de conserver
+cette information pour un usage ultérieur (ou bien de changer votre mot de 
+passe immédiatement en quelque chose dont vous vous souviendrez).
+
+Vos informations de connexion sont désormais :
+
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+Mot de passe :		{{$new_password}}
+
+Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, 
+après connexion
+
+Sincèrement votre,
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..373f314b09
--- /dev/null
+++ b/view/fr/smarty3/register_open_eml.tpl
@@ -0,0 +1,22 @@
+
+Cher(e) {{$username}},
+
+	Merci de votre inscription à {{$sitename}}. Votre compte a été créé.
+Les informations de connexion sont les suivantes :
+
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+Mot de passe :		{{$password}}
+
+Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte,
+après connexion.
+
+Merci de prendre quelques minutes pour découvrir les autres réglages disponibles
+sur cette page.
+
+Merci, et bienvenue sur {{$sitename}}.
+
+Sincèrement votre,
+	l'administrateur de {{$sitename}}
+
+ 
diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..22b6d8a947
--- /dev/null
+++ b/view/fr/smarty3/register_verify_eml.tpl
@@ -0,0 +1,27 @@
+
+Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle
+nécessite votre approbation.
+
+
+Les informations de connexion sont les suivantes :
+
+Nom complet :		{{$username}}
+Site :			{{$siteurl}}
+Pseudo/Courriel :	{{$email}}
+
+
+Pour approuver cette demande, merci de suivre le lien :
+
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+Pour rejeter cette demande et supprimer le compte associé, 
+merci de suivre le lien :
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+En vous remerçiant.
+
diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..3f5f8a1f44
--- /dev/null
+++ b/view/fr/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Cher(e) {{$myname}},
+
+Vous venez de recevoir une demande de mise en relation sur {{$sitename}}
+
+venant de « {{$requestor}} ».
+
+Vous pouvez visiter son profil sur {{$url}}.
+
+Vous pouvez vous connecter à votre site pour voir la demande
+complète et l'approuver ou l'ignorer/annuler.
+
+{{$siteurl}}
+
+Cordialement,
+
+	l'administrateur de {{$sitename}}
diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..991fad8574
--- /dev/null
+++ b/view/fr/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Cher(e) {{$username}},
+
+	« {{$from}} » a posté quelque chose sur le mur de votre profil.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous à {{$siteurl}} pour voir et/ou supprimer l'élément :
+
+{{$display}}
+
+Merci,
+	l'administrateur de {{$sitename}}
+
+ 
+
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 2fa2b1a552..d60a1b0f97 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -5,7 +5,7 @@
 	
 		
 		
-		{{ inc field_input.tpl with $field=$gname }}{{ endinc }}
+		{{ inc $field_input with $field=$gname }}{{ endinc }}
 		{{ if $drop }}$drop{{ endif }}
 		

 			
@@ -15,9 +15,9 @@
 

 
 
-{{ if $groupeditor }}
+{{ if $groupedit_info }}
 	

-		{{ inc groupeditor.tpl }}{{ endinc }}
+		{{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }}
 	

 {{ endif }}
 {{ if $desc }}
$desc
{{ endif }}
diff --git a/view/install_checks.tpl b/view/install_checks.tpl
index 176611d4be..a3aa2b2660 100644
--- a/view/install_checks.tpl
+++ b/view/install_checks.tpl
@@ -3,7 +3,7 @@
 
 
 {{ for $checks as $check }}
-	
+	
 	{{if $check.help }}
 	
 	{{endif}}
diff --git a/view/install_db.tpl b/view/install_db.tpl
index 1302b5a708..bf17256ebf 100644
--- a/view/install_db.tpl
+++ b/view/install_db.tpl
@@ -18,10 +18,10 @@ $info_03
 
 
-{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
-{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
-{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
+{{ inc $field_input with $field=$dbhost }}{{endinc}}
+{{ inc $field_input with $field=$dbuser }}{{endinc}}
+{{ inc $field_password with $field=$dbpass }}{{endinc}}
+{{ inc $field_input with $field=$dbdata }}{{endinc}}
 
 
  
diff --git a/view/install_settings.tpl b/view/install_settings.tpl
index 05b87f904e..453e2e5cc3 100644
--- a/view/install_settings.tpl
+++ b/view/install_settings.tpl
@@ -16,7 +16,7 @@
 
 
-{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
+{{ inc $field_input with $field=$adminmail }}{{endinc}}
 $timezone
 
  
diff --git a/view/intros.tpl b/view/intros.tpl
index e7fd53ca4f..2dd684079d 100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -14,8 +14,8 @@
 

-{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
-{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
+{{inc $field_checkbox with $field=$hidden }}{{endinc}}
+{{inc $field_checkbox with $field=$activity }}{{endinc}}
 
diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..127f05a457
--- /dev/null
+++ b/view/is/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Góðan daginn {{$myname}},
+
+Þú hefur nýjan aðdáanda frá {{$sitename}} - '{{$requestor}}'.
+
+Þú getur heimsótt þeirra heimasvæði á {{$url}}.
+
+Vinsamlegast innskráðu þig til að samþykkja eða hunsa/hætta við beiðni.
+
+{{$siteurl}}
+
+Bestu kveðjur,
+
+	Kerfisstjóri {{$sitename}}
\ No newline at end of file
diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..1bc440269e
--- /dev/null
+++ b/view/is/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Góðan daginn {{$username}}, 
+
+	Frábærar fréttir... '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt 
+tengibeiðni þína hjá '{{$sitename}}'.
+
+Þið eruð nú sameiginlegir vinir og getið skipst á stöðu uppfærslum, myndum og tölvupósti
+án hafta.
+
+Endilega fara á síðunna 'Tengiliðir' á þjóninum {{$sitename}} ef þú villt gera 
+einhverjar breytingar á þessu sambandi. 
+
+{{$siteurl}}
+
+[Til dæmis þá getur þú búið til nýjar notenda upplýsingar um þig, með ítarlegri lýsingu, sem eiga ekki
+að vera aðgengileg almenningi - og veitt aðgang til að sjá '{{$fn}}'].
+
+Bestu kveðjur,
+
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..bbf86cf157
--- /dev/null
+++ b/view/is/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Góðan daginn {{$username}},
+
+	'{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt 
+tengibeiðni þína á '{{$sitename}}'.
+
+	'{{$fn}}' hefur ákveðið að hafa þig sem "aðdáanda", sem takmarkar 
+ákveðnar gerðir af samskipturm - til dæmis einkapóst og ákveðnar notenda
+aðgerðir.  Ef þetta er stjörnu- eða  hópasíða, þá voru þessar stillingar
+settar á sjálfkrafa.
+
+	'{{$fn}}' getur ákveðið seinna að breyta þessu í gagnkvæma eða enn hafta minni  
+tengingu í framtíðinni. 
+
+	Þú munt byrja að fá opinberar stöðubreytingar frá '{{$fn}}', 
+þær munu birtast á 'Tengslanet' síðunni þinni á  
+
+{{$siteurl}}
+
+Bestu kveðjur,
+
+	Kerfisstjóri {{$sitename}}
\ No newline at end of file
diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..d2010ac8fe
--- /dev/null
+++ b/view/is/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Góðan dag {{$username}},
+	Beiðni barst á {{$sitename}} um að endursetja 
+aðgangsorðið.  Til að staðfesta þessa beiði, veldu slóðina
+hér fyrir neðan og settu í slóðastiku vafra. 
+
+Ef þú samþykkir ekki þessa breytingu, EKKI fara á slóðina
+sem upp er gefinn heldur hunsaðu og/eða eyddu þessum tölvupósti. 
+
+Aðgangsorðið verður ekki breytt nama við getum staðfest að þú
+baðst um þessa breytingu. 
+
+Farðu á slóðina til að staðfesta:
+
+{{$reset_link}}
+
+Þú munnt fá annan tölvupóst með nýja aðgangsorðinu.
+
+Þú getur síðan breytt því aðgangsorði í stillingar síðunni eftir að þú innskráir þig. 
+
+Innskráningar upplýsingarnar eru eftirfarandi:
+
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+
+
+
+
+Bestu kveðjur,
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..c19551208e
--- /dev/null
+++ b/view/is/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Góðan daginn {{$username}},
+	Lykilorð þínu hefur verið breytt einsog umbeðið var.  Endilega geyma þessar 
+upplýsingar (eða skiptu strax um aðgangsorð 
+yfir í eitthvað sem þú mannst).
+
+
+Innskráningar upplýsingar þínar eru:
+
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+Aðgangsorð:	{{$new_password}}
+
+Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig.
+
+
+Bestu kveðjur,
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..0673224d1f
--- /dev/null
+++ b/view/is/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Góðan daginn {{$username}},
+	Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. 
+Innskráningar upplýsingarnar þínar eru eftirfarandi:
+
+
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+Aðgangsorð:	{{$password}}
+
+Þú getur breytt aðgangsorðinu þínu á "Stillingar" síðunni eftir að þú hefur skráð þig 
+inn.
+
+Endilega eyddu smá tíma í að yfirfara aðrar notenda stillingar á þeirri síðu.
+
+Einnig gætir þú bætt við grunnupplýsingum á sjálfgefna prófílinn 
+(á "Forsíður" síðunni) svo aðrið geti auðveldlega fundið þig.
+
+Við mælum með að þú setjir fullt nafn, bætir við prófíl mynd,
+bætir nokkrum "leitarorðum" (mjög gagnlegt við að eignast nýja vini) og 
+mögulega bætir við í hvaða landi þú býrð, ef þú villt ekki vera nákvæmari
+en það.
+
+Við virðum að fullu rétt þinn til einkalífs, því er ekkert að þessum atriðum skilyrði. 
+Ef þú ert byrjandi og þekkir ekki einhvern hér, þér eru hér fólk
+sem getur aðstoðað þig við að eignast nýja og áhugaverða vini.  
+
+
+Takk fyrir og velkomin(n) á {{$sitename}}.
+
+Bestu kveðjur,
+	Kerfisstjóri {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..cf6362c4b7
--- /dev/null
+++ b/view/is/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Beiðni um nýjan notanda barst {{$sitename}} sem krefst 
+þíns samþykkis. 
+
+
+Innskráningar upplýsingarnar eru eftirfarandi:
+
+Fullt nafn:	{{$username}}
+Vefþjónn:	{{$siteurl}}
+Notendanafn:	{{$email}}
+
+
+Til að samþykkja beiðnina þarf að heimsækja eftirfarandi slóð:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Til að synja beiðni og eyða notanda þá heimsækir þú slóðina:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Takk fyrir.
diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..36d8f217af
--- /dev/null
+++ b/view/is/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Góðan dag {{$myname}},
+
+Þér hefur borist beiðni um tengingu á {{$sitename}} 
+
+frá '{{$requestor}}'.
+
+Þú getur heimsótt forsíðuna á {{$url}}.
+
+skráðu þig inn á þína síðu til að skoða alla kynninguna 
+og þar getur þú hunsað/hætt við beiðnina.
+
+{{$siteurl}}
+
+Kveðja,
+
+	Kerfisstjóri {{$sitename}}
\ No newline at end of file
diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl
new file mode 100644
index 0000000000..201f87131d
--- /dev/null
+++ b/view/is/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hæ, 
+Ég er {{$sitename}}.   
+Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, 
+En þegar ég reyndi að uppfæra, gerist eitthvað hræðilegt.  
+Þetta þarf að laga strax og ég get það ekki ein.  Hafðu samband við 
+þróunarteymi friendica ef þú getur ekki hjálpað mér.  Gagnagrunnurinn minn gæti verið skemmdur 
+
+Villuskilaboðin eru '{{$error}}'.   
+
+Fyrirgefðu, 
+þinn friendica þjónn á {{$siteurl}}
\ No newline at end of file
diff --git a/view/it/smarty3/cmnt_received_eml.tpl b/view/it/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 0000000000..f35dc3dc9f
--- /dev/null
+++ b/view/it/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro/a {{$username}},
+
+	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
+
+-----
+{{$body}}
+-----
+
+Accedi a {{$siteurl}} per verdere la conversazione completa:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/it/smarty3/cmnt_received_html_body_eml.tpl b/view/it/smarty3/cmnt_received_html_body_eml.tpl
new file mode 100644
index 0000000000..80d6118073
--- /dev/null
+++ b/view/it/smarty3/cmnt_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Messaggio
+	
+
+
+
$check.title {{if $check.required}}(required){{endif}}
$check.title {{if $check.required}}(required){{endif}}
$check.help

 
 
 
 
 
 

+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} ha commentato un elemeto/conversazione che stai seguendo.
{{$from}}
{{$body}}
Accedi a {{$siteurl}} per verdere la conversazione completa:.
Grazie,
L'amministratore di {{$sitename}}

+
+
\ No newline at end of file
diff --git a/view/it/smarty3/cmnt_received_text_body_eml.tpl b/view/it/smarty3/cmnt_received_text_body_eml.tpl
new file mode 100644
index 0000000000..f35dc3dc9f
--- /dev/null
+++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro/a {{$username}},
+
+	'{{$from}}' ha commentato un elemeto/conversazione che stai seguendo.
+
+-----
+{{$body}}
+-----
+
+Accedi a {{$siteurl}} per verdere la conversazione completa:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl
new file mode 100644
index 0000000000..0bfc375520
--- /dev/null
+++ b/view/it/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Ciao {{$myname}},
+
+Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'.
+
+Puoi vedere il suo profilo su {{$url}}.
+
+Accedi sul tuo sito per approvare o ignorare la richiesta.
+
+{{$siteurl}}
+
+Saluti,
+
+	L'amministratore di {{$sitename}}
\ No newline at end of file
diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl
new file mode 100644
index 0000000000..daeaae9016
--- /dev/null
+++ b/view/it/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Ciao {{$username}},
+
+	Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato 
+la tua richiesta di connessione su '{{$sitename}}'.
+
+Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email
+senza restrizioni.
+
+Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare 
+qualche modifica riguardo questa relazione 
+
+{{$siteurl}}
+
+[Ad esempio, potresti creare un profilo separato con le informazioni che non
+sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}'].
+
+Saluti,
+
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl
new file mode 100644
index 0000000000..5696245c77
--- /dev/null
+++ b/view/it/smarty3/htconfig.tpl
@@ -0,0 +1,68 @@
+path to 'directory/subdirectory'. 
+
+$a->path = '{{$urlpath}}';
+ 
+// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
+// It can be changed later and only applies to timestamps for anonymous viewers.
+
+$default_timezone = '{{$timezone}}';
+
+// What is your site name?
+
+$a->config['sitename'] = "La Mia Rete di Amici";
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting 
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['register_text'] = '';
+$a->config['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['php_path'] = '{{$phpath}}';
+
+// Location of global directory submission page.
+
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
+
+// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
+
+$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com';
+
+// Server-to-server private message encryption (RINO) is allowed by default. 
+// Encryption will only be provided if this setting is true and the
+// PHP mcrypt extension is installed on both systems 
+
+$a->config['system']['rino_encrypt'] = true;
+
+// default system theme
+
+$a->config['system']['theme'] = 'duepuntozero';
+
diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl
new file mode 100644
index 0000000000..69fce81411
--- /dev/null
+++ b/view/it/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Ciao {{$username}},
+
+	'{{$fn}}' di '{{$dfrn_url}}' ha accettato 
+la tua richiesta di connessione a '{{$sitename}}'.
+
+	'{{$fn}}' ha deciso di accettarti come "fan", il che restringe 
+alcune forme di comunicazione - come i messaggi privati e alcune
+interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno
+applicate automaticamente.
+
+	'{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva 
+. 
+
+	Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', 
+che apparirà nella tua pagina 'Rete'  
+
+{{$siteurl}}
+
+Saluti,
+
+	l'amministratore di {{$sitename}}
\ No newline at end of file
diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl
new file mode 100644
index 0000000000..c336cf3c1d
--- /dev/null
+++ b/view/it/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Ciao {{$username}},
+	Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. 
+Per confermare la richiesta, clicca sul link di verifica
+qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. 
+
+Se NON hai richiesto l'azzeramento, NON seguire il link
+e ignora e/o cancella questa email. 
+
+La tua password non sarà modificata finché non avremo verificato che
+hai fatto questa richiesta. 
+
+Per verificare la tua identità clicca su:
+
+{{$reset_link}}
+
+Dopo la verifica riceverai un messaggio di risposta con la nuova password.
+
+Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
+
+I dati di accesso sono i seguenti:
+
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+
+
+
+
+Saluti,
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/mail_received_html_body_eml.tpl b/view/it/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 0000000000..f0bf679d0e
--- /dev/null
+++ b/view/it/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Friendica Messsaggio
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
{{$from}}
{{$title}}
{{$htmlversion}}
Accedi a {{$siteurl}} per leggere e rispondere ai tuoi messaggi privati.
Grazie,
L'amministratore di {{$siteName}}

+
+
diff --git a/view/it/smarty3/mail_received_text_body_eml.tpl b/view/it/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 0000000000..79e133fcef
--- /dev/null
+++ b/view/it/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Accedi a {{$siteurl}} per leggere e rispondere ai tuoi messaggi privati.
+
+Grazie,
+L'amministratore di {{$siteName}}
diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl
new file mode 100644
index 0000000000..046588e1f2
--- /dev/null
+++ b/view/it/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Ciao {{$username}},
+	La tua password è cambiata come hai richiesto. Conserva queste 
+informazioni (oppure cambia immediatamente la password con 
+qualcosa che ti è più facile ricordare).
+
+
+I tuoi dati di access sono i seguenti:
+
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+Password:»{{$new_password}}
+
+Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
+
+
+Saluti,
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl
new file mode 100644
index 0000000000..23dcaf2c8d
--- /dev/null
+++ b/view/it/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Ciao {{$username}},
+	Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. 
+I dettagli di accesso sono i seguenti
+
+
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+Password:»{{$password}}
+
+Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso 
+.
+
+Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina.
+
+Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo 
+(nella pagina "Profilo") per rendere agli altri più facile trovarti.
+
+Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto,
+di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e 
+magari il paese dove vivi; se non vuoi essere più dettagliato
+di così.
+
+Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. 
+Se  ancora non conosci nessuno qui, potrebbe esserti di aiuto
+per farti nuovi e interessanti amici.  
+
+
+Grazie. Siamo contenti di darti il benvenuto su {{$sitename}}
+
+Saluti,
+	l'amministratore di {{$sitename}}
+
+ 
\ No newline at end of file
diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl
new file mode 100644
index 0000000000..743370b3df
--- /dev/null
+++ b/view/it/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede 
+la tua approvazione. 
+
+
+I tuoi dati di accesso sono i seguenti:
+
+Nome completo:»{{$username}}
+Sito:»{{$siteurl}}
+Nome utente:»{{$email}}
+
+
+Per approvare questa richiesta clicca su:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Per negare la richiesta e rimuove il profilo, clicca su:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Grazie.
diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl
new file mode 100644
index 0000000000..df3a7323c1
--- /dev/null
+++ b/view/it/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Ciao {{$myname}},
+
+Hai appena ricevuto una richiesta di connessione da {{$sitename}} 
+
+da '{{$requestor}}'.
+
+Puoi visitare il suo profilo su {{$url}}.
+
+Accedi al tuo sito per vedere la richiesta completa 
+e approva o ignora/annulla la richiesta.
+
+{{$siteurl}}
+
+Saluti,
+
+	l'amministratore di {{$sitename}}
\ No newline at end of file
diff --git a/view/it/smarty3/wall_received_eml.tpl b/view/it/smarty3/wall_received_eml.tpl
new file mode 100644
index 0000000000..909ec86d44
--- /dev/null
+++ b/view/it/smarty3/wall_received_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro/a {{$username}},
+
+	'{{$from}}' ha scritto qualcosa sulla bachecha del tuo profilo.
+
+-----
+{{$body}}
+-----
+
+Accedi a  {{$siteurl}} per vedere o cancellare l'elemento:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/it/smarty3/wall_received_html_body_eml.tpl b/view/it/smarty3/wall_received_html_body_eml.tpl
new file mode 100644
index 0000000000..3fa724c3bc
--- /dev/null
+++ b/view/it/smarty3/wall_received_html_body_eml.tpl
@@ -0,0 +1,24 @@
+
+
+
+	Messaggio da Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+
Friendica
{{$from}} ha scritto sulla tua bacheca.
{{$from}}
{{$body}}
Vai su {{$siteurl}} per vedere o cancellare il post.
Grazie,
L'amministratore di {{$sitename}}

+
+
\ No newline at end of file
diff --git a/view/it/smarty3/wall_received_text_body_eml.tpl b/view/it/smarty3/wall_received_text_body_eml.tpl
new file mode 100644
index 0000000000..ad7f83abcb
--- /dev/null
+++ b/view/it/smarty3/wall_received_text_body_eml.tpl
@@ -0,0 +1,18 @@
+
+Caro {{$username}},
+
+	'{{$from}}' ha scritto sulla tua bacheca.
+
+-----
+{{$body}}
+-----
+
+Vai su {{$siteurl}} per vedere o cancellare il post:
+
+{{$display}}
+
+Grazie,
+	L'amministratore di {{$sitename}}
+
+ 
+
diff --git a/view/login.tpl b/view/login.tpl
index 297b36c9ac..21ed66a66b 100644
--- a/view/login.tpl
+++ b/view/login.tpl
@@ -3,17 +3,17 @@
 	
 
 	

-	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
-	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	{{ inc $field_input with $field=$lname }}{{ endinc }}
+	{{ inc $field_password with $field=$lpassword }}{{ endinc }}
 	

 	
 	{{ if $openid }}
 			

-			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			{{ inc $field_openid with $field=$lopenid }}{{ endinc }}
 			

 	{{ endif }}
 
-	{{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
+	{{ inc $field_checkbox with $field=$lremember }}{{ endinc }}