diff --git a/boot.php b/boot.php index 563067ad6..a9e599805 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1561' ); +define ( 'FRIENDICA_VERSION', '3.1.1572' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); @@ -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']; } @@ -954,8 +969,7 @@ if(! function_exists('login')) { $a->module = 'login'; } - - $o .= replace_macros($tpl,array( + $o .= replace_macros($tpl, array( '$dest_url' => $dest_url, '$logout' => t('Logout'), @@ -974,6 +988,13 @@ if(! function_exists('login')) { '$lostpass' => t('Forgot your password?'), '$lostlink' => t('Password Reset'), + + '$tostitle' => t('Website Terms of Service'), + '$toslink' => t('terms of service'), + + '$privacytitle' => t('Website Privacy Policy'), + '$privacylink' => t('privacy policy'), + )); call_hooks('login_hook',$o); @@ -1324,11 +1345,20 @@ if(! function_exists('profile_sidebar')) { $tpl = get_markup_template('profile_vcard.tpl'); + $p = array(); + foreach($profile as $k => $v) { + $k = str_replace('-','_',$k); + $p[$k] = $v; + } + + if($a->theme['template_engine'] === 'internal') + $location = template_escape($location); + $o .= replace_macros($tpl, array( - '$profile' => $profile, + '$profile' => $p, '$connect' => $connect, '$wallmessage' => $wallmessage, - '$location' => template_escape($location), + '$location' => $location, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, @@ -1914,3 +1944,18 @@ function clear_cache($basepath = "", $path = "") { closedir($dh); } } + +function set_template_engine(&$a, $engine = 'internal') { + + $a->theme['template_engine'] = 'internal'; + + if(is_writable('view/smarty3/')) { + switch($engine) { + case 'smarty3': + $a->theme['template_engine'] = 'smarty3'; + break; + default: + break; + } + } +} diff --git a/doc/Home.md b/doc/Home.md index dc45a2253..4c33c64aa 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -5,7 +5,7 @@ Friendica Documentation and Resources **Contents** * [Account Basics](help/Account-Basics) -* [New User Quick Start](help/guide) +* [New User Quick Start](help/Quick-Start-guide) * [Creating posts](help/Text_editor) * [Comment, sort and delete posts](help/Text_comment) * [Profiles](help/Profiles) diff --git a/doc/andfinally.md b/doc/Quick-Start-andfinally.md similarity index 96% rename from doc/andfinally.md rename to doc/Quick-Start-andfinally.md index c4e8cb948..97afd8140 100644 --- a/doc/andfinally.md +++ b/doc/Quick-Start-andfinally.md @@ -1,5 +1,3 @@ -[[!meta title="And Finally..."]] - And that brings the Quick Start to an end. Here are some more things to help get you started: diff --git a/doc/groupsandpages.md b/doc/Quick-Start-groupsandpages.md similarity index 85% rename from doc/groupsandpages.md rename to doc/Quick-Start-groupsandpages.md index 5cfbc653c..9beb2ff4c 100644 --- a/doc/groupsandpages.md +++ b/doc/Quick-Start-groupsandpages.md @@ -1,10 +1,10 @@ -This is the global directory. If you get lost, you can click this link to bring yourself back here. +This is the global directory. If you get lost, you can click this link to bring yourself back here. On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people! When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. -Once you've added some groups, move on to the next section. +Once you've added some groups, move on to the next section. diff --git a/doc/guide.md b/doc/Quick-Start-guide.md similarity index 94% rename from doc/guide.md rename to doc/Quick-Start-guide.md index d76af92e2..47537a3e8 100644 --- a/doc/guide.md +++ b/doc/Quick-Start-guide.md @@ -6,7 +6,7 @@ This is a bit like your Facebook wall. It's where all your status messgages are Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. -Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab +Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab diff --git a/doc/makingnewfriends.md b/doc/Quick-Start-makingnewfriends.md similarity index 83% rename from doc/makingnewfriends.md rename to doc/Quick-Start-makingnewfriends.md index 7eff1eda1..d3911266c 100644 --- a/doc/makingnewfriends.md +++ b/doc/Quick-Start-makingnewfriends.md @@ -1,10 +1,10 @@ -This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. +This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too! See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. -Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! +Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! diff --git a/doc/network.md b/doc/Quick-Start-network.md similarity index 75% rename from doc/network.md rename to doc/Quick-Start-network.md index 08ddca290..b456135e2 100644 --- a/doc/network.md +++ b/doc/Quick-Start-network.md @@ -1,8 +1,8 @@ -This is your Network Tab. If you get lost, you can click this link to bring yourself back here. +This is your Network Tab. If you get lost, you can click this link to bring yourself back here. This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. -Now we need to fill it up, the first step, is to make some new friends. +Now we need to fill it up, the first step, is to make some new friends. diff --git a/doc/de/Home.md b/doc/de/Home.md index 585f78f44..9e92f2d83 100644 --- a/doc/de/Home.md +++ b/doc/de/Home.md @@ -4,7 +4,7 @@ Friendica - Dokumentation und Ressourcen **Inhalte** * [Account - Basics](help/Account-Basics) -* [Schnellstart für neue Benutzer](help/guide) +* [Schnellstart für neue Benutzer](help/Quick-Start-guide) * [Beiträge erstellen](help/Text_editor) * [Beiträge kommentieren, einordnen und löschen](help/Text_comment) * [Profile](help/Profiles) diff --git a/doc/de/andfinally.md b/doc/de/Quick-Start-andfinally.md similarity index 100% rename from doc/de/andfinally.md rename to doc/de/Quick-Start-andfinally.md diff --git a/doc/de/groupsandpages.md b/doc/de/Quick-Start-groupsandpages.md similarity index 84% rename from doc/de/groupsandpages.md rename to doc/de/Quick-Start-groupsandpages.md index 0b5f1fced..f0547667f 100644 --- a/doc/de/groupsandpages.md +++ b/doc/de/Quick-Start-groupsandpages.md @@ -3,13 +3,13 @@ Gruppen und Seiten * [Zur Startseite der Hilfe](help) -Hier siehst du das globale Verzeichnis. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. +Hier siehst du das globale Verzeichnis. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. Auf dieser Seite findest du eine Zusammenstellung von Gruppen, Foren und bekannten Seiten. Gruppen sind keine realen Personen. Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet. Habe keine Sorge, falls du dich unbehaglich fühlst, wenn du dich einer neuen Person vorstellen sollst, da es sich nicht um Personen handelt. Wenn du dich mit einer Gruppe verbindest, erscheinen alle Nachrichten der Gruppe in deinem "Netzwerk"-Tab. Du kannst diese Beiträge kommentieren oder selbst in der Gruppe schreiben, ohne eine der Gruppenmitglieder persönlich hinzuzufügen. Das ist ein großartiger Weg, dynamisch neue Freunde zu gewinnen. Du findest Personen, die du magst, anstatt Fremde hinzuzufügen. Suche dir einfach eine Gruppe und füge sie so hinzu, wie du auch normale Freunde hinzufügst. Es gibt eine Menge Gruppen und möglicherweise findest du nicht wieder zu dieser Seite zurück. In diesem Fall nutze einfach den Link oben auf dieser Seite. -Wenn du einige Gruppen hinzugefügt hast, gehe weiter zum nächsten Schritt. +Wenn du einige Gruppen hinzugefügt hast, gehe weiter zum nächsten Schritt. diff --git a/doc/de/guide.md b/doc/de/Quick-Start-guide.md similarity index 95% rename from doc/de/guide.md rename to doc/de/Quick-Start-guide.md index a5ce54a1d..5006d7f9f 100644 --- a/doc/de/guide.md +++ b/doc/de/Quick-Start-guide.md @@ -11,7 +11,7 @@ Hier sieht es ein wenig wie auf deiner Facebook-Seite aus. Hier findest du alle Wenn du deinen Beitrag ("Post") geschrieben hast, kannst du auf das "Schloss"-Symbol klicken und festlegen, wer deinen Beitrag sehen kann. Wenn du dieses Symbol nicht anklickst, ist dein Beitrag öffentlich. Das bedeutet, dass jeder, der dein Profil ansieht, der auf dem "Community"-Tab deines Servers oder auf dem "Netzwerk"-Tab ("Beiträge deiner Kontakte") eines befreundeten Kontakts ist, den Beitrag sehen kann. -Probiere es doch einfach mal aus. Wenn du fertg bist, schauen wir uns den "Netzwerk"-Tab an. +Probiere es doch einfach mal aus. Wenn du fertg bist, schauen wir uns den "Netzwerk"-Tab an. diff --git a/doc/de/makingnewfriends.md b/doc/de/Quick-Start-makingnewfriends.md similarity index 87% rename from doc/de/makingnewfriends.md rename to doc/de/Quick-Start-makingnewfriends.md index 911b7f4a8..24d9ee418 100644 --- a/doc/de/makingnewfriends.md +++ b/doc/de/Quick-Start-makingnewfriends.md @@ -3,13 +3,13 @@ Neue Freunde finden * [Zur Startseite der Hilfe](help) -Hier siehst du die Kontaktvorschläge. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. +Hier siehst du die Kontaktvorschläge. Wenn du dich mal verirrt hast, kannst du diesen Link klicken und wieder hierher kommen. Diese Seite ist ein wenig wie die Kontaktvorschläge in Facebook. Jeder auf dieser Liste hat zugestimmt, als Kontaktvorschlag zu erscheinen. Das bedeutet, das sie Anfragen meist nicht ablehnen, da sie neue Leute kennenlernen wollen. Siehst du jemanden, dessen Aussehen du magst? Klicke auf den "Verbinden"-Button beim Foto. Als nächstes kommst du zur Seite "Freundschafts-/Kontaktanfrage". Fülle das Formular wie vorgegeben aus und trage optional eine kleine Notiz ein. Nun musst du nur noch auf die Bestätigung warten. Beachte dabei, dass es sich um reale Personen handelt und es somit etwas dauern kann. Jetzt, nachdem du jemanden hinzugefügt hast, weißt du vielleicht nicht mehr, wie du zurückkommst. Klicke einfach auf den Link oben auf dieser Seite und du kommst zurück zur Seite mit den Kontaktvorschlägen, um weitere Personen hinzuzufügen. -Du willst nicht einfach Personen hinzufügen, die du nicht kennst? Kein Problem - an dieser Stelle kommen wir zu den Gruppen und Seiten. +Du willst nicht einfach Personen hinzufügen, die du nicht kennst? Kein Problem - an dieser Stelle kommen wir zu den Gruppen und Seiten. diff --git a/doc/de/network.md b/doc/de/Quick-Start-network.md similarity index 81% rename from doc/de/network.md rename to doc/de/Quick-Start-network.md index 37eeec869..6132cd57f 100644 --- a/doc/de/network.md +++ b/doc/de/Quick-Start-network.md @@ -3,11 +3,11 @@ Deine "Netzwerk"-Seite * [Zur Startseite der Hilfe](help) -Das ist dein "Netzwerk"-Tab. Wenn du dich mal verirrt hast, kannst du diesen Link klicken, um wieder hierher zu kommen. +Das ist dein "Netzwerk"-Tab. Wenn du dich mal verirrt hast, kannst du diesen Link klicken, um wieder hierher zu kommen. Diese Seite ist ein wenig wie die News-Seite in Facebook oder der Stream in Diaspora. Hier findest du alle Beiträge deiner Kontakte, Gruppen und Feeds, die du eingetragen hast. Wenn du neu bist, siehst du hier noch nichts, falls du deinen Status im letzten Schritt noch nicht eingetragen hast. Wenn du bereits ein paar Freunde eingetragen hast, findest du hier ihre Beiträge. Hier kannst du Beiträge kommentieren, eintragen, dass du den Beitrag magst oder ablehnst oder die Profile durch einen Klick auf deren Namen anschauen und auf deren Seite ("Wall") Nachrichten schreiben. -Nun wollen wir diese Seite mit Inhalt füllen. Der erste Schritt ist es, Leute zu deinem Account hinzuzufügen. +Nun wollen wir diese Seite mit Inhalt füllen. Der erste Schritt ist es, Leute zu deinem Account hinzuzufügen. diff --git a/include/api.php b/include/api.php index 555315bd8..2c5ddc626 100644 --- a/include/api.php +++ b/include/api.php @@ -1,9 +1,9 @@ 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), @@ -856,12 +877,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); @@ -885,7 +921,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $o = ''; - $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : ''); + $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); /* $plaintext = false; if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) ) diff --git a/include/cronhooks.php b/include/cronhooks.php index 27cf642b2..6aa072136 100644 --- a/include/cronhooks.php +++ b/include/cronhooks.php @@ -12,7 +12,7 @@ function cronhooks_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; diff --git a/include/delivery.php b/include/delivery.php index fcb0ee47b..d89cded9e 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -12,13 +12,13 @@ function delivery_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); } - require_once("session.php"); - require_once("datetime.php"); + require_once("include/session.php"); + require_once("include/datetime.php"); require_once('include/items.php'); require_once('include/bbcode.php'); require_once('include/diaspora.php'); diff --git a/include/diaspora.php b/include/diaspora.php index dcbe0fada..3b681e991 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -752,7 +752,7 @@ function diaspora_request($importer,$xml) { } function diaspora_post_allow($importer,$contact) { - if(($contact['blocked']) || ($contact['readonly'])) + if(($contact['blocked']) || ($contact['readonly']) || ($contact['archive'])) return false; if($contact['rel'] == CONTACT_IS_SHARING || $contact['rel'] == CONTACT_IS_FRIEND) return true; diff --git a/include/directory.php b/include/directory.php index 29a793a2a..5c1a7c4b4 100644 --- a/include/directory.php +++ b/include/directory.php @@ -10,7 +10,7 @@ function directory_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; diff --git a/include/enotify.php b/include/enotify.php index b4331f092..ba947a9bf 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -310,7 +310,7 @@ function notification($params) { // send email notification if notification preferences permit - require_once('bbcode.php'); + require_once('include/bbcode.php'); if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { logger('notification: sending notification email'); diff --git a/include/expire.php b/include/expire.php index 373ebf55f..4c6fb7a19 100644 --- a/include/expire.php +++ b/include/expire.php @@ -11,7 +11,7 @@ function expire_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; diff --git a/include/follow.php b/include/follow.php index b4d1732b8..59f3b1a5f 100644 --- a/include/follow.php +++ b/include/follow.php @@ -218,7 +218,7 @@ function new_contact($uid,$url,$interactive = false) { group_add_member($uid,'',$contact_id,$g[0]['def_gid']); } - require_once("Photo.php"); + require_once("include/Photo.php"); $photos = import_profile_photo($ret['photo'],$uid,$contact_id); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php new file mode 100644 index 000000000..9ad14ad8a --- /dev/null +++ b/include/friendica_smarty.php @@ -0,0 +1,40 @@ + "view/theme/$theme/smarty3/"); + if( x($a->theme_info,"extends") ) + $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/"); + $template_dirs = $template_dirs + array('base' => 'view/smarty3/'); + $this->setTemplateDir($template_dirs); + + $this->setCompileDir('view/smarty3/compiled/'); + $this->setConfigDir('view/smarty3/config/'); + $this->setCacheDir('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->filename); + } +} + + + diff --git a/include/gprobe.php b/include/gprobe.php index 88e6bad4a..0cf32e95f 100644 --- a/include/gprobe.php +++ b/include/gprobe.php @@ -13,7 +13,7 @@ function gprobe_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; diff --git a/include/html2plain.php b/include/html2plain.php index 4afac41d8..bafaadd8d 100644 --- a/include/html2plain.php +++ b/include/html2plain.php @@ -1,5 +1,5 @@ $contact['avatar-date'])) { logger('consume_feed: Updating photo for ' . $contact['name']); - require_once("Photo.php"); + require_once("include/Photo.php"); $photo_failure = false; $have_photo = false; @@ -2240,7 +2240,7 @@ function local_delivery($importer,$data) { if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) { logger('local_delivery: Updating photo for ' . $importer['name']); - require_once("Photo.php"); + require_once("include/Photo.php"); $photo_failure = false; $have_photo = false; diff --git a/include/notifier.php b/include/notifier.php index b5a92ff25..367f78700 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -51,13 +51,13 @@ function notifier_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); } - require_once("session.php"); - require_once("datetime.php"); + require_once("include/session.php"); + require_once("include/datetime.php"); require_once('include/items.php'); require_once('include/bbcode.php'); require_once('include/email.php'); diff --git a/include/oauth.php b/include/oauth.php index 28ac4428f..de6f1e00d 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -150,6 +150,7 @@ class FKOAuth1 extends OAuthServer { $_SESSION['page_flags'] = $record['page-flags']; $_SESSION['my_url'] = $a->get_baseurl() . '/profile/' . $record['nickname']; $_SESSION['addr'] = $_SERVER['REMOTE_ADDR']; + $_SESSION["allow_api"] = true; //notice( t("Welcome back ") . $record['username'] . EOL); $a->user = $record; diff --git a/include/onepoll.php b/include/onepoll.php index d819b7f42..f66a48dd4 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -18,7 +18,7 @@ function onepoll_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; @@ -252,6 +252,9 @@ function onepoll_run(&$argv, &$argc){ $stat_writeable = ((($contact['notify']) && ($contact['rel'] == CONTACT_IS_FOLLOWER || $contact['rel'] == CONTACT_IS_FRIEND)) ? 1 : 0); + if($contact['network'] === NETWORK_OSTATUS && get_pconfig($importer_uid,'system','ostatus_autofriend')) + $stat_writeable = 1; + if($stat_writeable != $contact['writable']) { q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1", intval($stat_writeable), diff --git a/include/poller.php b/include/poller.php index 113405dbb..7df59f727 100644 --- a/include/poller.php +++ b/include/poller.php @@ -12,7 +12,7 @@ function poller_run(&$argv, &$argc){ if(is_null($db)) { @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; diff --git a/include/queue.php b/include/queue.php index b703f930b..23fcc7d5c 100644 --- a/include/queue.php +++ b/include/queue.php @@ -11,14 +11,14 @@ function queue_run(&$argv, &$argc){ if(is_null($db)){ @include(".htconfig.php"); - require_once("dba.php"); + require_once("include/dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); }; - require_once("session.php"); - require_once("datetime.php"); + require_once("include/session.php"); + require_once("include/datetime.php"); require_once('include/items.php'); require_once('include/bbcode.php'); diff --git a/include/text.php b/include/text.php index 4212e23ca..1d74d9cf5 100644 --- a/include/text.php +++ b/include/text.php @@ -9,19 +9,39 @@ // 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(); + $s->error_reporting = E_ALL & ~E_NOTICE; + } + 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 +441,63 @@ 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(); - $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"); - else - return file_get_contents("view/$s"); +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(); + + // 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 + $template_file = $root . "view/$filename"; + + return $template_file; }} diff --git a/index.php b/index.php index bd5b3e396..dd19bb833 100644 --- a/index.php +++ b/index.php @@ -41,7 +41,7 @@ load_translation_table($lang); * */ -require_once("dba.php"); +require_once("include/dba.php"); if(! $install) { $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); @@ -54,7 +54,7 @@ if(! $install) { load_config('config'); load_config('system'); - require_once("session.php"); + require_once("include/session.php"); load_hooks(); call_hooks('init_1'); } @@ -109,7 +109,7 @@ if((x($_GET,'zrl')) && (! $install)) { // header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";'); if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login')) - require("auth.php"); + require("include/auth.php"); if(! x($_SESSION,'authenticated')) header('X-Account-Management-Status: none'); diff --git a/js/acl.js b/js/acl.js index e383224ca..36cf74970 100644 --- a/js/acl.js +++ b/js/acl.js @@ -248,11 +248,16 @@ ACL.prototype.populate = function(data){ that.list_content.height(height); $(data.items).each(function(){ html = "
"+that.item_tpl+"
"; - html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link ); + html = html.format(this.photo, this.name, this.type, this.id, '', this.network, this.link); if (this.uids!=undefined) that.group_uids[this.id] = this.uids; //console.log(html); that.list_content.append(html); }); + $(".acl-list-item img[data-src]").each(function(i, el){ + // Replace data-src attribute with src attribute for every image + $(el).attr('src', $(el).data("src")); + $(el).removeAttr("data-src"); + }); that.update_view(); } diff --git a/js/main.js b/js/main.js index 4a75be747..5cdf2a080 100644 --- a/js/main.js +++ b/js/main.js @@ -181,7 +181,14 @@ html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); nnm.append(html); }); + + $("img[data-src]", nnm).each(function(i, el){ + // Replace data-src attribute with src attribute for every image + $(el).attr('src', $(el).data("src")); + $(el).removeAttr("data-src"); + }); } + notif = eNotif.attr('count'); if (notif>0){ $("#nav-notifications-linkmenu").addClass("on"); @@ -202,8 +209,7 @@ }); }); - - + NavUpdate(); // Allow folks to stop the ajax page updates with the pause/break key $(document).keydown(function(event) { diff --git a/mod/_well_known.php b/mod/_well_known.php index 155810df3..6792d36fe 100644 --- a/mod/_well_known.php +++ b/mod/_well_known.php @@ -1,5 +1,5 @@ argc > 1) { @@ -11,4 +11,4 @@ function _well_known_init(&$a){ } http_status_exit(404); killme(); -} \ No newline at end of file +} diff --git a/mod/admin.php b/mod/admin.php index 41147fa01..89363541c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -710,6 +710,16 @@ function admin_page_users(&$a){ $users = array_map("_setup_users", $users); + // Get rid of dashes in key names, Smarty3 can't handle them + foreach($users as $key => $user) { + $new_user = array(); + foreach($user as $k => $v) { + $k = str_replace('-','_',$k); + $new_user[$k] = $v; + } + $users[$key] = $new_user; + } + $t = get_markup_template("admin_users.tpl"); $o = replace_macros($t, array( // strings // @@ -1207,7 +1217,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 3ef7b5304..6e62ec8ef 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -346,7 +346,7 @@ 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( + $o .= replace_macros($tpl, array( '$header' => t('Contact Editor'), '$tab_str' => $tab_str, '$submit' => t('Submit'), @@ -388,7 +388,7 @@ function contacts_content(&$a) { '$dir_icon' => $dir_icon, '$alt_text' => $alt_text, '$sparkle' => $sparkle, - '$url' => $url + '$url' => $url, )); @@ -571,7 +571,7 @@ function contacts_content(&$a) { } $tpl = get_markup_template("contacts-template.tpl"); - $o .= replace_macros($tpl,array( + $o .= replace_macros($tpl, array( '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$tabs' => $t, '$total' => $total, diff --git a/mod/content.php b/mod/content.php index c4b0ca2f6..318c37233 100644 --- a/mod/content.php +++ b/mod/content.php @@ -309,7 +309,7 @@ function content_content(&$a, $update = 0) { function render_content(&$a, $items, $mode, $update, $preview = false) { - require_once('bbcode.php'); + require_once('include/bbcode.php'); $ssl_state = ((local_user()) ? true : false); @@ -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/crepair.php b/mod/crepair.php index ec963b105..ec56d7c28 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -76,7 +76,7 @@ function crepair_post(&$a) { if($photo) { logger('mod-crepair: updating photo from ' . $photo); - require_once("Photo.php"); + require_once("include/Photo.php"); $photos = import_profile_photo($photo,local_user(),$contact['id']); diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 8e39f5fd0..f02119807 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -671,7 +671,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { else $photo = $a->get_baseurl() . '/images/person-175.jpg'; - require_once("Photo.php"); + require_once("include/Photo.php"); $photos = import_profile_photo($photo,$local_uid,$dfrn_record); diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index b3033c0aa..5a32d946e 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -110,7 +110,7 @@ function dfrn_request_post(&$a) { * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo */ - require_once('Scrape.php'); + require_once('include/Scrape.php'); $parms = scrape_dfrn($dfrn_url); @@ -358,6 +358,7 @@ function dfrn_request_post(&$a) { intval($uid) ); if(! count($r)) { + notice( t('This account has not been configured for email. Request failed.') . EOL); return; } @@ -504,7 +505,7 @@ function dfrn_request_post(&$a) { } - require_once('Scrape.php'); + require_once('include/Scrape.php'); $parms = scrape_dfrn(($hcard) ? $hcard : $url); @@ -616,7 +617,7 @@ function dfrn_request_post(&$a) { * */ - $url = str_replace('{uri}', $a->get_baseurl() . '/dfrn_poll/' . $nickname, $url); + $url = str_replace('{uri}', $a->get_baseurl() . '/profile/' . $nickname, $url); goaway($url); // NOTREACHED // END $network === NETWORK_OSTATUS diff --git a/mod/directory.php b/mod/directory.php index 833a4f81c..3e138570c 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 6305dd44e..32c4bcae9 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/editpost.php b/mod/editpost.php index d6539e107..c62252bc8 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -1,6 +1,6 @@ $event) { + $event_item = array(); + foreach($event['item'] as $k => $v) { + $k = str_replace('-','_',$k); + $event_item[$k] = $v; + } + $events[$key]['item'] = $event_item; + } + $o = replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), '$tabs' => $tabs, diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 5ee813b4d..075846e50 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 ); } @@ -70,6 +78,7 @@ function fbrowser_content($a){ '$path' => $path, '$folders' => $albums, '$files' =>$files, + '$cancel' => t('Cancel'), )); @@ -83,7 +92,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();
@@ -96,6 +113,7 @@ function fbrowser_content($a){
 					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
 					'$folders' => false,
 					'$files' =>$files,
+					'$cancel' => t('Cancel'),
 				));
 				
 			}
diff --git a/mod/filer.php b/mod/filer.php
index c0cca9e6d..4e79f337d 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -24,6 +24,7 @@ function filer_content(&$a) {
 		$filetags = get_pconfig(local_user(),'system','filetags');
 		$filetags = file_tag_file_to_list($filetags,'file');
                 $filetags = explode(",", $filetags);
+
 		$tpl = get_markup_template("filer_dialog.tpl");
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
diff --git a/mod/follow.php b/mod/follow.php
index 5e48174c9..5c2c764c7 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,6 +1,6 @@
  t('Submit'));
+
+	$context = array(
+			'$submit' => t('Submit'),
+	);
 
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
 		
@@ -217,15 +220,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 9b2411f26..4121764f1 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 91b5e3d2d..7247ebb2c 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -32,7 +32,7 @@ function install_post(&$a) {
 			$dbdata = notags(trim($_POST['dbdata']));
 			$phpath = notags(trim($_POST['phpath']));
 
-			require_once("dba.php");
+			require_once("include/dba.php");
 			unset($db);
 			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
 			/*if(get_db_errno()) {
@@ -177,6 +177,8 @@ function install_content(&$a) {
 
 			check_htconfig($checks);
 
+			check_smarty3($checks);
+
 			check_keys($checks);
 			
 			if(x($_POST,'phpath'))
@@ -249,7 +251,7 @@ function install_content(&$a) {
 			return $o;
 		}; break;
 		case 3: { // Site settings
-			require_once('datetime.php');
+			require_once('include/datetime.php');
 			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
@@ -428,6 +430,22 @@ function check_htconfig(&$checks) {
 
 }
 
+function check_smarty3(&$checks) {
+	$status = true;
+	$help = "";
+	if(	!is_writable('view/smarty3') ) {
+	
+		$status=false;
+		$help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
+		$help .= t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL;
+		$help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL;
+		$help .= t('Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.').EOL; 
+	}
+    
+	check_add($checks, t('view/smarty3 is writable'), $status, true, $help);
+
+}
+
 function check_htaccess(&$checks) {
 	$a = get_app();
 	$status = true;
diff --git a/mod/message.php b/mod/message.php
index 744a3eb3f..057797ddd 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -346,6 +346,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 +364,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 +382,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 +423,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 +459,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,6 +494,14 @@ function message_content(&$a) {
 		$parent = '';
 
 		$tpl = get_markup_template('mail_display.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$subjtxt_e = template_escape($message['title']);
+		}
+		else {
+			$subjtxt_e = $message['title'];
+		}
+
 		$o = replace_macros($tpl, array(
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
diff --git a/mod/nogroup.php b/mod/nogroup.php
index bd1ec82ed..24d99a59b 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -53,8 +53,9 @@ function nogroup_content(&$a) {
 			);
 		}
 	}
+
 	$tpl = get_markup_template("nogroup-template.tpl");
-	$o .= replace_macros($tpl,array(
+	$o .= replace_macros($tpl, 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 b8029fd03..9c14737f7 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -144,7 +144,8 @@ 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(
+
+					$notif_content .= replace_macros($sugg, array(
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => t('Friend Suggestion'),
 						'$intro_id' => $rr['intro_id'],
@@ -161,7 +162,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 +191,7 @@ function notifications_content(&$a) {
 					));
 				}			
 
-				$notif_content .= replace_macros($tpl,array(
+				$notif_content .= replace_macros($tpl, 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 +208,7 @@ function notifications_content(&$a) {
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
 					'$ignore' => t('Ignore'),
-					'$discard' => t('Discard')
+					'$discard' => t('Discard'),
 
 				));
 			}
@@ -215,7 +216,7 @@ function notifications_content(&$a) {
 		else
 			info( t('No introductions.') . EOL);
 
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -301,7 +302,7 @@ function notifications_content(&$a) {
 			$notif_content = t('No more network notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Network Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -331,7 +332,7 @@ function notifications_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('System Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -426,7 +427,7 @@ function notifications_content(&$a) {
 			$notif_content = t('No more personal notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Personal Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
@@ -507,7 +508,7 @@ function notifications_content(&$a) {
 			$notif_content = t('No more home notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('Home Notifications'),
 			'$tabs' => $tabs,
 			'$notif_content' => $notif_content,
diff --git a/mod/notify.php b/mod/notify.php
index ae8273a1d..b4d60a747 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -61,7 +61,7 @@ function notify_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$o .= replace_macros($notif_tpl, array(
 			'$notif_header' => t('System Notifications'),
 			'$tabs' => '', // $tabs,
 			'$notif_content' => $notif_content,
@@ -70,4 +70,4 @@ function notify_content(&$a) {
 	return $o;
 
 
-}
\ No newline at end of file
+}
diff --git a/mod/photos.php b/mod/photos.php
index efccb0e10..7035c6690 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,7 @@ function photos_content(&$a) {
 	}
 	
 	$tpl = get_markup_template('photos_recent.tpl'); 
-	$o .= replace_macros($tpl,array(
+	$o .= replace_macros($tpl, 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 cb9abb340..ae5f0cef4 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -159,4 +159,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 25871c240..9e9af1983 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -33,6 +33,7 @@ function profile_init(&$a) {
 		auto_redir($a, $which);
 	}
 
+	set_template_engine($a); // 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 d1f77a3db..4a5e52315 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,6 @@
 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 7cfdbb1cd..dbdd40bc3 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -668,7 +668,6 @@ function settings_content(&$a) {
 			'$title'	=> t('Additional Features'),
 			'$features' => $arr,
 			'$submit'   => t('Submit'),
-			'$field_yesno'	=> 'field_yesno.tpl',
 		));
 		return $o;
 	}
@@ -715,6 +714,7 @@ function settings_content(&$a) {
 			$mail_disabled_message = (($mail_disabled) ? t('Email access is disabled on this site.') : '');
 		}
 	
+
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("settings_connectors"),
 			
@@ -891,7 +891,7 @@ function settings_content(&$a) {
 
 
 	$pageset_tpl = get_markup_template('pagetypes.tpl');
-	$pagetype = replace_macros($pageset_tpl,array(
+	$pagetype = replace_macros($pageset_tpl, 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 +1012,7 @@ 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(
+	$o .= replace_macros($stpl, array(
 		'$ptitle' 	=> t('Account Settings'),
 
 		'$submit' 	=> t('Submit'),
diff --git a/mod/share.php b/mod/share.php
index e307294a6..516ff98e7 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,6 +1,6 @@
  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/wall_upload.php b/mod/wall_upload.php
index 6a6b894fb..d35b703aa 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,6 @@
  $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 000000000..6037d04ea
--- /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 5cea341f0..0ea9954b0 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -221,6 +221,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(),
 
@@ -234,8 +251,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'])),
@@ -245,20 +262,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,
@@ -473,11 +490,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/util/db_update.php b/util/db_update.php
index 978594ab9..ef85606cc 100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -14,7 +14,7 @@ $a = new App;
 $lang = get_browser_language();
 load_translation_table($lang);
 
-require_once("dba.php");
+require_once("include/dba.php");
 $db = new dba($db_host, $db_user, $db_pass, $db_data, false);
         unset($db_host, $db_user, $db_pass, $db_data);
 
diff --git a/util/messages.po b/util/messages.po
index 0d244a01e..a66a51973 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1561\n"
+"Project-Id-Version: 3.1.1572\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-18 10:00-0800\n"
+"POT-Creation-Date: 2012-12-29 10:00-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -40,8 +40,8 @@ msgstr ""
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -60,7 +60,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166
 #: ../../addon/fbpost/fbpost.php:172
 #: ../../addon/dav/friendica/layout.fnk.php:354
-#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987
 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@@ -93,8 +93,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:731 ../../mod/admin.php:741
 msgid "Name"
 msgstr ""
 
@@ -131,18 +131,18 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/install.php:246
-#: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
-#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
-#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
-#: ../../mod/admin.php:1115 ../../mod/profiles.php:604
+#: ../../mod/events.php:466 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1118 ../../mod/photos.php:1402
+#: ../../mod/photos.php:1442 ../../mod/photos.php:1486
+#: ../../mod/photos.php:1569 ../../mod/install.php:248
+#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199
+#: ../../mod/content.php:710 ../../mod/contacts.php:352
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137
+#: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461
+#: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064
+#: ../../mod/admin.php:1151 ../../mod/profiles.php:604
 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64
@@ -151,8 +151,8 @@ msgstr ""
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/remote_permissions/remote_permissions.php:47
-#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/remote_permissions/remote_permissions.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:196
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
 #: ../../addon/forumlist/forumlist.php:178
@@ -164,7 +164,7 @@ msgstr ""
 #: ../../addon/libravatar/libravatar.php:99
 #: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
 #: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:99
 #: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
@@ -173,18 +173,18 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233
+#: ../../addon/statusnet/statusnet.php:703 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -284,86 +284,87 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:323 ../../include/text.php:1190
+#: ../../mod/events.php:323 ../../include/text.php:1246
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:92
+#: ../../include/nav.php:52 ../../boot.php:1791
 msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:348
+#: ../../mod/events.php:359
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:360 ../../addon/dav/friendica/layout.fnk.php:263
 #: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:350 ../../mod/install.php:205
+#: ../../mod/events.php:361 ../../mod/install.php:207
 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:423
+#: ../../mod/events.php:434
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:433
+#: ../../mod/events.php:444
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:434
+#: ../../mod/events.php:445
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:436
+#: ../../mod/events.php:447
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:436 ../../mod/events.php:450
+#: ../../mod/events.php:447 ../../mod/events.php:461
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:450
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:441
+#: ../../mod/events.php:452
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:444
+#: ../../mod/events.php:455
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:457
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../mod/events.php:459 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1312
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:461
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:463
 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1009
+#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81
+#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1045
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@@ -409,44 +410,44 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:836
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:837
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1784
 msgid "Photo Albums"
 msgstr ""
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
-#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:492
+#: ../../mod/photos.php:1102 ../../mod/photos.php:1125
+#: ../../mod/photos.php:1626 ../../mod/photos.php:1638
+#: ../../addon/communityhome/communityhome.php:112
+#: ../../view/theme/diabook/theme.php:493
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
+#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685
 msgid "Upload New Photos"
 msgstr ""
 
@@ -458,13 +459,13 @@ msgstr ""
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
-#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1102
+#: ../../mod/photos.php:1125 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:112
-#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
+#: ../../addon/communityhome/communityhome.php:113
+#: ../../view/theme/diabook/theme.php:494 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@@ -474,11 +475,11 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:182 ../../mod/photos.php:1101
+#: ../../mod/photos.php:182 ../../mod/photos.php:1119
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:245 ../../mod/photos.php:1364
+#: ../../mod/photos.php:245 ../../mod/photos.php:1403
 msgid "Delete Photo"
 msgstr ""
 
@@ -511,7 +512,7 @@ msgid "Image upload failed."
 msgstr ""
 
 #: ../../mod/photos.php:865 ../../mod/community.php:18
-#: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:761 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
 #: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
@@ -530,156 +531,156 @@ msgstr ""
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1043
+#: ../../mod/photos.php:1053
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1114
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1048
+#: ../../mod/photos.php:1058
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1049
+#: ../../mod/photos.php:1059
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
+#: ../../mod/photos.php:1061 ../../mod/photos.php:1398
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1111
+#: ../../mod/photos.php:1129
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1117
+#: ../../mod/photos.php:1135
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:1119
+#: ../../mod/photos.php:1137
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
+#: ../../mod/photos.php:1170 ../../mod/photos.php:1668
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1178
+#: ../../mod/photos.php:1205
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1207
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1263
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1237
+#: ../../mod/photos.php:1264
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1243 ../../mod/content.php:603
+#: ../../mod/photos.php:1270 ../../mod/content.php:620
 #: ../../object/Item.php:105
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1262
+#: ../../mod/photos.php:1289
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1336
+#: ../../mod/photos.php:1363
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1366
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1349
+#: ../../mod/photos.php:1388
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1350
+#: ../../mod/photos.php:1389
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1391
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1394
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1357
+#: ../../mod/photos.php:1396
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1361
+#: ../../mod/photos.php:1400
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1381 ../../mod/content.php:667
+#: ../../mod/photos.php:1420 ../../mod/content.php:684
 #: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1382 ../../mod/content.php:668
+#: ../../mod/photos.php:1421 ../../mod/content.php:685
 #: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1383 ../../include/conversation.php:969
+#: ../../mod/photos.php:1422 ../../include/conversation.php:1005
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
-#: ../../mod/content.php:482 ../../mod/content.php:848
+#: ../../mod/photos.php:1423 ../../mod/editpost.php:121
+#: ../../mod/content.php:499 ../../mod/content.php:883
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300
-#: ../../mod/message.php:488 ../../include/conversation.php:624
-#: ../../include/conversation.php:988 ../../object/Item.php:270
+#: ../../mod/message.php:528 ../../include/conversation.php:645
+#: ../../include/conversation.php:1024 ../../object/Item.php:287
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
-#: ../../mod/photos.php:1516 ../../mod/content.php:690
-#: ../../object/Item.php:574
+#: ../../mod/photos.php:1439 ../../mod/photos.php:1483
+#: ../../mod/photos.php:1566 ../../mod/content.php:707
+#: ../../object/Item.php:600
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
-#: ../../object/Item.php:267 ../../object/Item.php:576
+#: ../../mod/photos.php:1441 ../../mod/photos.php:1485
+#: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635
+#: ../../object/Item.php:284 ../../object/Item.php:602
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
-#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
-#: ../../mod/content.php:702 ../../include/conversation.php:1006
-#: ../../object/Item.php:586
+#: ../../mod/photos.php:1443 ../../mod/photos.php:1487
+#: ../../mod/photos.php:1570 ../../mod/editpost.php:142
+#: ../../mod/content.php:719 ../../include/conversation.php:1042
+#: ../../object/Item.php:612
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
-#: ../../mod/group.php:168 ../../mod/admin.php:699
+#: ../../mod/photos.php:1527 ../../mod/content.php:439
+#: ../../mod/content.php:741 ../../mod/settings.php:623
+#: ../../mod/group.php:171 ../../mod/admin.php:735
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1601
+#: ../../mod/photos.php:1674
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1610
+#: ../../mod/photos.php:1683
 msgid "Recent Photos"
 msgstr ""
 
@@ -687,7 +688,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:94
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@@ -737,96 +738,96 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:955
+#: ../../mod/editpost.php:91 ../../include/conversation.php:991
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/editpost.php:106 ../../mod/content.php:728
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:298 ../../mod/message.php:485
-#: ../../include/conversation.php:970
+#: ../../mod/message.php:298 ../../mod/message.php:525
+#: ../../include/conversation.php:1006
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:971
+#: ../../mod/editpost.php:108 ../../include/conversation.php:1007
 msgid "upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:972
+#: ../../mod/editpost.php:109 ../../include/conversation.php:1008
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:973
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1009
 msgid "attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:299 ../../mod/message.php:486
-#: ../../include/conversation.php:974
+#: ../../mod/message.php:299 ../../mod/message.php:526
+#: ../../include/conversation.php:1010
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:975
+#: ../../mod/editpost.php:112 ../../include/conversation.php:1011
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:976
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1012
 msgid "Insert video link"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:977
+#: ../../mod/editpost.php:114 ../../include/conversation.php:1013
 msgid "video link"
 msgstr ""
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:978
+#: ../../mod/editpost.php:115 ../../include/conversation.php:1014
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:979
+#: ../../mod/editpost.php:116 ../../include/conversation.php:1015
 msgid "audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:980
+#: ../../mod/editpost.php:117 ../../include/conversation.php:1016
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:981
+#: ../../mod/editpost.php:118 ../../include/conversation.php:1017
 msgid "set location"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:119 ../../include/conversation.php:1018
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:983
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1019
 msgid "clear location"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:989
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1025
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:130 ../../include/conversation.php:998
+#: ../../mod/editpost.php:130 ../../include/conversation.php:1034
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:999
+#: ../../mod/editpost.php:131 ../../include/conversation.php:1035
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:985
+#: ../../mod/editpost.php:134 ../../include/conversation.php:1021
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:136 ../../include/conversation.php:987
+#: ../../mod/editpost.php:136 ../../include/conversation.php:1023
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:137 ../../include/conversation.php:1001
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1037
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -834,19 +835,19 @@ msgstr ""
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:513
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:518
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:520
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:523
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
@@ -886,140 +887,140 @@ msgstr ""
 msgid "Invalid email address."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:362
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:458
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:470
+#: ../../mod/dfrn_request.php:471
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:474
+#: ../../mod/dfrn_request.php:475
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:496
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
+#: ../../mod/dfrn_request.php:502 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124
+#: ../../mod/dfrn_request.php:571 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:591
+#: ../../mod/dfrn_request.php:592
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:645
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:658
+#: ../../mod/dfrn_request.php:659
 msgid ""
 "Incorrect identity currently logged in. Please login to this profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:670
 msgid "Hide this contact"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:672
-#, php-format
-msgid "Welcome home %s."
-msgstr ""
-
 #: ../../mod/dfrn_request.php:673
 #, php-format
-msgid "Please confirm your introduction/connection request to %s."
+msgid "Welcome home %s."
 msgstr ""
 
 #: ../../mod/dfrn_request.php:674
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:675
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
+#: ../../mod/dfrn_request.php:716 ../../include/items.php:3366
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:810
+#: ../../mod/dfrn_request.php:811
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:827
 msgid "Connect as an email follower (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:829
 msgid ""
 "If you are not yet a member of the free social web, follow this link to find a public Friendica site "
 "and join us today."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:831
+#: ../../mod/dfrn_request.php:832
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:833
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:833
+#: ../../mod/dfrn_request.php:834
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:835
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:838
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:840 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:841
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:842
+#: ../../mod/dfrn_request.php:843
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:843
+#: ../../mod/dfrn_request.php:844
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:846
+#: ../../mod/dfrn_request.php:847
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr ""
 
@@ -1048,10 +1049,10 @@ msgid "Remove account"
 msgstr ""
 
 #: ../../mod/uexport.php:48 ../../mod/settings.php:74
-#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
+#: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:659 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1100,239 +1101,268 @@ msgid ""
 "or mysql."
 msgstr ""
 
-#: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:488
+#: ../../mod/install.php:139 ../../mod/install.php:206
+#: ../../mod/install.php:506
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/install.php:201
+#: ../../mod/install.php:203
 msgid "System check"
 msgstr ""
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:208
 msgid "Check again"
 msgstr ""
 
-#: ../../mod/install.php:225
+#: ../../mod/install.php:227
 msgid "Database connection"
 msgstr ""
 
-#: ../../mod/install.php:226
+#: ../../mod/install.php:228
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../mod/install.php:227
+#: ../../mod/install.php:229
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:230
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:234
 msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:235
 msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/install.php:234
+#: ../../mod/install.php:236
 msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/install.php:235
+#: ../../mod/install.php:237
 msgid "Database Name"
 msgstr ""
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/install.php:236 ../../mod/install.php:275
+#: ../../mod/install.php:238 ../../mod/install.php:277
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../mod/install.php:240 ../../mod/install.php:278
+#: ../../mod/install.php:242 ../../mod/install.php:280
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/install.php:265
+#: ../../mod/install.php:267
 msgid "Site settings"
 msgstr ""
 
-#: ../../mod/install.php:318
+#: ../../mod/install.php:320
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/install.php:319
+#: ../../mod/install.php:321
 msgid ""
 "If you don't have a command line version of PHP installed on server, you "
 "will not be able to run background polling via cron. See 'Activating scheduled tasks'"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:325
 msgid ""
 "Enter full path to php executable. You can leave this blank to continue the "
 "installation."
 msgstr ""
 
-#: ../../mod/install.php:328
+#: ../../mod/install.php:330
 msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/install.php:337
+#: ../../mod/install.php:339
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/install.php:338
+#: ../../mod/install.php:340
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:342
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:361
+#: ../../mod/install.php:363
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:362
+#: ../../mod/install.php:364
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:366
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:371
+#: ../../mod/install.php:373
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/install.php:372
+#: ../../mod/install.php:374
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/install.php:373
+#: ../../mod/install.php:375
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:376
 msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:377
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/install.php:380 ../../mod/install.php:382
+#: ../../mod/install.php:382 ../../mod/install.php:384
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/install.php:380
+#: ../../mod/install.php:382
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:388
+#: ../../mod/install.php:390
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:392
+#: ../../mod/install.php:394
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:396
+#: ../../mod/install.php:398
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:400
+#: ../../mod/install.php:402
 msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:404
+#: ../../mod/install.php:406
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:421
+#: ../../mod/install.php:423
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/install.php:422
+#: ../../mod/install.php:424
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:425
 msgid ""
 "At the end of this procedure, we will give you a text to save in a file "
 "named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:426
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:427
+#: ../../mod/install.php:429
 msgid ".htconfig.php is writable"
 msgstr ""
 
 #: ../../mod/install.php:439
 msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+"Friendica uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../mod/install.php:440
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory view/smarty3/ under the Friendica top level "
+"folder."
 msgstr ""
 
 #: ../../mod/install.php:441
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
+msgstr ""
+
+#: ../../mod/install.php:442
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"view/smarty3/ only--not the template files (.tpl) that it contains."
+msgstr ""
+
+#: ../../mod/install.php:445
+msgid "view/smarty3 is writable"
+msgstr ""
+
+#: ../../mod/install.php:457
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr ""
+
+#: ../../mod/install.php:459
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/install.php:451
+#: ../../mod/install.php:469
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../mod/install.php:475
+#: ../../mod/install.php:493
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/install.php:486
+#: ../../mod/install.php:504
 msgid "
What next
"
 msgstr ""
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:505
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1398,7 +1428,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1250
 msgid "Connect"
 msgstr ""
 
@@ -1411,7 +1441,7 @@ msgid "Remote privacy information not available."
 msgstr ""
 
 #: ../../mod/lockview.php:48
-#: ../../addon/remote_permissions/remote_permissions.php:123
+#: ../../addon/remote_permissions/remote_permissions.php:124
 msgid "Visible to:"
 msgstr ""
 
@@ -1427,135 +1457,135 @@ msgstr ""
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/content.php:438 ../../mod/content.php:723
+#: ../../mod/content.php:438 ../../mod/content.php:740
 #: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr ""
 
-#: ../../mod/content.php:455 ../../mod/content.php:817
-#: ../../mod/content.php:818 ../../include/conversation.php:587
-#: ../../object/Item.php:235 ../../object/Item.php:236
+#: ../../mod/content.php:472 ../../mod/content.php:852
+#: ../../mod/content.php:853 ../../include/conversation.php:608
+#: ../../object/Item.php:252 ../../object/Item.php:253
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../mod/content.php:465 ../../mod/content.php:829
-#: ../../include/conversation.php:607 ../../object/Item.php:249
+#: ../../mod/content.php:482 ../../mod/content.php:864
+#: ../../include/conversation.php:628 ../../object/Item.php:266
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:622
+#: ../../mod/content.php:497 ../../include/conversation.php:643
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../object/Item.php:289
+#: ../../mod/content.php:603 ../../object/Item.php:306
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/content.php:588 ../../include/text.php:1446
-#: ../../object/Item.php:291 ../../object/Item.php:304
+#: ../../mod/content.php:605 ../../include/text.php:1502
+#: ../../object/Item.php:308 ../../object/Item.php:321
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/content.php:589 ../../addon/page/page.php:77
+#: ../../mod/content.php:606 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
-#: ../../object/Item.php:292 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:636
+#: ../../object/Item.php:309 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:667 ../../object/Item.php:203
+#: ../../mod/content.php:684 ../../object/Item.php:203
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../object/Item.php:204
+#: ../../mod/content.php:685 ../../object/Item.php:204
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../object/Item.php:206
+#: ../../mod/content.php:687 ../../object/Item.php:206
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../object/Item.php:578
+#: ../../mod/content.php:711 ../../object/Item.php:604
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../object/Item.php:579
+#: ../../mod/content.php:712 ../../object/Item.php:605
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../object/Item.php:580
+#: ../../mod/content.php:713 ../../object/Item.php:606
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../object/Item.php:581
+#: ../../mod/content.php:714 ../../object/Item.php:607
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../object/Item.php:582
+#: ../../mod/content.php:715 ../../object/Item.php:608
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../object/Item.php:583
+#: ../../mod/content.php:716 ../../object/Item.php:609
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:700 ../../object/Item.php:584
+#: ../../mod/content.php:717 ../../object/Item.php:610
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:701 ../../object/Item.php:585
+#: ../../mod/content.php:718 ../../object/Item.php:611
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:736 ../../object/Item.php:182
+#: ../../mod/content.php:753 ../../object/Item.php:182
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../object/Item.php:183
+#: ../../mod/content.php:754 ../../object/Item.php:183
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../object/Item.php:184
+#: ../../mod/content.php:755 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:741 ../../object/Item.php:187
+#: ../../mod/content.php:758 ../../object/Item.php:187
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:742 ../../object/Item.php:192
+#: ../../mod/content.php:759 ../../object/Item.php:192
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:746 ../../object/Item.php:122
+#: ../../mod/content.php:763 ../../object/Item.php:122
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:819 ../../object/Item.php:237
+#: ../../mod/content.php:854 ../../object/Item.php:254
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:820 ../../object/Item.php:239
+#: ../../mod/content.php:855 ../../object/Item.php:256
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:821 ../../object/Item.php:240
+#: ../../mod/content.php:856 ../../object/Item.php:257
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:183
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1565,13 +1595,13 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:210
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:165
+#: ../../mod/notifications.php:211
 msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:325
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210 ../../mod/contacts.php:325
 #: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr ""
@@ -1588,7 +1618,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr ""
@@ -1610,139 +1640,139 @@ msgstr ""
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:195
 msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/notifications.php:149
+#: ../../mod/notifications.php:150
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:151
+#: ../../mod/notifications.php:152
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
 #: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/notifications.php:158 ../../mod/notifications.php:205
 msgid "if applicable"
 msgstr ""
 
-#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:697
+#: ../../mod/notifications.php:161 ../../mod/notifications.php:208
+#: ../../mod/admin.php:733
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:181
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:187
+#: ../../mod/notifications.php:188
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:189
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:189
+#: ../../mod/notifications.php:190
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:196
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:216
+#: ../../mod/notifications.php:217
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:123
+#: ../../mod/notifications.php:220 ../../include/nav.php:123
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
-#: ../../mod/notifications.php:468
+#: ../../mod/notifications.php:257 ../../mod/notifications.php:382
+#: ../../mod/notifications.php:469
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
-#: ../../mod/notifications.php:477
+#: ../../mod/notifications.php:266 ../../mod/notifications.php:391
+#: ../../mod/notifications.php:478
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
-#: ../../mod/notifications.php:491
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:492
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:288 ../../mod/notifications.php:413
+#: ../../mod/notifications.php:501
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:301
+#: ../../mod/notifications.php:302
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:305
+#: ../../mod/notifications.php:306
 msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:331 ../../mod/notify.php:61
+#: ../../mod/notifications.php:332 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:335 ../../mod/notify.php:65
+#: ../../mod/notifications.php:336 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:427
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:430
+#: ../../mod/notifications.php:431
 msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:507
+#: ../../mod/notifications.php:508
 msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:511
+#: ../../mod/notifications.php:512
 msgid "Home Notifications"
 msgstr ""
 
@@ -1838,12 +1868,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:701
+#: ../../mod/admin.php:737
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:319 ../../mod/contacts.php:378
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:736
 msgid "Block"
 msgstr ""
 
@@ -1940,7 +1970,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:375 ../../mod/admin.php:1173
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1209
 msgid "Update now"
 msgstr ""
 
@@ -1969,7 +1999,7 @@ msgstr ""
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:444 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:194
 msgid "All Contacts"
 msgstr ""
 
@@ -2033,8 +2063,8 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr ""
 
@@ -2070,10 +2100,10 @@ msgstr ""
 #: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:805
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3375
+#: ../../boot.php:852 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2087,7 +2117,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:990
 msgid "Password Reset"
 msgstr ""
 
@@ -2139,69 +2169,69 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:457
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
-#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../addon/remote_permissions/remote_permissions.php:205
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:504
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2211,69 +2241,69 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../addon/statusnet/statusnet.php:694
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:697
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
-#: ../../addon/statusnet/statusnet.php:693
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../addon/statusnet/statusnet.php:696
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr ""
 
@@ -2298,368 +2328,368 @@ msgstr ""
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:420
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
 msgid "Profile is not published."
 msgstr ""
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an interesting profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2762,16 +2792,16 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1798
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../mod/notes.php:63 ../../mod/filer.php:31
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:346
 #: ../../addon/fbpost/fbpost.php:314
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:741
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2795,14 +2825,20 @@ msgid "Move account"
 msgstr ""
 
 #: ../../mod/uimport.php:67
+msgid "You can import an account from another Friendica server."
+msgstr ""
+
+#: ../../mod/uimport.php:68
 msgid ""
-"You can import an account from another Friendica server. 
\r\n"
-"                            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."
-"
\r\n"
-"                            This feature is experimental. We can't import "
-"contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+"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."
+msgstr ""
+
+#: ../../mod/uimport.php:69
+msgid ""
+"This feature is experimental. We can't import contacts from the OStatus "
+"network (statusnet/identi.ca) or from Diaspora"
 msgstr ""
 
 #: ../../mod/uimport.php:70
@@ -2846,7 +2882,8 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:249 ../../mod/message.php:257
-#: ../../include/conversation.php:905 ../../include/conversation.php:923
+#: ../../mod/message.php:429 ../../mod/message.php:437
+#: ../../include/conversation.php:941 ../../include/conversation.php:959
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2862,17 +2899,17 @@ msgid ""
 msgstr ""
 
 #: ../../mod/wallmessage.php:140 ../../mod/message.php:286
-#: ../../mod/message.php:476
+#: ../../mod/message.php:516
 msgid "To:"
 msgstr ""
 
 #: ../../mod/wallmessage.php:141 ../../mod/message.php:291
-#: ../../mod/message.php:478
+#: ../../mod/message.php:518
 msgid "Subject:"
 msgstr ""
 
 #: ../../mod/wallmessage.php:147 ../../mod/message.php:295
-#: ../../mod/message.php:481 ../../mod/invite.php:113
+#: ../../mod/message.php:521 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr ""
 
@@ -2927,9 +2964,9 @@ msgid ""
 msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1774
 msgid "Profile"
 msgstr ""
 
@@ -3092,7 +3129,7 @@ msgstr ""
 msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/group.php:47 ../../mod/group.php:137
+#: ../../mod/group.php:47 ../../mod/group.php:140
 msgid "Group not found."
 msgstr ""
 
@@ -3104,31 +3141,31 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/group.php:90
+#: ../../mod/group.php:93
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/group.php:91 ../../mod/group.php:177
+#: ../../mod/group.php:94 ../../mod/group.php:180
 msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/group.php:110
+#: ../../mod/group.php:113
 msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:112
+#: ../../mod/group.php:115
 msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:176
+#: ../../mod/group.php:179
 msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:189
+#: ../../mod/group.php:192
 msgid "Members"
 msgstr ""
 
-#: ../../mod/group.php:221 ../../mod/profperm.php:105
+#: ../../mod/group.php:223 ../../mod/profperm.php:105
 msgid "Click on a contact to add or remove."
 msgstr ""
 
@@ -3152,7 +3189,7 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:678
 msgid "View Contacts"
 msgstr ""
 
@@ -3211,7 +3248,7 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:260 ../../mod/admin.php:446
+#: ../../mod/register.php:260 ../../mod/admin.php:462
 msgid "Registration"
 msgstr ""
 
@@ -3234,7 +3271,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:951
 msgid "Register"
 msgstr ""
 
@@ -3243,9 +3280,9 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:164
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
-#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:166
+#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1498
+#: ../../include/diaspora.php:1851 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
@@ -3253,10 +3290,10 @@ msgstr ""
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:159
-#: ../../addon/communityhome/communityhome.php:168
-#: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
+#: ../../addon/communityhome/communityhome.php:161
+#: ../../addon/communityhome/communityhome.php:170
+#: ../../view/theme/diabook/theme.php:460
+#: ../../view/theme/diabook/theme.php:469 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3266,8 +3303,8 @@ msgid "status"
 msgstr ""
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:173
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
+#: ../../addon/communityhome/communityhome.php:175
+#: ../../view/theme/diabook/theme.php:474 ../../include/diaspora.php:1867
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3281,8 +3318,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3843
+#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:39
+#: ../../mod/display.php:169 ../../include/items.php:3853
 msgid "Item not found."
 msgstr ""
 
@@ -3290,12 +3327,12 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:51 ../../boot.php:1781
 msgid "Photos"
 msgstr ""
 
-#: ../../mod/fbrowser.php:96
+#: ../../mod/fbrowser.php:113
 msgid "Files"
 msgstr ""
 
@@ -3481,36 +3518,36 @@ msgstr ""
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:357 ../../mod/message.php:469
+#: ../../mod/message.php:368 ../../mod/message.php:509
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:360
+#: ../../mod/message.php:371
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:363
+#: ../../mod/message.php:374
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:398
+#: ../../mod/message.php:413
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:451
+#: ../../mod/message.php:483
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:471
+#: ../../mod/message.php:511
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:475
+#: ../../mod/message.php:515
 msgid "Send Reply"
 msgstr ""
 
@@ -3527,19 +3564,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:444
+#: ../../mod/admin.php:96 ../../mod/admin.php:460
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704
+#: ../../mod/admin.php:97 ../../mod/admin.php:727 ../../mod/admin.php:740
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828
+#: ../../mod/admin.php:98 ../../mod/admin.php:822 ../../mod/admin.php:864
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027
+#: ../../mod/admin.php:99 ../../mod/admin.php:1027 ../../mod/admin.php:1063
 msgid "Themes"
 msgstr ""
 
@@ -3547,11 +3584,11 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1150
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr ""
 
@@ -3563,19 +3600,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:672
+#: ../../mod/admin.php:183 ../../mod/admin.php:698
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:673
+#: ../../mod/admin.php:184 ../../mod/admin.php:699
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:674
+#: ../../mod/admin.php:185 ../../mod/admin.php:700
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:675
+#: ../../mod/admin.php:186 ../../mod/admin.php:701
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -3591,9 +3628,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690
-#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990
-#: ../../mod/admin.php:1026 ../../mod/admin.php:1113
+#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:726
+#: ../../mod/admin.php:821 ../../mod/admin.php:863 ../../mod/admin.php:1026
+#: ../../mod/admin.php:1062 ../../mod/admin.php:1149
 msgid "Administration"
 msgstr ""
 
@@ -3617,578 +3654,626 @@ msgstr ""
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:375
+#: ../../mod/admin.php:391
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:446
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:447
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:448
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:452
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:453
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:454
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:463
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:464
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:465
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691
+#: ../../mod/admin.php:466
+msgid "Performance"
+msgstr ""
+
+#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:471
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:472
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:473
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:474
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:475
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:476
+msgid "'Share' element"
+msgstr ""
+
+#: ../../mod/admin.php:476
+msgid "Activates the bbcode element 'share' for repeating items."
+msgstr ""
+
+#: ../../mod/admin.php:477
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:477
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 msgid "Maximum image length"
 msgstr ""
 
-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:478
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is -"
 "1, which means no limits."
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 msgid "JPEG image quality"
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:479
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:481
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:482
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user "
 "registrations to accept per day.  If register is set to closed, this setting "
 "has no effect."
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:483
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:484
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:485
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:486
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:487
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:488
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:489
 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:490
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:491
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:493
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:494
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:495
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:496
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:497
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:498
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:499
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:500
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:501
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:502
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:503
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:504
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:505
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:506
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:507
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:509
+msgid "Use MySQL full text engine"
+msgstr ""
+
+#: ../../mod/admin.php:509
+msgid ""
+"Activates the full text engine. Speeds up search - but can only search for "
+"four and more characters."
+msgstr ""
+
+#: ../../mod/admin.php:510
+msgid "Path to item cache"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid "Cache duration in seconds"
+msgstr ""
+
+#: ../../mod/admin.php:511
+msgid ""
+"How long should the cache files be hold? Default value is 86400 seconds (One "
+"day)."
+msgstr ""
+
+#: ../../mod/admin.php:512
+msgid "Path for lock file"
+msgstr ""
+
+#: ../../mod/admin.php:513
+msgid "Temp path"
+msgstr ""
+
+#: ../../mod/admin.php:514
+msgid "Base path to installation"
+msgstr ""
+
+#: ../../mod/admin.php:532
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:542
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:519
+#: ../../mod/admin.php:545
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:549
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:552
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:541
+#: ../../mod/admin.php:567
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:571
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:572
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:573
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:548
+#: ../../mod/admin.php:574
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:580
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:619
+#: ../../mod/admin.php:645
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:627
+#: ../../mod/admin.php:653
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:729
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:730
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:731
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/admin.php:731 ../../mod/admin.php:741
 #: ../../include/contact_selectors.php:79
 #: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:696
+#: ../../mod/admin.php:732
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:698
+#: ../../mod/admin.php:734
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:738
 msgid "Site admin"
 msgstr ""
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:741
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:707
+#: ../../mod/admin.php:743
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:708
+#: ../../mod/admin.php:744
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:749
+#: ../../mod/admin.php:785
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:753
+#: ../../mod/admin.php:789
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:763 ../../mod/admin.php:961
+#: ../../mod/admin.php:799 ../../mod/admin.php:997
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:765 ../../mod/admin.php:963
+#: ../../mod/admin.php:801 ../../mod/admin.php:999
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:787 ../../mod/admin.php:992
+#: ../../mod/admin.php:823 ../../mod/admin.php:1028
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:795 ../../mod/admin.php:1002
+#: ../../mod/admin.php:831 ../../mod/admin.php:1038
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:796 ../../mod/admin.php:1003
+#: ../../mod/admin.php:832 ../../mod/admin.php:1039
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:925
+#: ../../mod/admin.php:961
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:984
+#: ../../mod/admin.php:1020
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1032
+#: ../../mod/admin.php:1068
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1033
+#: ../../mod/admin.php:1069
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1060
+#: ../../mod/admin.php:1096
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1152
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1158
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1159
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1124
+#: ../../mod/admin.php:1160
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1210
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1216
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1181
+#: ../../mod/admin.php:1217
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1182
+#: ../../mod/admin.php:1218
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1183
+#: ../../mod/admin.php:1219
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1160
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:155 ../../mod/display.php:87
+#: ../../mod/profile.php:156 ../../mod/display.php:87
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:180
+#: ../../mod/profile.php:181
 msgid "Tips for New Members"
 msgstr ""
 
@@ -4237,7 +4322,7 @@ msgstr ""
 msgid "{0} mentioned you in a post"
 msgstr ""
 
-#: ../../mod/nogroup.php:58
+#: ../../mod/nogroup.php:59
 msgid "Contacts who are not members of a group"
 msgstr ""
 
@@ -4250,8 +4335,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:110
-#: ../../include/auth.php:173
+#: ../../mod/openid.php:93 ../../include/auth.php:112
+#: ../../include/auth.php:175
 msgid "Login failed."
 msgstr ""
 
@@ -4272,7 +4357,7 @@ msgstr ""
 msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/share.php:28
+#: ../../mod/share.php:43
 msgid "link"
 msgstr ""
 
@@ -4288,8 +4373,8 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:99 ../../include/text.php:685
-#: ../../include/text.php:686 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:738
+#: ../../include/text.php:739 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
@@ -4586,32 +4671,32 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1278
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1279
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1289
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1292
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1293
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:909
-#: ../../include/conversation.php:927
+#: ../../mod/filer.php:30 ../../include/conversation.php:945
+#: ../../include/conversation.php:963
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../mod/filer.php:29
+#: ../../mod/filer.php:30
 msgid "- select -"
 msgstr ""
 
@@ -4624,7 +4709,7 @@ msgstr ""
 msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr ""
 
@@ -4699,7 +4784,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:521
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -4715,7 +4800,7 @@ msgid "Ignore/Hide"
 msgstr ""
 
 #: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
-#: ../../view/theme/diabook/theme.php:518
+#: ../../view/theme/diabook/theme.php:519
 msgid "Global Directory"
 msgstr ""
 
@@ -4734,19 +4819,19 @@ msgstr ""
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1314
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1317
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1319
 msgid "Homepage:"
 msgstr ""
 
@@ -4756,8 +4841,8 @@ msgstr ""
 msgid "About:"
 msgstr ""
 
-#: ../../mod/directory.php:180
-#: ../../addon/forumdirectory/forumdirectory.php:202
+#: ../../mod/directory.php:187
+#: ../../addon/forumdirectory/forumdirectory.php:203
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -5169,7 +5254,7 @@ msgstr ""
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:471
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5177,31 +5262,31 @@ msgid ""
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:750
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:787
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:827
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:828
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:829
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5228,27 +5313,27 @@ msgstr ""
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:343
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:348
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:351
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:353
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:355
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
@@ -5281,7 +5366,12 @@ msgstr ""
 msgid "Facebook Post Settings"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/fbpost/fbpost.php:367
+#, php-format
+msgid "%s:"
+msgstr ""
+
+#: ../../addon/widgets/widget_like.php:59
 #: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
@@ -5289,7 +5379,7 @@ msgid_plural "%d people like this"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../addon/widgets/widget_like.php:61
+#: ../../addon/widgets/widget_like.php:62
 #: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
@@ -5302,15 +5392,15 @@ msgstr[1] ""
 msgid "Get added to this list!"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:57 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:60 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:62 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr ""
 
@@ -5632,7 +5722,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../include/nav.php:64 ../../boot.php:976
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5654,25 +5744,25 @@ msgstr ""
 msgid "Latest users"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/communityhome.php:82
 #: ../../addon/communityhome/twillingham/communityhome.php:81
 #: ../../addon.old/communityhome/communityhome.php:81
 #: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:98
+#: ../../addon/communityhome/communityhome.php:99
 #: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:134
+#: ../../addon/communityhome/communityhome.php:136
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:156
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1496
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5826,7 +5916,7 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5837,7 +5927,7 @@ msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5845,35 +5935,35 @@ msgid "Monday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:975
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6240,8 +6330,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6489,43 +6579,43 @@ msgstr ""
 msgid "Post to dreamwidth by default"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:44
+#: ../../addon/remote_permissions/remote_permissions.php:45
 msgid "Remote Permissions Settings"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:45
+#: ../../addon/remote_permissions/remote_permissions.php:46
 msgid ""
 "Allow recipients of your private posts to see the other recipients of the "
 "posts"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:57
+#: ../../addon/remote_permissions/remote_permissions.php:58
 msgid "Remote Permissions settings updated."
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "Visible to"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:177
+#: ../../addon/remote_permissions/remote_permissions.php:178
 msgid "may only be a partial list"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 #: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/remote_permissions/remote_permissions.php:197
 msgid "The posts of every user on this server show the post recipients"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 #: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr ""
 
-#: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/remote_permissions/remote_permissions.php:198
 msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr ""
 
@@ -7003,11 +7093,11 @@ msgstr ""
 msgid "Use the MathJax renderer"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:75 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
@@ -7327,7 +7417,7 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:692
+#: ../../addon/statusnet/statusnet.php:695
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
@@ -7573,11 +7663,11 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:517 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:518 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -7715,137 +7805,137 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:49
 #: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook/theme.php:90
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:384
-#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/theme.php:385
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:405
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:406
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:434
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:435
+#: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:479
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:480
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:638
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:518
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:520 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:522 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:572
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:573
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:577
+#: ../../view/theme/diabook/theme.php:578
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:580
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:592
-#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/theme.php:593
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:600
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:607
+#: ../../view/theme/diabook/theme.php:639
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/theme.php:610
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:630
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:630
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:631
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
@@ -8256,11 +8346,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr ""
 
@@ -8272,242 +8362,242 @@ msgstr ""
 msgid " on Last.fm"
 msgstr ""
 
-#: ../../include/text.php:243
+#: ../../include/text.php:262
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:245
+#: ../../include/text.php:264
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:274
+#: ../../include/text.php:293
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:277
+#: ../../include/text.php:296
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:295
+#: ../../include/text.php:314
 msgid "newer"
 msgstr ""
 
-#: ../../include/text.php:299
+#: ../../include/text.php:318
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:604
+#: ../../include/text.php:657
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:613
+#: ../../include/text.php:666
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:726
+#: ../../include/text.php:779
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:726 ../../include/conversation.php:210
+#: ../../include/text.php:779 ../../include/conversation.php:210
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:780
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:727
+#: ../../include/text.php:780
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:781
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:728
+#: ../../include/text.php:781
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:782
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:729
+#: ../../include/text.php:782
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:783
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:730
+#: ../../include/text.php:783
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:784
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:731
+#: ../../include/text.php:784
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:743
+#: ../../include/text.php:796
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:744
+#: ../../include/text.php:797
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:745
+#: ../../include/text.php:798
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:746
+#: ../../include/text.php:799
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:747
+#: ../../include/text.php:800
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:748
+#: ../../include/text.php:801
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:749
+#: ../../include/text.php:802
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:750
+#: ../../include/text.php:803
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:751
+#: ../../include/text.php:804
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:752
+#: ../../include/text.php:805
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:753
+#: ../../include/text.php:806
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:754
+#: ../../include/text.php:807
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:755
+#: ../../include/text.php:808
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:756
+#: ../../include/text.php:809
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:757
+#: ../../include/text.php:810
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:758
+#: ../../include/text.php:811
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:759
+#: ../../include/text.php:812
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:760
+#: ../../include/text.php:813
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:761
+#: ../../include/text.php:814
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:762
+#: ../../include/text.php:815
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:926
+#: ../../include/text.php:979
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1010
+#: ../../include/text.php:1066
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1037 ../../include/text.php:1049
+#: ../../include/text.php:1093 ../../include/text.php:1105
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1222 ../../include/user.php:236
+#: ../../include/text.php:1278 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1234
+#: ../../include/text.php:1290
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1500
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1447
+#: ../../include/text.php:1503
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1602
+#: ../../include/text.php:1658
 msgid "Item filed"
 msgstr ""
 
@@ -8515,11 +8605,11 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2236
+#: ../../include/diaspora.php:2239
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/network.php:847
+#: ../../include/network.php:850
 msgid "view full size"
 msgstr ""
 
@@ -8602,7 +8692,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:975
 msgid "Logout"
 msgstr ""
 
@@ -8610,7 +8700,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1767
 msgid "Status"
 msgstr ""
 
@@ -8698,23 +8788,27 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:142 ../../boot.php:1272
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr ""
 
@@ -8777,17 +8871,17 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:36
+#: ../../include/auth.php:38
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:126
+#: ../../include/auth.php:128
 msgid "The error message was:"
 msgstr ""
 
@@ -8848,29 +8942,32 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1695
+#: ../../include/datetime.php:472 ../../include/items.php:1705
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1696
+#: ../../include/datetime.php:473 ../../include/items.php:1706
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:421
-msgid "From: "
-msgstr ""
-
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:210 ../../include/bbcode.php:491
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:262
+#, php-format
+msgid ""
+"%s wrote the following post:"
+msgstr ""
+
+#: ../../include/bbcode.php:456 ../../include/bbcode.php:476
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:496 ../../include/bbcode.php:497
 msgid "Encrypted content"
 msgstr ""
 
@@ -9275,15 +9372,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3363
+#: ../../include/items.php:3373
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:4047
+#: ../../include/items.php:4057
 msgid "Archives"
 msgstr ""
 
@@ -9377,34 +9474,34 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:225 ../../include/conversation.php:795
+#: ../../include/Contact.php:225 ../../include/conversation.php:816
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:226 ../../include/conversation.php:789
+#: ../../include/Contact.php:226 ../../include/conversation.php:810
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:227 ../../include/conversation.php:790
+#: ../../include/Contact.php:227 ../../include/conversation.php:811
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:228 ../../include/conversation.php:791
+#: ../../include/Contact.php:228 ../../include/conversation.php:812
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:229 ../../include/Contact.php:242
-#: ../../include/conversation.php:792
+#: ../../include/conversation.php:813
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:230 ../../include/Contact.php:242
-#: ../../include/conversation.php:793
+#: ../../include/conversation.php:814
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:231 ../../include/Contact.php:242
-#: ../../include/conversation.php:794
+#: ../../include/conversation.php:815
 msgid "Send PM"
 msgstr ""
 
@@ -9422,90 +9519,92 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:599 ../../object/Item.php:226
+#: ../../include/conversation.php:620 ../../object/Item.php:243
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:600 ../../object/Item.php:227
+#: ../../include/conversation.php:621 ../../object/Item.php:244
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:685
+#: ../../include/conversation.php:706
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:689
+#: ../../include/conversation.php:710
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:809
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:878
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:861
-#, php-format
-msgid "%2$d people like this."
+#: ../../include/conversation.php:884
+msgid "like this"
 msgstr ""
 
-#: ../../include/conversation.php:863
-#, php-format
-msgid "%2$d people don't like this."
+#: ../../include/conversation.php:888
+msgid "don't like this"
 msgstr ""
 
-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:895
+msgid "people"
+msgstr ""
+
+#: ../../include/conversation.php:905
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:875
+#: ../../include/conversation.php:911
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:877
+#: ../../include/conversation.php:913
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:904 ../../include/conversation.php:922
+#: ../../include/conversation.php:940 ../../include/conversation.php:958
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/conversation.php:906 ../../include/conversation.php:924
+#: ../../include/conversation.php:942 ../../include/conversation.php:960
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:907 ../../include/conversation.php:925
+#: ../../include/conversation.php:943 ../../include/conversation.php:961
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:908 ../../include/conversation.php:926
+#: ../../include/conversation.php:944 ../../include/conversation.php:962
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:910 ../../include/conversation.php:928
+#: ../../include/conversation.php:946 ../../include/conversation.php:964
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:947
 msgid "Delete item(s)?"
 msgstr ""
 
-#: ../../include/conversation.php:990
+#: ../../include/conversation.php:1026
 msgid "permissions"
 msgstr ""
 
@@ -9521,113 +9620,129 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:607
+#: ../../boot.php:634
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:610
+#: ../../boot.php:637
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:847
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:849
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:922
+#: ../../boot.php:950
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:951
+#: ../../boot.php:978
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:952
+#: ../../boot.php:979
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:953
+#: ../../boot.php:980
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:956
+#: ../../boot.php:983
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:962
+#: ../../boot.php:989
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1087
+#: ../../boot.php:992
+msgid "Website Terms of Service"
+msgstr ""
+
+#: ../../boot.php:993
+msgid "terms of service"
+msgstr ""
+
+#: ../../boot.php:995
+msgid "Website Privacy Policy"
+msgstr ""
+
+#: ../../boot.php:996
+msgid "privacy policy"
+msgstr ""
+
+#: ../../boot.php:1121
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1164
+#: ../../boot.php:1198
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1230
+#: ../../boot.php:1264
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1238
+#: ../../boot.php:1272
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1395 ../../boot.php:1481
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1396 ../../boot.php:1482
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1441 ../../boot.php:1522
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1410
+#: ../../boot.php:1453
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1411
+#: ../../boot.php:1454
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1472
+#: ../../boot.php:1515
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1490
+#: ../../boot.php:1533
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1491
+#: ../../boot.php:1534
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1727
+#: ../../boot.php:1770
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1734
+#: ../../boot.php:1777
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1751
+#: ../../boot.php:1794
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1758
+#: ../../boot.php:1801
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../object/Item.php:238
+#: ../../object/Item.php:255
 msgid "via"
 msgstr ""
 
diff --git a/view/acl_selector.tpl b/view/acl_selector.tpl
index 655ea8980..837225a5b 100644
--- a/view/acl_selector.tpl
+++ b/view/acl_selector.tpl
@@ -9,7 +9,7 @@
 
 
 
diff --git a/view/admin_site.tpl b/view/admin_site.tpl
index 7e442cdfb..38d1fb8d0 100644
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@@ -48,13 +48,14 @@
 	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$new_share }}{{ 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_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 }}
@@ -99,6 +100,7 @@
 	{{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
+
 	
 	

 	
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index c9ab0e3f7..781d538bb 100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -70,7 +70,7 @@
 						$u.register_date
 						$u.login_date
 						$u.lastitem_date
-						$u.page-flags {{ if $u.is_admin }}($siteadmin){{ endif }}
+						$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}
 						 
                                     {{ if $u.is_admin }}
                                          
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl
index 0ea7eb13b..9bdf53222 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.tpl with $user=$u }}{{endinc}}
 	{{endfor}}
 
diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 000000000..082efc745
--- /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 000000000..695836520
--- /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 000000000..58bd14fea
--- /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 000000000..c0fa7b3e0
--- /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 000000000..bc26e3eb1
--- /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 000000000..469c429da
--- /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 000000000..d3c9d7b85
--- /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 000000000..a3fa3cd38
--- /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 000000000..f0d62d9a1
--- /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 000000000..7da9a2b88
--- /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 000000000..651e8eff7
--- /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 000000000..18dc3ef0d
--- /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 000000000..cd7546441
--- /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/contacts-template.tpl b/view/contacts-template.tpl
index ecb342bf4..69e3202c3 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.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 

 
diff --git a/view/cs/messages.po b/view/cs/messages.po
index cf9b1d676..727246eff 100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-11-08 10:00-0800\n"
-"PO-Revision-Date: 2012-11-10 18:38+0000\n"
+"POT-Creation-Date: 2012-12-18 10:00-0800\n"
+"PO-Revision-Date: 2012-12-20 18:23+0000\n"
 "Last-Translator: Michal Šupler \n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -38,11 +38,11 @@ msgstr "Aktualizace kontaktu selhala."
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
-#: ../../mod/settings.php:86 ../../mod/settings.php:525
-#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:147
+#: ../../mod/settings.php:91 ../../mod/settings.php:541
+#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -51,17 +51,18 @@ msgstr "Aktualizace kontaktu selhala."
 #: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/message.php:38 ../../mod/message.php:168
+#: ../../mod/message.php:38 ../../mod/message.php:172
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
-#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
+#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
 #: ../../mod/display.php:165 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:424 ../../mod/delegate.php:6
+#: ../../mod/profiles.php:431 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
-#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
-#: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3971
-#: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
+#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166
+#: ../../addon/fbpost/fbpost.php:172
+#: ../../addon/dav/friendica/layout.fnk.php:354
+#: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3977
+#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
 #: ../../addon.old/dav/friendica/layout.fnk.php:354
@@ -93,8 +94,8 @@ msgstr "Prosím použijte ihned v prohlížeči tlačítko \"zp
 msgid "Return to contact editor"
 msgstr "Návrat k editoru kontaktu"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:545
-#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/crepair.php:148 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
 msgid "Name"
 msgstr "Jméno"
 
@@ -131,22 +132,22 @@ msgid "New photo from this URL"
 msgstr "Nové foto z této URL adresy"
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1027
-#: ../../mod/photos.php:1103 ../../mod/photos.php:1366
-#: ../../mod/photos.php:1406 ../../mod/photos.php:1450
-#: ../../mod/photos.php:1522 ../../mod/install.php:246
+#: ../../mod/events.php:455 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
+#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
+#: ../../mod/photos.php:1519 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:693 ../../mod/contacts.php:351
-#: ../../mod/settings.php:543 ../../mod/settings.php:697
-#: ../../mod/settings.php:769 ../../mod/settings.php:976
-#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
-#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
-#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
-#: ../../mod/profiles.php:594 ../../mod/invite.php:119
-#: ../../addon/fromgplus/fromgplus.php:40
+#: ../../mod/content.php:693 ../../mod/contacts.php:352
+#: ../../mod/settings.php:559 ../../mod/settings.php:669
+#: ../../mod/settings.php:738 ../../mod/settings.php:810
+#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
+#: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
+#: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
+#: ../../mod/admin.php:1115 ../../mod/profiles.php:604
+#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64
-#: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
+#: ../../addon/fbpost/fbpost.php:272 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
@@ -155,16 +156,17 @@ msgstr "Nové foto z této URL adresy"
 #: ../../addon/remote_permissions/remote_permissions.php:195
 #: ../../addon/startpage/startpage.php:92
 #: ../../addon/geonames/geonames.php:187
-#: ../../addon/forumlist/forumlist.php:175
+#: ../../addon/forumlist/forumlist.php:178
 #: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/group_text/group_text.php:84
 #: ../../addon/libravatar/libravatar.php:99
-#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
-#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
-#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
+#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:91
+#: ../../addon/altpager/altpager.php:98 ../../addon/mathjax/mathjax.php:42
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:307
 #: ../../addon/statusnet/statusnet.php:278
@@ -172,18 +174,18 @@ msgstr "Nové foto z této URL adresy"
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:700 ../../addon/tumblr/tumblr.php:233
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:642
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:559 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40
 #: ../../addon.old/facebook/facebook.php:619
 #: ../../addon.old/snautofollow/snautofollow.php:64
 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
@@ -232,20 +234,20 @@ msgstr "Nové foto z této URL adresy"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: ../../mod/help.php:30
+#: ../../mod/help.php:79
 msgid "Help:"
 msgstr "Nápověda:"
 
-#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../../mod/help.php:38 ../../index.php:228
+#: ../../mod/help.php:90 ../../index.php:218
 msgid "Not Found"
 msgstr "Nenalezen"
 
-#: ../../mod/help.php:41 ../../index.php:231
+#: ../../mod/help.php:93 ../../index.php:221
 msgid "Page not found."
 msgstr "Stránka nenalezena"
 
@@ -283,12 +285,12 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Editovat událost"
 
-#: ../../mod/events.php:323 ../../include/text.php:1185
+#: ../../mod/events.php:323 ../../include/text.php:1190
 msgid "link to source"
 msgstr "odkaz na zdroj"
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:52 ../../boot.php:1711
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1748
 msgid "Events"
 msgstr "Události"
 
@@ -345,8 +347,9 @@ msgid "Description:"
 msgstr "Popis:"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1241
+#: ../../boot.php:1278
 msgid "Location:"
 msgstr "Místo:"
 
@@ -358,10 +361,10 @@ msgstr "Název:"
 msgid "Share this event"
 msgstr "Sdílet tuto událost"
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
-#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1001
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
+#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
+#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
+#: ../../include/conversation.php:1009
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr "Zrušit"
@@ -408,117 +411,118 @@ msgid ""
 msgstr "Chcete umožnit této aplikaci přístup k vašim příspěvkům a kontaktům a/nebo k vytváření Vašich nových příspěvků?"
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
-#: ../../mod/profiles.php:574
+#: ../../mod/settings.php:933 ../../mod/settings.php:939
+#: ../../mod/settings.php:947 ../../mod/settings.php:951
+#: ../../mod/settings.php:956 ../../mod/settings.php:962
+#: ../../mod/settings.php:968 ../../mod/settings.php:974
+#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr "Ano"
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:238
-#: ../../mod/profiles.php:575
+#: ../../mod/settings.php:933 ../../mod/settings.php:939
+#: ../../mod/settings.php:947 ../../mod/settings.php:951
+#: ../../mod/settings.php:956 ../../mod/settings.php:962
+#: ../../mod/settings.php:968 ../../mod/settings.php:974
+#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/profiles.php:585
 msgid "No"
 msgstr "Ne"
 
-#: ../../mod/photos.php:50 ../../boot.php:1704
+#: ../../mod/photos.php:51 ../../boot.php:1741
 msgid "Photo Albums"
 msgstr "Fotoalba"
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
-#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
-#: ../../mod/photos.php:1565 ../../mod/photos.php:1577
-#: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:485
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
+#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
+#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
+#: ../../addon/communityhome/communityhome.php:111
+#: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr "Fotogalerie kontaktu"
 
-#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1615
+#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
 msgid "Upload New Photos"
 msgstr "Nahrát nové fotografie"
 
-#: ../../mod/photos.php:78 ../../mod/settings.php:23
+#: ../../mod/photos.php:79 ../../mod/settings.php:23
 msgid "everybody"
 msgstr "Žádost o připojení selhala nebo byla zrušena."
 
-#: ../../mod/photos.php:142
+#: ../../mod/photos.php:143
 msgid "Contact information unavailable"
 msgstr "Kontakt byl zablokován"
 
-#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095
-#: ../../mod/photos.php:1110 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
+#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324
+#: ../../addon/communityhome/communityhome.php:112
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
 msgstr "Profilové fotografie"
 
-#: ../../mod/photos.php:163
+#: ../../mod/photos.php:164
 msgid "Album not found."
 msgstr "Album nenalezeno."
 
-#: ../../mod/photos.php:181 ../../mod/photos.php:1104
+#: ../../mod/photos.php:182 ../../mod/photos.php:1101
 msgid "Delete Album"
 msgstr "Smazat album"
 
-#: ../../mod/photos.php:244 ../../mod/photos.php:1367
+#: ../../mod/photos.php:245 ../../mod/photos.php:1364
 msgid "Delete Photo"
 msgstr "Smazat fotografii"
 
-#: ../../mod/photos.php:606
+#: ../../mod/photos.php:607
 #, php-format
 msgid "%1$s was tagged in %2$s by %3$s"
 msgstr "%1$s byl označen v %2$s uživatelem %3$s"
 
-#: ../../mod/photos.php:606
+#: ../../mod/photos.php:607
 msgid "a photo"
 msgstr "fotografie"
 
-#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
 #: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr "Velikost obrázku překračuje limit velikosti"
 
-#: ../../mod/photos.php:719
+#: ../../mod/photos.php:720
 msgid "Image file is empty."
 msgstr "Soubor obrázku je prázdný."
 
-#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153
-#: ../../mod/wall_upload.php:110
+#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
+#: ../../mod/wall_upload.php:112
 msgid "Unable to process image."
 msgstr "Obrázek není možné zprocesovat"
 
-#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301
-#: ../../mod/wall_upload.php:136
+#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
+#: ../../mod/wall_upload.php:138
 msgid "Image upload failed."
 msgstr "Nahrání obrázku selhalo."
 
-#: ../../mod/photos.php:864 ../../mod/community.php:18
+#: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
+#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr "Veřejný přístup odepřen."
 
-#: ../../mod/photos.php:874
+#: ../../mod/photos.php:875
 msgid "No photos selected"
 msgstr "Není vybrána žádná fotografie"
 
-#: ../../mod/photos.php:975
+#: ../../mod/photos.php:976
 msgid "Access to this item is restricted."
 msgstr "Přístup k této položce je omezen."
 
@@ -527,162 +531,157 @@ msgstr "Přístup k této položce je omezen."
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií."
 
-#: ../../mod/photos.php:1040
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr "Použil jste %1$.2f Mbytes kapacity úložiště fotografií."
-
-#: ../../mod/photos.php:1046
+#: ../../mod/photos.php:1043
 msgid "Upload Photos"
 msgstr "Nahrání fotografií "
 
-#: ../../mod/photos.php:1050 ../../mod/photos.php:1099
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
 msgid "New album name: "
 msgstr "Název nového alba: "
 
-#: ../../mod/photos.php:1051
+#: ../../mod/photos.php:1048
 msgid "or existing album name: "
 msgstr "nebo stávající název alba: "
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1049
 msgid "Do not show a status post for this upload"
 msgstr "Nezobrazovat stav pro tento upload"
 
-#: ../../mod/photos.php:1054 ../../mod/photos.php:1362
+#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
 msgid "Permissions"
 msgstr "Oprávnění:"
 
-#: ../../mod/photos.php:1114
+#: ../../mod/photos.php:1111
 msgid "Edit Album"
 msgstr "Edituj album"
 
-#: ../../mod/photos.php:1120
+#: ../../mod/photos.php:1117
 msgid "Show Newest First"
 msgstr "Zobrazit nejprve nejnovější:"
 
-#: ../../mod/photos.php:1122
+#: ../../mod/photos.php:1119
 msgid "Show Oldest First"
 msgstr "Zobrazit nejprve nejstarší:"
 
-#: ../../mod/photos.php:1146 ../../mod/photos.php:1598
+#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
 msgid "View Photo"
 msgstr "Zobraz fotografii"
 
-#: ../../mod/photos.php:1181
+#: ../../mod/photos.php:1178
 msgid "Permission denied. Access to this item may be restricted."
 msgstr "Oprávnění bylo zamítnuto. Přístup k této položce může být omezen."
 
-#: ../../mod/photos.php:1183
+#: ../../mod/photos.php:1180
 msgid "Photo not available"
 msgstr "Fotografie není k dispozici"
 
-#: ../../mod/photos.php:1239
+#: ../../mod/photos.php:1236
 msgid "View photo"
 msgstr "Zobrazit obrázek"
 
-#: ../../mod/photos.php:1239
+#: ../../mod/photos.php:1236
 msgid "Edit photo"
 msgstr "Editovat fotografii"
 
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1237
 msgid "Use as profile photo"
 msgstr "Použít jako profilovou fotografii"
 
-#: ../../mod/photos.php:1246 ../../mod/content.php:603
-#: ../../object/Item.php:103
+#: ../../mod/photos.php:1243 ../../mod/content.php:603
+#: ../../object/Item.php:105
 msgid "Private Message"
 msgstr "Soukromá zpráva"
 
-#: ../../mod/photos.php:1265
+#: ../../mod/photos.php:1262
 msgid "View Full Size"
 msgstr "Zobrazit v plné velikosti"
 
-#: ../../mod/photos.php:1339
+#: ../../mod/photos.php:1336
 msgid "Tags: "
 msgstr "Štítky: "
 
-#: ../../mod/photos.php:1342
+#: ../../mod/photos.php:1339
 msgid "[Remove any tag]"
 msgstr "[Odstranit všechny štítky]"
 
-#: ../../mod/photos.php:1352
+#: ../../mod/photos.php:1349
 msgid "Rotate CW (right)"
 msgstr "Rotovat po směru hodinových ručiček (doprava)"
 
-#: ../../mod/photos.php:1353
+#: ../../mod/photos.php:1350
 msgid "Rotate CCW (left)"
 msgstr "Rotovat proti směru hodinových ručiček (doleva)"
 
-#: ../../mod/photos.php:1355
+#: ../../mod/photos.php:1352
 msgid "New album name"
 msgstr "Nové jméno alba"
 
-#: ../../mod/photos.php:1358
+#: ../../mod/photos.php:1355
 msgid "Caption"
 msgstr "Titulek"
 
-#: ../../mod/photos.php:1360
+#: ../../mod/photos.php:1357
 msgid "Add a Tag"
 msgstr "Přidat štítek"
 
-#: ../../mod/photos.php:1364
+#: ../../mod/photos.php:1361
 msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Příklad: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1384 ../../mod/content.php:667
-#: ../../object/Item.php:196
+#: ../../mod/photos.php:1381 ../../mod/content.php:667
+#: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr "Líbí se mi to (přepínač)"
 
-#: ../../mod/photos.php:1385 ../../mod/content.php:668
-#: ../../object/Item.php:197
+#: ../../mod/photos.php:1382 ../../mod/content.php:668
+#: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr "Nelíbí se mi to (přepínač)"
 
-#: ../../mod/photos.php:1386 ../../include/conversation.php:962
+#: ../../mod/photos.php:1383 ../../include/conversation.php:969
 msgid "Share"
 msgstr "Sdílet"
 
-#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
-#: ../../mod/content.php:482 ../../mod/content.php:846
-#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:624
-#: ../../include/conversation.php:981 ../../object/Item.php:258
+#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
+#: ../../mod/content.php:482 ../../mod/content.php:848
+#: ../../mod/wallmessage.php:152 ../../mod/message.php:300
+#: ../../mod/message.php:488 ../../include/conversation.php:624
+#: ../../include/conversation.php:988 ../../object/Item.php:270
 msgid "Please wait"
 msgstr "Čekejte prosím"
 
-#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
-#: ../../mod/photos.php:1519 ../../mod/content.php:690
-#: ../../object/Item.php:556
+#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
+#: ../../mod/photos.php:1516 ../../mod/content.php:690
+#: ../../object/Item.php:574
 msgid "This is you"
 msgstr "Nastavte Vaši polohu"
 
-#: ../../mod/photos.php:1405 ../../mod/photos.php:1449
-#: ../../mod/photos.php:1521 ../../mod/content.php:692 ../../boot.php:589
-#: ../../object/Item.php:558
+#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
+#: ../../object/Item.php:267 ../../object/Item.php:576
 msgid "Comment"
 msgstr "Okomentovat"
 
-#: ../../mod/photos.php:1407 ../../mod/photos.php:1451
-#: ../../mod/photos.php:1523 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:999
-#: ../../object/Item.php:568
+#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
+#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
+#: ../../mod/content.php:702 ../../include/conversation.php:1006
+#: ../../object/Item.php:586
 msgid "Preview"
 msgstr "Náhled"
 
-#: ../../mod/photos.php:1491 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:606
-#: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:569 ../../object/Item.php:117
+#: ../../mod/photos.php:1488 ../../mod/content.php:439
+#: ../../mod/content.php:724 ../../mod/settings.php:622
+#: ../../mod/group.php:168 ../../mod/admin.php:699
+#: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../../mod/photos.php:1604
+#: ../../mod/photos.php:1601
 msgid "View Album"
 msgstr "Zobrazit album"
 
-#: ../../mod/photos.php:1613
+#: ../../mod/photos.php:1610
 msgid "Recent Photos"
 msgstr "Aktuální fotografie"
 
@@ -690,13 +689,13 @@ msgstr "Aktuální fotografie"
 msgid "Not available."
 msgstr "Není k dispozici."
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr "Komunita"
 
 #: ../../mod/community.php:61 ../../mod/community.php:86
-#: ../../mod/search.php:159 ../../mod/search.php:185
+#: ../../mod/search.php:162 ../../mod/search.php:188
 msgid "No results."
 msgstr "Žádné výsledky."
 
@@ -736,100 +735,100 @@ msgstr "Nejsou žádné nainstalované doplňky/aplikace"
 msgid "Item not found"
 msgstr "Položka nenalezena"
 
-#: ../../mod/editpost.php:36
+#: ../../mod/editpost.php:39
 msgid "Edit post"
 msgstr "Upravit příspěvek"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:948
+#: ../../mod/editpost.php:91 ../../include/conversation.php:955
 msgid "Post to Email"
 msgstr "Poslat příspěvek na e-mail"
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:711
-#: ../../mod/settings.php:605 ../../object/Item.php:107
+#: ../../mod/editpost.php:106 ../../mod/content.php:711
+#: ../../mod/settings.php:621 ../../object/Item.php:109
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:963
+#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
+#: ../../mod/message.php:298 ../../mod/message.php:485
+#: ../../include/conversation.php:970
 msgid "Upload photo"
 msgstr "Nahrát fotografii"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:964
+#: ../../mod/editpost.php:108 ../../include/conversation.php:971
 msgid "upload photo"
 msgstr "nahrát fotky"
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:965
+#: ../../mod/editpost.php:109 ../../include/conversation.php:972
 msgid "Attach file"
 msgstr "Přiložit soubor"
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:966
+#: ../../mod/editpost.php:110 ../../include/conversation.php:973
 msgid "attach file"
 msgstr "přidat soubor"
 
-#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:967
+#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:299 ../../mod/message.php:486
+#: ../../include/conversation.php:974
 msgid "Insert web link"
 msgstr "Vložit webový odkaz"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:968
+#: ../../mod/editpost.php:112 ../../include/conversation.php:975
 msgid "web link"
 msgstr "webový odkaz"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:969
+#: ../../mod/editpost.php:113 ../../include/conversation.php:976
 msgid "Insert video link"
 msgstr "Zadejte odkaz na video"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:970
+#: ../../mod/editpost.php:114 ../../include/conversation.php:977
 msgid "video link"
 msgstr "odkaz na video"
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:971
+#: ../../mod/editpost.php:115 ../../include/conversation.php:978
 msgid "Insert audio link"
 msgstr "Zadejte odkaz na zvukový záznam"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:972
+#: ../../mod/editpost.php:116 ../../include/conversation.php:979
 msgid "audio link"
 msgstr "odkaz na audio"
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:973
+#: ../../mod/editpost.php:117 ../../include/conversation.php:980
 msgid "Set your location"
 msgstr "Nastavte vaši polohu"
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:974
+#: ../../mod/editpost.php:118 ../../include/conversation.php:981
 msgid "set location"
 msgstr "nastavit místo"
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:975
+#: ../../mod/editpost.php:119 ../../include/conversation.php:982
 msgid "Clear browser location"
 msgstr "Odstranit adresu v prohlížeči"
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:120 ../../include/conversation.php:983
 msgid "clear location"
 msgstr "vymazat místo"
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:982
+#: ../../mod/editpost.php:122 ../../include/conversation.php:989
 msgid "Permission settings"
 msgstr "Nastavení oprávnění"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:991
+#: ../../mod/editpost.php:130 ../../include/conversation.php:998
 msgid "CC: email addresses"
 msgstr "skrytá kopie: e-mailové adresy"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:992
+#: ../../mod/editpost.php:131 ../../include/conversation.php:999
 msgid "Public post"
 msgstr "Veřejný příspěvek"
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:978
+#: ../../mod/editpost.php:134 ../../include/conversation.php:985
 msgid "Set title"
 msgstr "Nastavit titulek"
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:980
+#: ../../mod/editpost.php:136 ../../include/conversation.php:987
 msgid "Categories (comma-separated list)"
 msgstr "Kategorie (čárkou oddělený seznam)"
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:994
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1001
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Příklad: bob@example.com, mary@example.com"
 
@@ -915,7 +914,7 @@ msgstr "Neplatné URL profilu."
 msgid "Disallowed profile URL."
 msgstr "Nepovolené URL profilu."
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr "Nepodařilo se aktualizovat kontakt."
 
@@ -951,7 +950,7 @@ msgstr "Prosím potvrďte Vaši žádost o propojení %s."
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3350
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
 msgid "[Name Withheld]"
 msgstr "[Jméno odepřeno]"
 
@@ -1003,7 +1002,7 @@ msgstr "Friendica"
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet / Federativní Sociální Web"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
@@ -1023,59 +1022,59 @@ msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"re
 msgid "Submit Request"
 msgstr "Odeslat žádost"
 
-#: ../../mod/uexport.php:10 ../../mod/settings.php:30
-#: ../../include/nav.php:137
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
 msgid "Account settings"
 msgstr "Nastavení účtu"
 
-#: ../../mod/uexport.php:15 ../../mod/settings.php:35
+#: ../../mod/uexport.php:14 ../../mod/settings.php:40
 msgid "Display settings"
 msgstr "Nastavení zobrazení"
 
-#: ../../mod/uexport.php:21 ../../mod/settings.php:41
+#: ../../mod/uexport.php:20 ../../mod/settings.php:46
 msgid "Connector settings"
 msgstr "Nastavení konektoru"
 
-#: ../../mod/uexport.php:26 ../../mod/settings.php:46
+#: ../../mod/uexport.php:25 ../../mod/settings.php:51
 msgid "Plugin settings"
 msgstr "Nastavení pluginu"
 
-#: ../../mod/uexport.php:31 ../../mod/settings.php:51
+#: ../../mod/uexport.php:30 ../../mod/settings.php:56
 msgid "Connected apps"
 msgstr "Propojené aplikace"
 
-#: ../../mod/uexport.php:36 ../../mod/uexport.php:81 ../../mod/settings.php:56
+#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61
 msgid "Export personal data"
 msgstr "Export osobních údajů"
 
-#: ../../mod/uexport.php:41 ../../mod/settings.php:61
+#: ../../mod/uexport.php:40 ../../mod/settings.php:66
 msgid "Remove account"
 msgstr "Odstranit účet"
 
-#: ../../mod/uexport.php:49 ../../mod/settings.php:69
-#: ../../mod/newmember.php:22 ../../mod/admin.php:785 ../../mod/admin.php:990
+#: ../../mod/uexport.php:48 ../../mod/settings.php:74
+#: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
-#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
 msgstr "Nastavení"
 
-#: ../../mod/uexport.php:73
+#: ../../mod/uexport.php:72
 msgid "Export account"
 msgstr "Exportovat účet"
 
-#: ../../mod/uexport.php:73
+#: ../../mod/uexport.php:72
 msgid ""
 "Export your account info and contacts. Use this to make a backup of your "
 "account and/or to move it to another server."
 msgstr "Exportujte svůj účet a své kontakty. Použijte tuto funkci pro vytvoření  zálohy svého účtu a/nebo k přesunu na jiný server."
 
-#: ../../mod/uexport.php:74
+#: ../../mod/uexport.php:73
 msgid "Export all"
 msgstr "Exportovat vše"
 
-#: ../../mod/uexport.php:74
+#: ../../mod/uexport.php:73
 msgid ""
 "Export your accout info, contacts and all your items as json. Could be a "
 "very big file, and could take a lot of time. Use this to make a full backup "
@@ -1403,7 +1402,7 @@ msgid "is interested in:"
 msgstr "zajímá se o:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1179
+#: ../../include/contact_widgets.php:9 ../../boot.php:1216
 msgid "Connect"
 msgstr "Spojit"
 
@@ -1420,32 +1419,32 @@ msgstr "Vzdálené soukromé informace nejsou k dispozici."
 msgid "Visible to:"
 msgstr "Viditelné pro:"
 
-#: ../../mod/content.php:119 ../../mod/network.php:544
+#: ../../mod/content.php:119 ../../mod/network.php:594
 msgid "No such group"
 msgstr "Žádná taková skupina"
 
-#: ../../mod/content.php:130 ../../mod/network.php:555
+#: ../../mod/content.php:130 ../../mod/network.php:605
 msgid "Group is empty"
 msgstr "Skupina je prázdná"
 
-#: ../../mod/content.php:134 ../../mod/network.php:559
+#: ../../mod/content.php:134 ../../mod/network.php:609
 msgid "Group: "
 msgstr "Skupina: "
 
 #: ../../mod/content.php:438 ../../mod/content.php:723
-#: ../../include/conversation.php:568 ../../object/Item.php:116
+#: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../../mod/content.php:455 ../../mod/content.php:816
-#: ../../mod/content.php:817 ../../include/conversation.php:587
-#: ../../object/Item.php:227 ../../object/Item.php:228
+#: ../../mod/content.php:455 ../../mod/content.php:817
+#: ../../mod/content.php:818 ../../include/conversation.php:587
+#: ../../object/Item.php:235 ../../object/Item.php:236
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Zobrazit profil uživatele %s na %s"
 
-#: ../../mod/content.php:465 ../../mod/content.php:828
-#: ../../include/conversation.php:607 ../../object/Item.php:240
+#: ../../mod/content.php:465 ../../mod/content.php:829
+#: ../../include/conversation.php:607 ../../object/Item.php:249
 #, php-format
 msgid "%s from %s"
 msgstr "%s od %s"
@@ -1454,7 +1453,7 @@ msgstr "%s od %s"
 msgid "View in context"
 msgstr "Pohled v kontextu"
 
-#: ../../mod/content.php:586 ../../object/Item.php:277
+#: ../../mod/content.php:586 ../../object/Item.php:289
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1462,8 +1461,8 @@ msgstr[0] "%d komentář"
 msgstr[1] "%d komentářů"
 msgstr[2] "%d komentářů"
 
-#: ../../mod/content.php:588 ../../include/text.php:1441
-#: ../../object/Item.php:279 ../../object/Item.php:292
+#: ../../mod/content.php:588 ../../include/text.php:1446
+#: ../../object/Item.php:291 ../../object/Item.php:304
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -1472,97 +1471,97 @@ msgstr[2] "komentář"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../boot.php:590
-#: ../../object/Item.php:280 ../../addon.old/page/page.php:77
+#: ../../include/contact_widgets.php:204 ../../boot.php:609
+#: ../../object/Item.php:292 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
 msgstr "zobrazit více"
 
-#: ../../mod/content.php:667 ../../object/Item.php:196
+#: ../../mod/content.php:667 ../../object/Item.php:203
 msgid "like"
 msgstr "má rád"
 
-#: ../../mod/content.php:668 ../../object/Item.php:197
+#: ../../mod/content.php:668 ../../object/Item.php:204
 msgid "dislike"
 msgstr "nemá rád"
 
-#: ../../mod/content.php:670 ../../object/Item.php:199
+#: ../../mod/content.php:670 ../../object/Item.php:206
 msgid "Share this"
 msgstr "Sdílet toto"
 
-#: ../../mod/content.php:670 ../../object/Item.php:199
+#: ../../mod/content.php:670 ../../object/Item.php:206
 msgid "share"
 msgstr "sdílí"
 
-#: ../../mod/content.php:694 ../../object/Item.php:560
+#: ../../mod/content.php:694 ../../object/Item.php:578
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../../mod/content.php:695 ../../object/Item.php:561
+#: ../../mod/content.php:695 ../../object/Item.php:579
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../../mod/content.php:696 ../../object/Item.php:562
+#: ../../mod/content.php:696 ../../object/Item.php:580
 msgid "Underline"
 msgstr "Podrtžené"
 
-#: ../../mod/content.php:697 ../../object/Item.php:563
+#: ../../mod/content.php:697 ../../object/Item.php:581
 msgid "Quote"
 msgstr "Citovat"
 
-#: ../../mod/content.php:698 ../../object/Item.php:564
+#: ../../mod/content.php:698 ../../object/Item.php:582
 msgid "Code"
 msgstr "Kód"
 
-#: ../../mod/content.php:699 ../../object/Item.php:565
+#: ../../mod/content.php:699 ../../object/Item.php:583
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../../mod/content.php:700 ../../object/Item.php:566
+#: ../../mod/content.php:700 ../../object/Item.php:584
 msgid "Link"
 msgstr "Odkaz"
 
-#: ../../mod/content.php:701 ../../object/Item.php:567
+#: ../../mod/content.php:701 ../../object/Item.php:585
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:736 ../../object/Item.php:180
+#: ../../mod/content.php:736 ../../object/Item.php:182
 msgid "add star"
 msgstr "přidat hvězdu"
 
-#: ../../mod/content.php:737 ../../object/Item.php:181
+#: ../../mod/content.php:737 ../../object/Item.php:183
 msgid "remove star"
 msgstr "odebrat hvězdu"
 
-#: ../../mod/content.php:738 ../../object/Item.php:182
+#: ../../mod/content.php:738 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr "přepnout hvězdu"
 
-#: ../../mod/content.php:741 ../../object/Item.php:185
+#: ../../mod/content.php:741 ../../object/Item.php:187
 msgid "starred"
 msgstr "označeno hvězdou"
 
-#: ../../mod/content.php:742 ../../object/Item.php:186
+#: ../../mod/content.php:742 ../../object/Item.php:192
 msgid "add tag"
 msgstr "přidat štítek"
 
-#: ../../mod/content.php:746 ../../object/Item.php:120
+#: ../../mod/content.php:746 ../../object/Item.php:122
 msgid "save to folder"
 msgstr "uložit do složky"
 
-#: ../../mod/content.php:818 ../../object/Item.php:229
+#: ../../mod/content.php:819 ../../object/Item.php:237
 msgid "to"
 msgstr "pro"
 
-#: ../../mod/content.php:819 ../../object/Item.php:230
+#: ../../mod/content.php:820 ../../object/Item.php:239
 msgid "Wall-to-Wall"
 msgstr "Zeď-na-Zeď"
 
-#: ../../mod/content.php:820 ../../object/Item.php:231
+#: ../../mod/content.php:821 ../../object/Item.php:240
 msgid "via Wall-To-Wall:"
 msgstr "přes Zeď-na-Zeď "
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1578,8 +1577,8 @@ msgid "Discard"
 msgstr "Odstranit"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:163
-#: ../../mod/notifications.php:209 ../../mod/contacts.php:324
-#: ../../mod/contacts.php:378
+#: ../../mod/notifications.php:209 ../../mod/contacts.php:325
+#: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -1591,21 +1590,21 @@ msgstr "Systém"
 msgid "Network"
 msgstr "Síť"
 
-#: ../../mod/notifications.php:88 ../../mod/network.php:407
+#: ../../mod/notifications.php:88 ../../mod/network.php:444
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
-#: ../../include/nav.php:77 ../../include/nav.php:115
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr "Domů"
 
-#: ../../mod/notifications.php:98 ../../include/nav.php:121
+#: ../../mod/notifications.php:98 ../../include/nav.php:122
 msgid "Introductions"
 msgstr "Představení"
 
-#: ../../mod/notifications.php:103 ../../mod/message.php:176
-#: ../../include/nav.php:128
+#: ../../mod/notifications.php:103 ../../mod/message.php:180
+#: ../../include/nav.php:129
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -1631,7 +1630,7 @@ msgid "suggested by %s"
 msgstr "navrhl %s"
 
 #: ../../mod/notifications.php:156 ../../mod/notifications.php:203
-#: ../../mod/contacts.php:384
+#: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr "Skrýt tento kontakt před ostatními"
 
@@ -1644,7 +1643,7 @@ msgid "if applicable"
 msgstr "je-li použitelné"
 
 #: ../../mod/notifications.php:160 ../../mod/notifications.php:207
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:697
 msgid "Approve"
 msgstr "Schválit"
 
@@ -1688,7 +1687,7 @@ msgstr "Nový následovník"
 msgid "No introductions."
 msgstr "Žádné představení."
 
-#: ../../mod/notifications.php:219 ../../include/nav.php:122
+#: ../../mod/notifications.php:219 ../../include/nav.php:123
 msgid "Notifications"
 msgstr "Upozornění"
 
@@ -1753,87 +1752,87 @@ msgstr "Žádné další domácí upozornění."
 msgid "Home Notifications"
 msgstr "Domácí upozornění"
 
-#: ../../mod/contacts.php:84 ../../mod/contacts.php:164
+#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
 msgid "Could not access contact record."
 msgstr "Nelze získat přístup k záznamu kontaktu."
 
-#: ../../mod/contacts.php:98
+#: ../../mod/contacts.php:99
 msgid "Could not locate selected profile."
 msgstr "Nelze nalézt vybraný profil."
 
-#: ../../mod/contacts.php:121
+#: ../../mod/contacts.php:122
 msgid "Contact updated."
 msgstr "Kontakt aktualizován."
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been blocked"
 msgstr "Kontakt byl zablokován"
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been unblocked"
 msgstr "Kontakt byl odblokován"
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been ignored"
 msgstr "Kontakt bude ignorován"
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been unignored"
 msgstr "Kontakt přestal být ignorován"
 
-#: ../../mod/contacts.php:219
+#: ../../mod/contacts.php:220
 msgid "Contact has been archived"
 msgstr "Kontakt byl archivován"
 
-#: ../../mod/contacts.php:219
+#: ../../mod/contacts.php:220
 msgid "Contact has been unarchived"
 msgstr "Kontakt byl vrácen z archívu."
 
-#: ../../mod/contacts.php:232
+#: ../../mod/contacts.php:233
 msgid "Contact has been removed."
 msgstr "Kontakt byl odstraněn."
 
-#: ../../mod/contacts.php:266
+#: ../../mod/contacts.php:267
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Jste vzájemní přátelé s uživatelem %s"
 
-#: ../../mod/contacts.php:270
+#: ../../mod/contacts.php:271
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Sdílíte s uživatelem %s"
 
-#: ../../mod/contacts.php:275
+#: ../../mod/contacts.php:276
 #, php-format
 msgid "%s is sharing with you"
 msgstr "uživatel %s sdílí s vámi"
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:293
 msgid "Private communications are not available for this contact."
 msgstr "Soukromá komunikace není dostupná pro tento kontakt."
 
-#: ../../mod/contacts.php:295
+#: ../../mod/contacts.php:296
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:300
 msgid "(Update was successful)"
 msgstr "(Aktualizace byla úspěšná)"
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:300
 msgid "(Update was not successful)"
 msgstr "(Aktualizace nebyla úspěšná)"
 
-#: ../../mod/contacts.php:301
+#: ../../mod/contacts.php:302
 msgid "Suggest friends"
 msgstr "Navrhněte přátelé"
 
-#: ../../mod/contacts.php:305
+#: ../../mod/contacts.php:306
 #, php-format
 msgid "Network type: %s"
 msgstr "Typ sítě: %s"
 
-#: ../../mod/contacts.php:308 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
@@ -1841,220 +1840,222 @@ msgstr[0] "%d sdílený kontakt"
 msgstr[1] "%d sdílených kontaktů"
 msgstr[2] "%d sdílených kontaktů"
 
-#: ../../mod/contacts.php:313
+#: ../../mod/contacts.php:314
 msgid "View all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
-#: ../../mod/admin.php:698
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:701
 msgid "Unblock"
 msgstr "Odblokovat"
 
-#: ../../mod/contacts.php:318 ../../mod/contacts.php:377
-#: ../../mod/admin.php:697
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:700
 msgid "Block"
 msgstr "Blokovat"
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:322
 msgid "Toggle Blocked status"
 msgstr "Přepnout stav Blokováno"
 
-#: ../../mod/contacts.php:324 ../../mod/contacts.php:378
+#: ../../mod/contacts.php:325 ../../mod/contacts.php:379
 msgid "Unignore"
 msgstr "Přestat ignorovat"
 
-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:328
 msgid "Toggle Ignored status"
 msgstr "Přepnout stav Ignorováno"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:332
 msgid "Unarchive"
 msgstr "Vrátit z archívu"
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:332
 msgid "Archive"
 msgstr "Archivovat"
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:335
 msgid "Toggle Archive status"
 msgstr "Přepnout stav Archivováno"
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:338
 msgid "Repair"
 msgstr "Opravit"
 
-#: ../../mod/contacts.php:340
+#: ../../mod/contacts.php:341
 msgid "Advanced Contact Settings"
 msgstr "Pokročilé nastavení kontaktu"
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:347
 msgid "Communications lost with this contact!"
 msgstr "Komunikace s tímto kontaktem byla ztracena!"
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:350
 msgid "Contact Editor"
 msgstr "Editor kontaktu"
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:353
 msgid "Profile Visibility"
 msgstr "Viditelnost profilu"
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:354
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu."
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:355
 msgid "Contact Information / Notes"
 msgstr "Kontaktní informace / poznámky"
 
-#: ../../mod/contacts.php:355
+#: ../../mod/contacts.php:356
 msgid "Edit contact notes"
 msgstr "Editovat poznámky kontaktu"
 
-#: ../../mod/contacts.php:360 ../../mod/contacts.php:552
+#: ../../mod/contacts.php:361 ../../mod/contacts.php:553
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Navštivte profil uživatele %s [%s]"
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:362
 msgid "Block/Unblock contact"
 msgstr "Blokovat / Odblokovat kontakt"
 
-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:363
 msgid "Ignore contact"
 msgstr "Ignorovat kontakt"
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:364
 msgid "Repair URL settings"
 msgstr "Opravit nastavení adresy URL "
 
-#: ../../mod/contacts.php:364
+#: ../../mod/contacts.php:365
 msgid "View conversations"
 msgstr "Zobrazit konverzace"
 
-#: ../../mod/contacts.php:366
+#: ../../mod/contacts.php:367
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
-#: ../../mod/contacts.php:370
+#: ../../mod/contacts.php:371
 msgid "Last update:"
 msgstr "Poslední aktualizace:"
 
-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:373
 msgid "Update public posts"
 msgstr "Aktualizovat veřejné příspěvky"
 
-#: ../../mod/contacts.php:374 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1173
 msgid "Update now"
 msgstr "Aktualizovat"
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:382
 msgid "Currently blocked"
 msgstr "V současnosti zablokováno"
 
-#: ../../mod/contacts.php:382
+#: ../../mod/contacts.php:383
 msgid "Currently ignored"
 msgstr "V současnosti ignorováno"
 
-#: ../../mod/contacts.php:383
+#: ../../mod/contacts.php:384
 msgid "Currently archived"
 msgstr "Aktuálně archivován"
 
-#: ../../mod/contacts.php:384
+#: ../../mod/contacts.php:385
 msgid ""
 "Replies/likes to your public posts may still be visible"
 msgstr "Odpovědi/Libí se na Vaše veřejné příspěvky mohou být stále viditelné"
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:438
 msgid "Suggestions"
 msgstr "Doporučení"
 
-#: ../../mod/contacts.php:440
+#: ../../mod/contacts.php:441
 msgid "Suggest potential friends"
 msgstr "Navrhnout potenciální přátele"
 
-#: ../../mod/contacts.php:443 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr "Všechny kontakty"
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:447
 msgid "Show all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:450
 msgid "Unblocked"
 msgstr "Odblokován"
 
-#: ../../mod/contacts.php:452
+#: ../../mod/contacts.php:453
 msgid "Only show unblocked contacts"
 msgstr "Zobrazit pouze neblokované kontakty"
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:457
 msgid "Blocked"
 msgstr "Blokován"
 
-#: ../../mod/contacts.php:459
+#: ../../mod/contacts.php:460
 msgid "Only show blocked contacts"
 msgstr "Zobrazit pouze blokované kontakty"
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:464
 msgid "Ignored"
 msgstr "Ignorován"
 
-#: ../../mod/contacts.php:466
+#: ../../mod/contacts.php:467
 msgid "Only show ignored contacts"
 msgstr "Zobrazit pouze ignorované kontakty"
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:471
 msgid "Archived"
 msgstr "Archivován"
 
-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:474
 msgid "Only show archived contacts"
 msgstr "Zobrazit pouze archivované kontakty"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:478
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: ../../mod/contacts.php:480
+#: ../../mod/contacts.php:481
 msgid "Only show hidden contacts"
 msgstr "Zobrazit pouze skryté kontakty"
 
-#: ../../mod/contacts.php:528
+#: ../../mod/contacts.php:529
 msgid "Mutual Friendship"
 msgstr "Vzájemné přátelství"
 
-#: ../../mod/contacts.php:532
+#: ../../mod/contacts.php:533
 msgid "is a fan of yours"
 msgstr "je Váš fanoušek"
 
-#: ../../mod/contacts.php:536
+#: ../../mod/contacts.php:537
 msgid "you are a fan of"
 msgstr "jste fanouškem"
 
-#: ../../mod/contacts.php:553 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Editovat kontakt"
 
-#: ../../mod/contacts.php:574 ../../view/theme/diabook/theme.php:88
-#: ../../include/nav.php:139
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:142
 msgid "Contacts"
 msgstr "Kontakty"
 
-#: ../../mod/contacts.php:578
+#: ../../mod/contacts.php:579
 msgid "Search your contacts"
 msgstr "Prohledat Vaše kontakty"
 
-#: ../../mod/contacts.php:579 ../../mod/directory.php:59
+#: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr "Zjištění: "
 
-#: ../../mod/contacts.php:580 ../../mod/directory.php:61
+#: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr "Najít"
@@ -2076,10 +2077,10 @@ msgstr "Na %s bylo zažádáno o resetování hesla"
 #: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
-#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3359
-#: ../../boot.php:803 ../../addon.old/facebook/facebook.php:702
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
+#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2093,7 +2094,7 @@ msgid ""
 "Password reset failed."
 msgstr "Žádost nemohla být ověřena. (Možná jste ji odeslali již dříve.) Obnovení hesla se nezdařilo."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:940
+#: ../../mod/lostpass.php:83 ../../boot.php:963
 msgid "Password Reset"
 msgstr "Obnovení hesla"
 
@@ -2137,69 +2138,77 @@ msgstr "Přezdívka nebo e-mail: "
 msgid "Reset"
 msgstr "Reset"
 
-#: ../../mod/settings.php:113
+#: ../../mod/settings.php:35
+msgid "Additional features"
+msgstr "Další funkčnosti"
+
+#: ../../mod/settings.php:118
 msgid "Missing some important data!"
 msgstr "Chybí některé důležité údaje!"
 
-#: ../../mod/settings.php:116 ../../mod/settings.php:569
+#: ../../mod/settings.php:121 ../../mod/settings.php:585
 msgid "Update"
 msgstr "Aktualizace"
 
-#: ../../mod/settings.php:221
+#: ../../mod/settings.php:226
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení."
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:231
 msgid "Email settings updated."
 msgstr "Nastavení e-mailu aktualizována."
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:246
+msgid "Features updated"
+msgstr "Aktualizované funkčnosti"
+
+#: ../../mod/settings.php:306
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hesla se neshodují. Heslo nebylo změněno."
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:311
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Prázdné hesla nejsou povolena. Heslo nebylo změněno."
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:322
 msgid "Password changed."
 msgstr "Heslo bylo změněno."
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:324
 msgid "Password update failed. Please try again."
 msgstr "Aktualizace hesla se nezdařila. Zkuste to prosím znovu."
 
-#: ../../mod/settings.php:373
+#: ../../mod/settings.php:389
 msgid " Please use a shorter name."
 msgstr "Prosím použijte kratší jméno."
 
-#: ../../mod/settings.php:375
+#: ../../mod/settings.php:391
 msgid " Name too short."
 msgstr "Jméno je příliš krátké."
 
-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:397
 msgid " Not valid email."
 msgstr "Neplatný e-mail."
 
-#: ../../mod/settings.php:383
+#: ../../mod/settings.php:399
 msgid " Cannot change to that email."
 msgstr "Nelze provést změnu na tento e-mail."
 
-#: ../../mod/settings.php:437
+#: ../../mod/settings.php:453
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Soukromé fórum nemá nastaveno zabezpečení. Používá se defaultní soukromá skupina."
 
-#: ../../mod/settings.php:441
+#: ../../mod/settings.php:457
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní soukromou skupinu."
 
-#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495
-#: ../../addon/fbpost/fbpost.php:144
+#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../addon/fbpost/fbpost.php:151
 #: ../../addon/remote_permissions/remote_permissions.php:204
 #: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:501
 #: ../../addon.old/facebook/facebook.php:495
 #: ../../addon.old/fbpost/fbpost.php:144
 #: ../../addon.old/impressum/impressum.php:78
@@ -2209,443 +2218,456 @@ msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní
 msgid "Settings updated."
 msgstr "Nastavení aktualizováno."
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:568
-#: ../../mod/settings.php:604
+#: ../../mod/settings.php:558 ../../mod/settings.php:584
+#: ../../mod/settings.php:620
 msgid "Add application"
 msgstr "Přidat aplikaci"
 
-#: ../../mod/settings.php:546 ../../mod/settings.php:572
-#: ../../addon/statusnet/statusnet.php:570
+#: ../../mod/settings.php:562 ../../mod/settings.php:588
+#: ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:547 ../../mod/settings.php:573
-#: ../../addon/statusnet/statusnet.php:569
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:693
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:574
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
 msgid "Redirect"
 msgstr "Přesměrování"
 
-#: ../../mod/settings.php:549 ../../mod/settings.php:575
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Icon url"
 msgstr "URL ikony"
 
-#: ../../mod/settings.php:560
+#: ../../mod/settings.php:576
 msgid "You can't edit this application."
 msgstr "Nemůžete editovat tuto aplikaci."
 
-#: ../../mod/settings.php:603
+#: ../../mod/settings.php:619
 msgid "Connected Apps"
 msgstr "Připojené aplikace"
 
-#: ../../mod/settings.php:607
+#: ../../mod/settings.php:623
 msgid "Client key starts with"
 msgstr "Klienský klíč začíná"
 
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:624
 msgid "No name"
 msgstr "Bez názvu"
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:625
 msgid "Remove authorization"
 msgstr "Odstranit oprávnění"
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:637
 msgid "No Plugin settings configured"
 msgstr "Žádný doplněk není nastaven"
 
-#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Nastavení doplňku"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:659
+msgid "Off"
+msgstr "Vypnuto"
+
+#: ../../mod/settings.php:659
+msgid "On"
+msgstr "Zapnuto"
+
+#: ../../mod/settings.php:667
+msgid "Additional Features"
+msgstr "Další Funkčnosti"
+
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Vestavěná podpora pro připojení s %s je %s"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "enabled"
 msgstr "povoleno"
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "disabled"
 msgstr "zakázáno"
 
-#: ../../mod/settings.php:641
+#: ../../mod/settings.php:682
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:714
 msgid "Email access is disabled on this site."
 msgstr "Přístup k elektronické poště je na tomto serveru zakázán."
 
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:720
 msgid "Connector Settings"
 msgstr "Nastavení konektoru"
 
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:725
 msgid "Email/Mailbox Setup"
 msgstr "Nastavení e-mailu"
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:726
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Pokud chcete komunikovat pomocí této služby s Vašimi kontakty z e-mailu (volitelné), uveďte, jak se připojit k Vaší e-mailové schránce."
 
-#: ../../mod/settings.php:686
+#: ../../mod/settings.php:727
 msgid "Last successful email check:"
 msgstr "Poslední úspěšná kontrola e-mailu:"
 
-#: ../../mod/settings.php:688
+#: ../../mod/settings.php:729
 msgid "IMAP server name:"
 msgstr "jméno IMAP serveru:"
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:730
 msgid "IMAP port:"
 msgstr "IMAP port:"
 
-#: ../../mod/settings.php:690
+#: ../../mod/settings.php:731
 msgid "Security:"
 msgstr "Zabezpečení:"
 
-#: ../../mod/settings.php:690 ../../mod/settings.php:695
+#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "Žádný"
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:732
 msgid "Email login name:"
 msgstr "přihlašovací jméno k e-mailu:"
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:733
 msgid "Email password:"
 msgstr "heslo k Vašemu e-mailu:"
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:734
 msgid "Reply-to address:"
 msgstr "Odpovědět na adresu:"
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:735
 msgid "Send public posts to all email contacts:"
 msgstr "Poslat veřejné příspěvky na všechny e-mailové kontakty:"
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:736
 msgid "Action after import:"
 msgstr "Akce po importu:"
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:736
 msgid "Mark as seen"
 msgstr "Označit jako přečtené"
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:736
 msgid "Move to folder"
 msgstr "Přesunout do složky"
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:737
 msgid "Move to folder:"
 msgstr "Přesunout do složky:"
 
-#: ../../mod/settings.php:727 ../../mod/admin.php:402
+#: ../../mod/settings.php:768 ../../mod/admin.php:404
 msgid "No special theme for mobile devices"
 msgstr "žádné speciální téma pro mobilní zařízení"
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:808
 msgid "Display Settings"
 msgstr "Nastavení Zobrazení"
 
-#: ../../mod/settings.php:773 ../../mod/settings.php:784
+#: ../../mod/settings.php:814 ../../mod/settings.php:825
 msgid "Display Theme:"
 msgstr "Vybrat grafickou šablonu:"
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:815
 msgid "Mobile Theme:"
 msgstr "Téma pro mobilní zařízení:"
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:816
 msgid "Update browser every xx seconds"
 msgstr "Aktualizovat prohlížeč každých xx sekund"
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:816
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 sekund, žádné maximum."
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:817
 msgid "Number of items to display per page:"
 msgstr "Počet položek zobrazených na stránce:"
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:817
 msgid "Maximum of 100 items"
 msgstr "Maximum 100 položek"
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:818
 msgid "Don't show emoticons"
 msgstr "Nezobrazovat emotikony"
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:894
 msgid "Normal Account Page"
 msgstr "Normální stránka účtu"
 
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:895
 msgid "This account is a normal personal profile"
 msgstr "Tento účet je běžný osobní profil"
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:898
 msgid "Soapbox Page"
 msgstr "Stránka \"Soapbox\""
 
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:899
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Automaticky schválit všechna spojení / přátelství jako fanoušky s právem pouze ke čtení"
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:902
 msgid "Community Forum/Celebrity Account"
 msgstr "Komunitní fórum/ účet celebrity"
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:903
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství, jako fanoušky s právem ke čtení."
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:906
 msgid "Automatic Friend Page"
 msgstr "Automatická stránka přítele"
 
-#: ../../mod/settings.php:866
+#: ../../mod/settings.php:907
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství jako přátele"
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:910
 msgid "Private Forum [Experimental]"
 msgstr "Soukromé fórum [Experimentální]"
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:911
 msgid "Private forum - approved members only"
 msgstr "Soukromé fórum - pouze pro schválené členy"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:923
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:923
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu."
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:933
 msgid "Publish your default profile in your local site directory?"
 msgstr "Publikovat Váš výchozí profil v místním adresáři webu?"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:939
 msgid "Publish your default profile in the global social directory?"
 msgstr "Publikovat Váš výchozí profil v globální sociálním adresáři?"
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:947
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Skrýt Vaše kontaktní údaje a seznam přátel před návštěvníky ve Vašem výchozím profilu?"
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:951
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Skrýt Vaše profilové detaily před neznámými uživateli?"
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:956
 msgid "Allow friends to post to your profile page?"
 msgstr "Povolit přátelům umisťování příspěvků na vaši profilovou stránku?"
 
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:962
 msgid "Allow friends to tag your posts?"
 msgstr "Povolit přátelům označovat Vaše příspěvky?"
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:968
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Chcete nám povolit abychom vás navrhovali jako přátelé pro nové členy?"
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:974
 msgid "Permit unknown people to send you private mail?"
 msgstr "Povolit neznámým lidem Vám zasílat soukromé zprávy?"
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:982
 msgid "Profile is not published."
 msgstr "Profil není zveřejněn."
 
-#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "nebo"
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:990
 msgid "Your Identity Address is"
 msgstr "Vaše adresa identity je"
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1001
 msgid "Automatically expire posts after this many days:"
 msgstr "Automaticky expirovat příspěvky po zadaném počtu dní:"
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1001
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Pokud je prázdné, příspěvky nebudou nikdy expirovat. Expirované příspěvky budou vymazány"
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:1002
 msgid "Advanced expiration settings"
 msgstr "Pokročilé nastavení expirací"
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:1003
 msgid "Advanced Expiration"
 msgstr "Nastavení expirací"
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:1004
 msgid "Expire posts:"
 msgstr "Expirovat příspěvky:"
 
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:1005
 msgid "Expire personal notes:"
 msgstr "Expirovat osobní poznámky:"
 
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:1006
 msgid "Expire starred posts:"
 msgstr "Expirovat příspěvky s hvězdou:"
 
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:1007
 msgid "Expire photos:"
 msgstr "Expirovat fotografie:"
 
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:1008
 msgid "Only expire posts by others:"
 msgstr "Přízpěvky expirovat pouze ostatními:"
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:1015
 msgid "Account Settings"
 msgstr "Nastavení účtu"
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:1023
 msgid "Password Settings"
 msgstr "Nastavení hesla"
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1024
 msgid "New Password:"
 msgstr "Nové heslo:"
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1025
 msgid "Confirm:"
 msgstr "Potvrďte:"
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1025
 msgid "Leave password fields blank unless changing"
 msgstr "Pokud nechcete změnit heslo, položku hesla nevyplňujte"
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:1029
 msgid "Basic Settings"
 msgstr "Základní nastavení"
 
-#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Celé jméno:"
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:1031
 msgid "Email Address:"
 msgstr "E-mailová adresa:"
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1032
 msgid "Your Timezone:"
 msgstr "Vaše časové pásmo:"
 
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1033
 msgid "Default Post Location:"
 msgstr "Výchozí umístění příspěvků:"
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1034
 msgid "Use Browser Location:"
 msgstr "Používat umístění dle prohlížeče:"
 
-#: ../../mod/settings.php:996
+#: ../../mod/settings.php:1037
 msgid "Security and Privacy Settings"
 msgstr "Nastavení zabezpečení a soukromí"
 
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:1039
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximální počet žádostí o přátelství za den:"
 
-#: ../../mod/settings.php:998 ../../mod/settings.php:1017
+#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
 msgid "(to prevent spam abuse)"
 msgstr "(Aby se zabránilo spamu)"
 
-#: ../../mod/settings.php:999
+#: ../../mod/settings.php:1040
 msgid "Default Post Permissions"
 msgstr "Výchozí oprávnění pro příspěvek"
 
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:1041
 msgid "(click to open/close)"
 msgstr "(Klikněte pro otevření/zavření)"
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1058
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum soukromých zpráv od neznámých lidí:"
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1061
 msgid "Notification Settings"
 msgstr "Nastavení notifikací"
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1062
 msgid "By default post a status message when:"
 msgstr "Defaultně posílat statusové zprávy když:"
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1063
 msgid "accepting a friend request"
 msgstr "akceptuji požadavek na přátelství"
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1064
 msgid "joining a forum/community"
 msgstr "připojující se k fóru/komunitě"
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1065
 msgid "making an interesting profile change"
 msgstr "provedení zajímavé profilové změny"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1066
 msgid "Send a notification email when:"
 msgstr "Poslat notifikaci e-mailem, když"
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1067
 msgid "You receive an introduction"
 msgstr "obdržíte žádost o propojení"
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1068
 msgid "Your introductions are confirmed"
 msgstr "Vaše žádosti jsou potvrzeny"
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1069
 msgid "Someone writes on your profile wall"
 msgstr "někdo Vám napíše na Vaši profilovou stránku"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1070
 msgid "Someone writes a followup comment"
 msgstr "někdo Vám napíše následný komentář"
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1071
 msgid "You receive a private message"
 msgstr "obdržíte soukromou zprávu"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1072
 msgid "You receive a friend suggestion"
 msgstr "Obdržel jste návrh přátelství"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1073
 msgid "You are tagged in a post"
 msgstr "Jste označen v příspěvku"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1074
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Byl Jste šťouchnout v příspěvku"
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1077
 msgid "Advanced Account/Page Type Settings"
 msgstr "Pokročilé nastavení účtu/stránky"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1078
 msgid "Change the behaviour of this account for special situations"
 msgstr "Změnit chování tohoto účtu ve speciálních situacích"
 
@@ -2667,63 +2689,64 @@ msgstr "Vyberte identitu pro správu: "
 msgid "Search Results For:"
 msgstr "Výsledky hledání pro:"
 
-#: ../../mod/network.php:221 ../../mod/search.php:18
+#: ../../mod/network.php:224 ../../mod/search.php:21
 msgid "Remove term"
 msgstr "Odstranit termín"
 
-#: ../../mod/network.php:230 ../../mod/search.php:27
+#: ../../mod/network.php:233 ../../mod/search.php:30
+#: ../../include/features.php:41
 msgid "Saved Searches"
 msgstr "Uložená hledání"
 
-#: ../../mod/network.php:231 ../../include/group.php:275
+#: ../../mod/network.php:234 ../../include/group.php:275
 msgid "add"
 msgstr "přidat"
 
-#: ../../mod/network.php:394
+#: ../../mod/network.php:397
 msgid "Commented Order"
 msgstr "Dle komentářů"
 
-#: ../../mod/network.php:397
+#: ../../mod/network.php:400
 msgid "Sort by Comment Date"
 msgstr "Řadit podle data komentáře"
 
-#: ../../mod/network.php:400
+#: ../../mod/network.php:403
 msgid "Posted Order"
 msgstr "Dle data"
 
-#: ../../mod/network.php:403
+#: ../../mod/network.php:406
 msgid "Sort by Post Date"
 msgstr "Řadit podle data příspěvku"
 
-#: ../../mod/network.php:410
+#: ../../mod/network.php:447
 msgid "Posts that mention or involve you"
 msgstr "Příspěvky, které Vás zmiňují nebo zahrnují"
 
-#: ../../mod/network.php:413
+#: ../../mod/network.php:453
 msgid "New"
 msgstr "Nové"
 
-#: ../../mod/network.php:416
+#: ../../mod/network.php:456
 msgid "Activity Stream - by date"
 msgstr "Proud aktivit - dle data"
 
-#: ../../mod/network.php:419
-msgid "Starred"
-msgstr "S hvězdičkou"
-
-#: ../../mod/network.php:422
-msgid "Favourite Posts"
-msgstr "Oblíbené přízpěvky"
-
-#: ../../mod/network.php:425
+#: ../../mod/network.php:462
 msgid "Shared Links"
 msgstr "Sdílené odkazy"
 
-#: ../../mod/network.php:428
+#: ../../mod/network.php:465
 msgid "Interesting Links"
 msgstr "Zajímavé odkazy"
 
-#: ../../mod/network.php:496
+#: ../../mod/network.php:471
+msgid "Starred"
+msgstr "S hvězdičkou"
+
+#: ../../mod/network.php:474
+msgid "Favourite Posts"
+msgstr "Oblíbené přízpěvky"
+
+#: ../../mod/network.php:546
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2732,32 +2755,32 @@ msgstr[0] "Upozornění: Tato skupina obsahuje %s člena z nezabezpečené sít
 msgstr[1] "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě."
 msgstr[2] "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě."
 
-#: ../../mod/network.php:499
+#: ../../mod/network.php:549
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "Soukromé zprávy této skupině jsou vystaveny riziku prozrazení."
 
-#: ../../mod/network.php:569
+#: ../../mod/network.php:619
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../../mod/network.php:571
+#: ../../mod/network.php:621
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení."
 
-#: ../../mod/network.php:576
+#: ../../mod/network.php:626
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1718
+#: ../../mod/notes.php:44 ../../boot.php:1755
 msgid "Personal Notes"
 msgstr "Osobní poznámky"
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
-#: ../../addon/fbpost/fbpost.php:267
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
+#: ../../addon/fbpost/fbpost.php:314
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
 #: ../../addon.old/facebook/facebook.php:770
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
 #: ../../addon.old/fbpost/fbpost.php:267
@@ -2766,26 +2789,32 @@ msgstr "Osobní poznámky"
 msgid "Save"
 msgstr "Uložit"
 
-#: ../../mod/uimport.php:41
+#: ../../mod/uimport.php:50 ../../mod/register.php:190
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu."
+
+#: ../../mod/uimport.php:64
 msgid "Import"
 msgstr "Import"
 
-#: ../../mod/uimport.php:43
+#: ../../mod/uimport.php:66
 msgid "Move account"
 msgstr "Přesunout účet"
 
-#: ../../mod/uimport.php:44
+#: ../../mod/uimport.php:67
 msgid ""
-"You can move here an account from another Friendica server. 
\r\n"
-"                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n"
-"                            This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"
-msgstr "Zde si můžete přesunout účet z jiného serveru Friendika. 
\n                            Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.
\n                            Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory"
+"You can import an account from another Friendica server. 
\r\n"
+"                            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.
\r\n"
+"                            This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+msgstr "Je možné  importovat účet z jiného Friendica serveru. 
\nPotřebujete exportovat Váš účet ze starého serveru a importovat ho zde. My následně znovu vytvoříme Váš účet zde se všemi Vašimi kontakty. Také se pokusíme informovat všechny Vaše přátele o tom, že jste se sem přesunuli.
\nTato funkčnost je experimentální. Nemůžeme importovat kontakty ze sítě OStatus (statusnet/identi.ca) nebo z diaspory."
 
-#: ../../mod/uimport.php:47
+#: ../../mod/uimport.php:70
 msgid "Account file"
 msgstr "Soubor s účtem"
 
-#: ../../mod/uimport.php:47
+#: ../../mod/uimport.php:70
 msgid ""
 "To export your accont, go to \"Settings->Export your porsonal data\" and "
 "select \"Export account\""
@@ -2796,7 +2825,7 @@ msgstr "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobní
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena."
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
 msgid "No recipient selected."
 msgstr "Nevybrán příjemce."
 
@@ -2804,15 +2833,15 @@ msgstr "Nevybrán příjemce."
 msgid "Unable to check your home location."
 msgstr "Nebylo možné zjistit Vaši domácí lokaci."
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
 msgid "Message could not be sent."
 msgstr "Zprávu se nepodařilo odeslat."
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
 msgid "Message collection failure."
 msgstr "Sběr zpráv selhal."
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
 msgid "Message sent."
 msgstr "Zpráva odeslána."
 
@@ -2821,12 +2850,12 @@ msgid "No recipient."
 msgstr "Žádný příjemce."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:898 ../../include/conversation.php:916
+#: ../../mod/message.php:249 ../../mod/message.php:257
+#: ../../include/conversation.php:905 ../../include/conversation.php:923
 msgid "Please enter a link URL:"
 msgstr "Zadejte prosím URL odkaz:"
 
-#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:285
 msgid "Send Private Message"
 msgstr "Odeslat soukromou zprávu"
 
@@ -2837,18 +2866,18 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr "Pokud si přejete, aby uživatel %s mohl odpovědět, ověřte si zda-li máte povoleno na svém serveru zasílání soukromých zpráv od neznámých odesilatelů."
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
-#: ../../mod/message.php:469
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:286
+#: ../../mod/message.php:476
 msgid "To:"
 msgstr "Adresát:"
 
-#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
-#: ../../mod/message.php:471
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:291
+#: ../../mod/message.php:478
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
-#: ../../mod/message.php:474 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:295
+#: ../../mod/message.php:481 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr "Vaše zpráva:"
 
@@ -2903,9 +2932,9 @@ msgid ""
 msgstr "Prohlédněte si další nastavení, a to zejména nastavení soukromí. Nezveřejnění svého účtu v adresáři je jako mít nezveřejněné telefonní číslo. Obecně platí, že je lepší mít svůj účet zveřejněný, leda by všichni vaši potenciální přátelé věděli, jak vás přesně najít."
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1694
+#: ../../boot.php:1731
 msgid "Profile"
 msgstr "Profil"
 
@@ -2947,7 +2976,7 @@ msgid "Connecting"
 msgstr "Probíhá pokus o připojení"
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
-#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
+#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:286
 #: ../../include/contact_selectors.php:81
 #: ../../addon.old/facebook/facebook.php:728
 #: ../../addon.old/fbpost/fbpost.php:239
@@ -3076,7 +3105,7 @@ msgstr "Skupina nenalezena."
 msgid "Group name changed."
 msgstr "Název skupiny byl změněn."
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
 msgid "Permission denied"
 msgstr "Nedostatečné oprávnění"
 
@@ -3128,7 +3157,7 @@ msgstr "Všechny kontakty (se zabezpečeným přístupovým profilem )"
 msgid "No contacts."
 msgstr "Žádné kontakty."
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:618
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
 msgid "View Contacts"
 msgstr "Zobrazit kontakty"
 
@@ -3159,12 +3188,6 @@ msgstr "Žádost o registraci na %s"
 msgid "Your registration is pending approval by the site owner."
 msgstr "Vaše registrace čeká na schválení vlastníkem serveru."
 
-#: ../../mod/register.php:190
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu."
-
 #: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
@@ -3193,7 +3216,7 @@ msgstr "Členství na tomto webu je pouze na pozvání."
 msgid "Your invitation ID: "
 msgstr "Vaše pozvání ID:"
 
-#: ../../mod/register.php:260 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:446
 msgid "Registration"
 msgstr "Registrace"
 
@@ -3216,7 +3239,7 @@ msgstr "Vyberte přezdívku k profilu. Ta musí začít s textovým znakem. Vaš
 msgid "Choose a nickname: "
 msgstr "Vyberte přezdívku:"
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:902
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
 msgid "Register"
 msgstr "Registrovat"
 
@@ -3225,9 +3248,9 @@ msgid "People Search"
 msgstr "Vyhledávání lidí"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
-#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
+#: ../../addon/communityhome/communityhome.php:164
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
+#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
 msgid "photo"
@@ -3235,10 +3258,10 @@ msgstr "fotografie"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:452
-#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
+#: ../../addon/communityhome/communityhome.php:159
+#: ../../addon/communityhome/communityhome.php:168
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@@ -3248,8 +3271,8 @@ msgid "status"
 msgstr "Stav"
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851
+#: ../../addon/communityhome/communityhome.php:173
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@@ -3263,8 +3286,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s nemá rád %2$s na %3$s"
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:39
-#: ../../mod/display.php:169 ../../include/items.php:3837
+#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39
+#: ../../mod/display.php:169 ../../include/items.php:3843
 msgid "Item not found."
 msgstr "Položka nenalezena."
 
@@ -3272,8 +3295,8 @@ msgstr "Položka nenalezena."
 msgid "Access denied."
 msgstr "Přístup odmítnut"
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:51 ../../boot.php:1701
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:51 ../../boot.php:1738
 msgid "Photos"
 msgstr "Fotografie"
 
@@ -3302,35 +3325,35 @@ msgstr "Nelze nalézt původní příspěvek."
 msgid "Empty post discarded."
 msgstr "Prázdný příspěvek odstraněn."
 
-#: ../../mod/item.php:420 ../../mod/wall_upload.php:133
-#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
+#: ../../mod/item.php:424 ../../mod/wall_upload.php:135
+#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr "Fotografie na zdi"
 
-#: ../../mod/item.php:833
+#: ../../mod/item.php:837
 msgid "System error. Post not saved."
 msgstr "Chyba systému. Příspěvek nebyl uložen."
 
-#: ../../mod/item.php:858
+#: ../../mod/item.php:862
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social "
 "network."
 msgstr "Tato zpráva vám byla zaslána od %s, člena sociální sítě Friendica."
 
-#: ../../mod/item.php:860
+#: ../../mod/item.php:864
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Můžete je navštívit online na adrese %s"
 
-#: ../../mod/item.php:861
+#: ../../mod/item.php:865
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr "Pokud nechcete dostávat tyto zprávy, kontaktujte prosím odesilatele odpovědí na tento záznam."
 
-#: ../../mod/item.php:863
+#: ../../mod/item.php:867
 #, php-format
 msgid "%s posted an update."
 msgstr "%s poslal aktualizaci."
@@ -3368,7 +3391,7 @@ msgstr "Znovu načtěte stránku (Shift+F5) nebo vymažte cache prohlížeče, p
 msgid "Unable to process image"
 msgstr "Obrázek nelze zpracovat "
 
-#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr "Obrázek překročil limit velikosti %d"
@@ -3429,50 +3452,50 @@ msgstr "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odst
 msgid "Please enter your password for verification:"
 msgstr "Prosím, zadejte své heslo pro ověření:"
 
-#: ../../mod/message.php:9 ../../include/nav.php:131
+#: ../../mod/message.php:9 ../../include/nav.php:132
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: ../../mod/message.php:63
+#: ../../mod/message.php:67
 msgid "Unable to locate contact information."
 msgstr "Nepodařilo se najít kontaktní informace."
 
-#: ../../mod/message.php:191
+#: ../../mod/message.php:195
 msgid "Message deleted."
 msgstr "Zpráva odstraněna."
 
-#: ../../mod/message.php:221
+#: ../../mod/message.php:225
 msgid "Conversation removed."
 msgstr "Konverzace odstraněna."
 
-#: ../../mod/message.php:327
+#: ../../mod/message.php:334
 msgid "No messages."
 msgstr "Žádné zprávy."
 
-#: ../../mod/message.php:334
+#: ../../mod/message.php:341
 #, php-format
 msgid "Unknown sender - %s"
 msgstr "Neznámý odesilatel - %s"
 
-#: ../../mod/message.php:337
+#: ../../mod/message.php:344
 #, php-format
 msgid "You and %s"
 msgstr "Vy a %s"
 
-#: ../../mod/message.php:340
+#: ../../mod/message.php:347
 #, php-format
 msgid "%s and You"
 msgstr "%s a Vy"
 
-#: ../../mod/message.php:350 ../../mod/message.php:462
+#: ../../mod/message.php:357 ../../mod/message.php:469
 msgid "Delete conversation"
 msgstr "Odstranit konverzaci"
 
-#: ../../mod/message.php:353
+#: ../../mod/message.php:360
 msgid "D, d M Y - g:i A"
 msgstr "D M R - g:i A"
 
-#: ../../mod/message.php:356
+#: ../../mod/message.php:363
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
@@ -3480,21 +3503,21 @@ msgstr[0] "%d zpráva"
 msgstr[1] "%d zprávy"
 msgstr[2] "%d zpráv"
 
-#: ../../mod/message.php:391
+#: ../../mod/message.php:398
 msgid "Message not available."
 msgstr "Zpráva není k dispozici."
 
-#: ../../mod/message.php:444
+#: ../../mod/message.php:451
 msgid "Delete message"
 msgstr "Smazat zprávu"
 
-#: ../../mod/message.php:464
+#: ../../mod/message.php:471
 msgid ""
 "No secure communications available. You may be able to "
 "respond from the sender's profile page."
 msgstr "Není k dispozici zabezpečená komunikace. Možná budete schopni reagovat z odesilatelovy profilové stránky."
 
-#: ../../mod/message.php:468
+#: ../../mod/message.php:475
 msgid "Send Reply"
 msgstr "Poslat odpověď"
 
@@ -3511,19 +3534,19 @@ msgstr "Žádní přátelé k zobrazení"
 msgid "Theme settings updated."
 msgstr "Nastavení téma zobrazení bylo aktualizováno."
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:442
+#: ../../mod/admin.php:96 ../../mod/admin.php:444
 msgid "Site"
 msgstr "Web"
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
+#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
+#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
+#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027
 msgid "Themes"
 msgstr "Témata"
 
@@ -3531,11 +3554,11 @@ msgstr "Témata"
 msgid "DB updates"
 msgstr "Aktualizace databáze"
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114
 msgid "Logs"
 msgstr "Logy"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:146
+#: ../../mod/admin.php:120 ../../include/nav.php:149
 msgid "Admin"
 msgstr "Administrace"
 
@@ -3547,19 +3570,19 @@ msgstr "Funkčnosti rozšíření"
 msgid "User registrations waiting for confirmation"
 msgstr "Registrace uživatele čeká na potvrzení"
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:669
+#: ../../mod/admin.php:183 ../../mod/admin.php:672
 msgid "Normal Account"
 msgstr "Normální účet"
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:670
+#: ../../mod/admin.php:184 ../../mod/admin.php:673
 msgid "Soapbox Account"
 msgstr "Soapbox účet"
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:671
+#: ../../mod/admin.php:185 ../../mod/admin.php:674
 msgid "Community/Celebrity Account"
 msgstr "Komunitní účet / Účet celebrity"
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:672
+#: ../../mod/admin.php:186 ../../mod/admin.php:675
 msgid "Automatic Friend Account"
 msgstr "Účet s automatickým schvalováním přátel"
 
@@ -3575,9 +3598,9 @@ msgstr "Soukromé fórum"
 msgid "Message queues"
 msgstr "Fronty zpráv"
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
-#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
-#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
+#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690
+#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990
+#: ../../mod/admin.php:1026 ../../mod/admin.php:1113
 msgid "Administration"
 msgstr "Administrace"
 
@@ -3601,380 +3624,391 @@ msgstr "Verze"
 msgid "Active plugins"
 msgstr "Aktivní pluginy"
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:375
 msgid "Site settings updated."
 msgstr "Nastavení webu aktualizováno."
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:430
 msgid "Closed"
 msgstr "Uzavřeno"
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
 msgid "Requires approval"
 msgstr "Vyžaduje schválení"
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
 msgid "Open"
 msgstr "Otevřená"
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Žádná SSL politika, odkazy budou následovat stránky SSL stav"
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:437
 msgid "Force all links to use SSL"
 msgstr "Vyžadovat u všech odkazů použití SSL"
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:438
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Certifikát podepsaný sám sebou, použít SSL pouze pro lokální odkazy (nedoporučeno)"
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:447
 msgid "File upload"
 msgstr "Nahrání souborů"
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:448
 msgid "Policies"
 msgstr "Politiky"
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:449
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:691
 #: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr "Název webu"
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:454
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:455
 msgid "System language"
 msgstr "Systémový jazyk"
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:456
 msgid "System theme"
 msgstr "Grafická šablona systému "
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:456
 msgid ""
 "Default system theme - may be over-ridden by user profiles - change theme settings"
 msgstr "Defaultní systémové téma - může být změněno v uživatelských profilech -  změnit  theme settings"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:457
 msgid "Mobile system theme"
 msgstr "Systémové téma zobrazení pro mobilní zařízení"
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:457
 msgid "Theme for mobile devices"
 msgstr "Téma zobrazení pro mobilní zařízení"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:458
 msgid "SSL link policy"
 msgstr "Politika SSL odkazů"
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:458
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Určuje, zda-li budou generované odkazy používat SSL"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:459
 msgid "Maximum image size"
 msgstr "Maximální velikost obrázků"
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:459
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximální velikost v bajtech nahraných obrázků. Defaultní je 0, což znamená neomezeno."
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:460
 msgid "Maximum image length"
 msgstr "Maximální velikost obrázků"
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:460
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximální délka v pixelech delší stránky nahrávaných obrázků. Defaultně je -1, což označuje bez limitu"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:461
 msgid "JPEG image quality"
 msgstr "JPEG kvalita obrázku"
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:461
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Defaultní je 100, což znamená plnou kvalitu."
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:463
 msgid "Register policy"
 msgstr "Politika registrace"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:464
+msgid "Maximum Daily Registrations"
+msgstr "Maximální počet denních registrací"
+
+#: ../../mod/admin.php:464
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user"
+" registrations to accept per day.  If register is set to closed, this "
+"setting has no effect."
+msgstr "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt."
+
+#: ../../mod/admin.php:465
 msgid "Register text"
 msgstr "Registrace textu"
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:465
 msgid "Will be displayed prominently on the registration page."
 msgstr "Bude zřetelně zobrazeno na registrační stránce."
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:466
 msgid "Accounts abandoned after x days"
 msgstr "Účet je opuštěn po x dnech"
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:466
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Neztrácejte systémové zdroje kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit."
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:467
 msgid "Allowed friend domains"
 msgstr "Povolené domény přátel"
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:467
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Čárkou oddělený seznam domén, kterým je povoleno navazovat přátelství s tímto webem. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu."
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:468
 msgid "Allowed email domains"
 msgstr "Povolené e-mailové domény"
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:468
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Čárkou oddělený seznam domén emalových adres, kterým je povoleno provádět registraci na tomto webu. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu."
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:469
 msgid "Block public"
 msgstr "Blokovat veřejnost"
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:469
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Označemím přepínače zablokujete veřejný přístup ke všem jinak veřejně přístupným soukromým stránkám uživatelům, kteří nebudou přihlášeni."
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:470
 msgid "Force publish"
 msgstr "Publikovat"
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:470
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Označením přepínače budou včechny profily na tomto webu uvedeny v adresáři webu."
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:471
 msgid "Global directory update URL"
 msgstr "aktualizace URL adresy Globálního adresáře "
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:471
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL adresa k aktualizaci globálního adresáře. Pokud není zadáno, funkce globálního adresáře není dostupná žádné aplikaci."
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:472
 msgid "Allow threaded items"
 msgstr "Povolit vícevláknové zpracování obsahu"
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:472
 msgid "Allow infinite level threading for items on this site."
 msgstr "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních vláken."
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:473
 msgid "Private posts by default for new users"
 msgstr "Nastavit pro nové uživatele příspěvky jako soukromé"
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:473
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Nastavit defaultní práva pro příspěvky od všech nových členů na výchozí soukromou skupinu raději než jako veřejné."
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:475
 msgid "Block multiple registrations"
 msgstr "Blokovat více registrací"
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:475
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky."
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "OpenID support"
 msgstr "podpora OpenID"
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "OpenID support for registration and logins."
 msgstr "Podpora OpenID pro registraci a přihlašování."
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:477
 msgid "Fullname check"
 msgstr "kontrola úplného jména"
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:477
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Přimět uživatele k registraci s mezerou mezi jménu a příjmením v poli Celé jméno, jako antispamové opatření."
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:478
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Regulární výrazy"
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:478
 msgid "Use PHP UTF8 regular expressions"
 msgstr "Použít PHP UTF8 regulární výrazy."
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:479
 msgid "Show Community Page"
 msgstr "Zobrazit stránku komunity"
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:479
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr "Zobrazit Komunitní stránku zobrazující všechny veřejné příspěvky napsané na této stránce."
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:480
 msgid "Enable OStatus support"
 msgstr "Zapnout podporu OStatus"
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:480
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Poskytnout zabudouvanou kompatibilitu s OStatus (identi.ca, status.net, etc.). Veškerá komunikace s OStatus je veřejná, proto bude občas zobrazeno upozornění."
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:481
 msgid "Enable Diaspora support"
 msgstr "Povolit podporu Diaspora"
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:481
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Poskytnout zabudovanou kompatibilitu sitě Diaspora."
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:482
 msgid "Only allow Friendica contacts"
 msgstr "Povolit pouze Friendica kontakty"
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:482
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Všechny kontakty musí používat Friendica protokol. Všchny jiné zabudované komunikační protokoly budou zablokované."
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:483
 msgid "Verify SSL"
 msgstr "Ověřit SSL"
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:483
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "Pokud si přejete, můžete vynutit striktní ověřování certifikátů. To znamená že se nebudete moci připojit k žádnému serveru s vlastním SSL certifikátem."
 
-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:484
 msgid "Proxy user"
 msgstr "Proxy uživatel"
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:485
 msgid "Proxy URL"
 msgstr "Proxy URL adresa"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:486
 msgid "Network timeout"
 msgstr "čas síťového spojení vypršelo (timeout)"
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:486
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Hodnota ve vteřinách. Nastavte 0 pro neomezeno (není doporučeno)."
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:487
 msgid "Delivery interval"
 msgstr "Interval doručování"
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Prodleva mezi doručovacími procesy běžícími na pozadí snižuje zátěž systému. Doporučené nastavení: 4-5 pro sdílené instalace, 2-3 pro virtuální soukromé servery, 0-1 pro velké dedikované servery."
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:488
 msgid "Poll interval"
 msgstr "Dotazovací interval"
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:488
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Tímto nastavením ovlivníte prodlení mezi aktualizačními procesy běžícími na pozadí, čímž můžete snížit systémovou zátěž. Pokud 0, použijte doručovací interval."
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:489
 msgid "Maximum Load Average"
 msgstr "Maximální průměrné zatížení"
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:489
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - defaultně 50"
 
-#: ../../mod/admin.php:503
+#: ../../mod/admin.php:506
 msgid "Update has been marked successful"
 msgstr "Aktualizace byla označena jako úspěšná."
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:516
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr "Vykonávání %s selhalo. Zkontrolujte chybový protokol."
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:519
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizace %s byla úspěšně aplikována."
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:523
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Aktualizace %s nevrátila žádný status. Není zřejmé, jestli byla úspěšná."
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:526
 #, php-format
 msgid "Update function %s could not be found."
 msgstr "Aktualizační funkce %s nebyla nalezena."
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:541
 msgid "No failed updates."
 msgstr "Žádné neúspěšné aktualizace."
 
-#: ../../mod/admin.php:542
+#: ../../mod/admin.php:545
 msgid "Failed Updates"
 msgstr "Neúspěšné aktualizace"
 
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:546
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "To nezahrnuje aktualizace do verze 1139, které nevracejí žádný status."
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:547
 msgid "Mark success (if update was manually applied)"
 msgstr "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)"
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:548
 msgid "Attempt to execute this update step automatically"
 msgstr "Pokusit se provést tuto aktualizaci automaticky."
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:573
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
@@ -3982,7 +4016,7 @@ msgstr[0] "%s uživatel blokován/odblokován"
 msgstr[1] "%s uživatelů blokováno/odblokováno"
 msgstr[2] "%s uživatelů blokováno/odblokováno"
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:580
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -3990,171 +4024,172 @@ msgstr[0] "%s uživatel smazán"
 msgstr[1] "%s uživatelů smazáno"
 msgstr[2] "%s uživatelů smazáno"
 
-#: ../../mod/admin.php:616
+#: ../../mod/admin.php:619
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Uživatel '%s' smazán"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:627
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Uživatel '%s' odblokován"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:627
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Uživatel '%s' blokován"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:693
 msgid "select all"
 msgstr "Vybrat vše"
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:694
 msgid "User registrations waiting for confirm"
 msgstr "Registrace uživatele čeká na potvrzení"
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:695
 msgid "Request date"
 msgstr "Datum žádosti"
 
-#: ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/admin.php:695 ../../mod/admin.php:705
 #: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:696
 msgid "No registrations."
 msgstr "Žádné registrace."
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:698
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Site admin"
 msgstr "Site administrátor"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Register date"
 msgstr "Datum registrace"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Last login"
 msgstr "Datum posledního přihlášení"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Last item"
 msgstr "Poslední položka"
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Account"
 msgstr "Účet"
 
-#: ../../mod/admin.php:704
+#: ../../mod/admin.php:707
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Vybraní uživatelé budou smazáni!\\n\\n Vše, co tito uživatelé na těchto stránkách vytvořili, bude trvale odstraněno!\\n\\n Opravdu pokračovat?"
 
-#: ../../mod/admin.php:705
+#: ../../mod/admin.php:708
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Uživatel {0} bude smazán!\\n\\n Vše, co tento uživatel na těchto stránkách vytvořil, bude trvale odstraněno!\\n\\n Opravdu pokračovat?"
 
-#: ../../mod/admin.php:746
+#: ../../mod/admin.php:749
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s zakázán."
 
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:753
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s povolen."
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:958
+#: ../../mod/admin.php:763 ../../mod/admin.php:961
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../../mod/admin.php:762 ../../mod/admin.php:960
+#: ../../mod/admin.php:765 ../../mod/admin.php:963
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../../mod/admin.php:784 ../../mod/admin.php:989
+#: ../../mod/admin.php:787 ../../mod/admin.php:992
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: ../../mod/admin.php:792 ../../mod/admin.php:999
+#: ../../mod/admin.php:795 ../../mod/admin.php:1002
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:793 ../../mod/admin.php:1000
+#: ../../mod/admin.php:796 ../../mod/admin.php:1003
 msgid "Maintainer: "
 msgstr "Správce: "
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:925
 msgid "No themes found."
 msgstr "Nenalezeny žádná témata."
 
-#: ../../mod/admin.php:981
+#: ../../mod/admin.php:984
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: ../../mod/admin.php:1029
+#: ../../mod/admin.php:1032
 msgid "[Experimental]"
 msgstr "[Experimentální]"
 
-#: ../../mod/admin.php:1030
+#: ../../mod/admin.php:1033
 msgid "[Unsupported]"
 msgstr "[Nepodporováno]"
 
-#: ../../mod/admin.php:1057
+#: ../../mod/admin.php:1060
 msgid "Log settings updated."
 msgstr "Nastavení protokolu aktualizováno."
 
-#: ../../mod/admin.php:1113
+#: ../../mod/admin.php:1116
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ../../mod/admin.php:1119
+#: ../../mod/admin.php:1122
 msgid "Debugging"
 msgstr "Ladění"
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1123
 msgid "Log file"
 msgstr "Soubor s logem"
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1123
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Musí být editovatelné web serverem. Relativní cesta k vašemu kořenovému adresáři Friendica"
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1124
 msgid "Log level"
 msgstr "Úroveň auditu"
 
-#: ../../mod/admin.php:1171
+#: ../../mod/admin.php:1174
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1180
 msgid "FTP Host"
 msgstr "Hostitel FTP"
 
-#: ../../mod/admin.php:1178
+#: ../../mod/admin.php:1181
 msgid "FTP Path"
 msgstr "Cesta FTP"
 
-#: ../../mod/admin.php:1179
+#: ../../mod/admin.php:1182
 msgid "FTP User"
 msgstr "FTP uživatel"
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1183
 msgid "FTP Password"
 msgstr "FTP heslo"
 
-#: ../../mod/profile.php:21 ../../boot.php:1089
+#: ../../mod/profile.php:21 ../../boot.php:1126
 msgid "Requested profile is not available."
 msgstr "Požadovaný profil není k dispozici."
 
@@ -4224,8 +4259,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr "Nenalezen účet a OpenID registrace na tomto serveru není dovolena."
 
-#: ../../mod/openid.php:93 ../../include/auth.php:98
-#: ../../include/auth.php:161
+#: ../../mod/openid.php:93 ../../include/auth.php:110
+#: ../../include/auth.php:173
 msgid "Login failed."
 msgstr "Přihlášení se nezdařilo."
 
@@ -4262,13 +4297,13 @@ msgstr "Aplikace"
 msgid "No installed applications."
 msgstr "Žádné nainstalované aplikace."
 
-#: ../../mod/search.php:96 ../../include/text.php:678
-#: ../../include/text.php:679 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:685
+#: ../../include/text.php:686 ../../include/nav.php:91
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:434
-#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:441
+#: ../../mod/profiles.php:555 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr "Profil nenalezen"
 
@@ -4276,307 +4311,312 @@ msgstr "Profil nenalezen"
 msgid "Profile Name is required."
 msgstr "Jméno profilu je povinné."
 
-#: ../../mod/profiles.php:171
+#: ../../mod/profiles.php:178
 msgid "Marital Status"
 msgstr "Rodinný Stav"
 
-#: ../../mod/profiles.php:175
+#: ../../mod/profiles.php:182
 msgid "Romantic Partner"
 msgstr "Romatický partner"
 
-#: ../../mod/profiles.php:179
+#: ../../mod/profiles.php:186
 msgid "Likes"
 msgstr "Libí se mi"
 
-#: ../../mod/profiles.php:183
+#: ../../mod/profiles.php:190
 msgid "Dislikes"
 msgstr "Nelibí se mi"
 
-#: ../../mod/profiles.php:187
+#: ../../mod/profiles.php:194
 msgid "Work/Employment"
 msgstr "Práce/Zaměstnání"
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:197
 msgid "Religion"
 msgstr "Náboženství"
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:201
 msgid "Political Views"
 msgstr "Politické přesvědčení"
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:205
 msgid "Gender"
 msgstr "Pohlaví"
 
-#: ../../mod/profiles.php:202
+#: ../../mod/profiles.php:209
 msgid "Sexual Preference"
 msgstr "Sexuální orientace"
 
-#: ../../mod/profiles.php:206
+#: ../../mod/profiles.php:213
 msgid "Homepage"
 msgstr "Domácí stránka"
 
-#: ../../mod/profiles.php:210
+#: ../../mod/profiles.php:217
 msgid "Interests"
 msgstr "Zájmy"
 
-#: ../../mod/profiles.php:214
+#: ../../mod/profiles.php:221
 msgid "Address"
 msgstr "Adresa"
 
-#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:228 ../../addon/dav/common/wdcal_edit.inc.php:183
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr "Lokace"
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:311
 msgid "Profile updated."
 msgstr "Profil aktualizován."
 
-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:378
 msgid " and "
 msgstr " a "
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:386
 msgid "public profile"
 msgstr "veřejný profil"
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:389
 #, php-format
 msgid "%1$s changed %2$s to “%3$s”"
 msgstr "%1$s změnil %2$s na “%3$s”"
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:390
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr " - Navštivte %2$s uživatele %1$s"
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:393
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr "%1$s aktualizoval %2$s, změnou %3$s."
 
-#: ../../mod/profiles.php:453
+#: ../../mod/profiles.php:460
 msgid "Profile deleted."
 msgstr "Profil smazán."
 
-#: ../../mod/profiles.php:471 ../../mod/profiles.php:505
+#: ../../mod/profiles.php:478 ../../mod/profiles.php:512
 msgid "Profile-"
 msgstr "Profil-"
 
-#: ../../mod/profiles.php:490 ../../mod/profiles.php:532
+#: ../../mod/profiles.php:497 ../../mod/profiles.php:539
 msgid "New profile created."
 msgstr "Nový profil vytvořen."
 
-#: ../../mod/profiles.php:511
+#: ../../mod/profiles.php:518
 msgid "Profile unavailable to clone."
 msgstr "Profil není možné naklonovat."
 
-#: ../../mod/profiles.php:573
+#: ../../mod/profiles.php:583
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?"
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:603
 msgid "Edit Profile Details"
 msgstr "Upravit podrobnosti profilu "
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:605
+msgid "Change Profile Photo"
+msgstr "Změna Profilové fotky"
+
+#: ../../mod/profiles.php:606
 msgid "View this profile"
 msgstr "Zobrazit tento profil"
 
-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:607
 msgid "Create a new profile using these settings"
 msgstr "Vytvořit nový profil pomocí tohoto nastavení"
 
-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:608
 msgid "Clone this profile"
 msgstr "Klonovat tento profil"
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:609
 msgid "Delete this profile"
 msgstr "Smazat tento profil"
 
-#: ../../mod/profiles.php:599
+#: ../../mod/profiles.php:610
 msgid "Profile Name:"
 msgstr "Jméno profilu:"
 
-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:611
 msgid "Your Full Name:"
 msgstr "Vaše celé jméno:"
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:612
 msgid "Title/Description:"
 msgstr "Název / Popis:"
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:613
 msgid "Your Gender:"
 msgstr "Vaše pohlaví:"
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:614
 #, php-format
 msgid "Birthday (%s):"
 msgstr "Narozeniny uživatele (%s):"
 
-#: ../../mod/profiles.php:604
+#: ../../mod/profiles.php:615
 msgid "Street Address:"
 msgstr "Ulice:"
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:616
 msgid "Locality/City:"
 msgstr "Město:"
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:617
 msgid "Postal/Zip Code:"
 msgstr "PSČ:"
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:618
 msgid "Country:"
 msgstr "Země:"
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:619
 msgid "Region/State:"
 msgstr "Region / stát:"
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:620
 msgid "♥ Marital Status:"
 msgstr "♥ Rodinný stav:"
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:621
 msgid "Who: (if applicable)"
 msgstr "Kdo: (pokud je možné)"
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:622
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr "Příklady: jan123, Jan Novák, jan@seznam.cz"
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:623
 msgid "Since [date]:"
 msgstr "Od [data]:"
 
-#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr "Sexuální preference:"
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:625
 msgid "Homepage URL:"
 msgstr "Odkaz na domovskou stránku:"
 
-#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:626 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr "Rodné město"
 
-#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:627 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr "Politické přesvědčení:"
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:628
 msgid "Religious Views:"
 msgstr "Náboženské přesvědčení:"
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:629
 msgid "Public Keywords:"
 msgstr "Veřejná klíčová slova:"
 
-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:630
 msgid "Private Keywords:"
 msgstr "Soukromá klíčová slova:"
 
-#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:631 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr "Líbí se:"
 
-#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:632 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr "Nelibí se:"
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:633
 msgid "Example: fishing photography software"
 msgstr "Příklad: fishing photography software"
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:634
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr "(Používá se pro doporučování potenciálních přátel, může být viděno ostatními)"
 
-#: ../../mod/profiles.php:624
+#: ../../mod/profiles.php:635
 msgid "(Used for searching profiles, never shown to others)"
 msgstr "(Používá se pro vyhledávání profilů, není nikdy zobrazeno ostatním)"
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:636
 msgid "Tell us about yourself..."
 msgstr "Řekněte nám něco o sobě ..."
 
-#: ../../mod/profiles.php:626
+#: ../../mod/profiles.php:637
 msgid "Hobbies/Interests"
 msgstr "Koníčky/zájmy"
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:638
 msgid "Contact information and Social Networks"
 msgstr "Kontaktní informace a sociální sítě"
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:639
 msgid "Musical interests"
 msgstr "Hudební vkus"
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:640
 msgid "Books, literature"
 msgstr "Knihy, literatura"
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:641
 msgid "Television"
 msgstr "Televize"
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:642
 msgid "Film/dance/culture/entertainment"
 msgstr "Film/tanec/kultura/zábava"
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:643
 msgid "Love/romance"
 msgstr "Láska/romantika"
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:644
 msgid "Work/employment"
 msgstr "Práce/zaměstnání"
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:645
 msgid "School/education"
 msgstr "Škola/vzdělání"
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:650
 msgid ""
 "This is your public profile.
It may "
 "be visible to anybody using the internet."
 msgstr "Toto je váš veřejný profil.
Ten může být viditelný kýmkoliv na internetu."
 
-#: ../../mod/profiles.php:649 ../../mod/directory.php:111
+#: ../../mod/profiles.php:660 ../../mod/directory.php:111
+#: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr "Věk: "
 
-#: ../../mod/profiles.php:688
+#: ../../mod/profiles.php:699
 msgid "Edit/Manage Profiles"
 msgstr "Upravit / Spravovat profily"
 
-#: ../../mod/profiles.php:689 ../../boot.php:1207
+#: ../../mod/profiles.php:700 ../../boot.php:1244
 msgid "Change profile photo"
 msgstr "Změnit profilovou fotografii"
 
-#: ../../mod/profiles.php:690 ../../boot.php:1208
+#: ../../mod/profiles.php:701 ../../boot.php:1245
 msgid "Create New Profile"
 msgstr "Vytvořit nový profil"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1218
+#: ../../mod/profiles.php:712 ../../boot.php:1255
 msgid "Profile Image"
 msgstr "Profilový obrázek"
 
-#: ../../mod/profiles.php:703 ../../boot.php:1221
+#: ../../mod/profiles.php:714 ../../boot.php:1258
 msgid "visible to everybody"
 msgstr "viditelné pro všechny"
 
-#: ../../mod/profiles.php:704 ../../boot.php:1222
+#: ../../mod/profiles.php:715 ../../boot.php:1259
 msgid "Edit visibility"
 msgstr "Upravit viditelnost"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:902
-#: ../../include/conversation.php:920
+#: ../../mod/filer.php:29 ../../include/conversation.php:909
+#: ../../include/conversation.php:927
 msgid "Save to Folder:"
 msgstr "Uložit do složky:"
 
@@ -4668,7 +4708,7 @@ msgstr "Vstupní data (ve formátu Diaspora): "
 msgid "diaspora2bb: "
 msgstr "diaspora2bb: "
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr "Návrhy přátel"
@@ -4683,42 +4723,50 @@ msgstr "Nejsou dostupné žádné návrhy. Pokud je toto nový server, zkuste to
 msgid "Ignore/Hide"
 msgstr "Ignorovat / skrýt"
 
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
+#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
+#: ../../view/theme/diabook/theme.php:518
 msgid "Global Directory"
 msgstr "Globální adresář"
 
-#: ../../mod/directory.php:57
+#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79
 msgid "Find on this site"
 msgstr "Nalézt na tomto webu"
 
-#: ../../mod/directory.php:60
+#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82
 msgid "Site Directory"
 msgstr "Adresář serveru"
 
 #: ../../mod/directory.php:114
+#: ../../addon/forumdirectory/forumdirectory.php:136
 msgid "Gender: "
 msgstr "Pohlaví: "
 
-#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1243
+#: ../../mod/directory.php:136
+#: ../../addon/forumdirectory/forumdirectory.php:158
+#: ../../include/profile_advanced.php:17 ../../boot.php:1280
 msgid "Gender:"
 msgstr "Pohlaví:"
 
-#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1246
+#: ../../mod/directory.php:138
+#: ../../addon/forumdirectory/forumdirectory.php:160
+#: ../../include/profile_advanced.php:37 ../../boot.php:1283
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1248
+#: ../../mod/directory.php:140
+#: ../../addon/forumdirectory/forumdirectory.php:162
+#: ../../include/profile_advanced.php:48 ../../boot.php:1285
 msgid "Homepage:"
 msgstr "Domácí stránka:"
 
-#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
+#: ../../mod/directory.php:142
+#: ../../addon/forumdirectory/forumdirectory.php:164
+#: ../../include/profile_advanced.php:58
 msgid "About:"
 msgstr "O mě:"
 
 #: ../../mod/directory.php:180
+#: ../../addon/forumdirectory/forumdirectory.php:202
 msgid "No entries (some entries may be hidden)."
 msgstr "Žádné záznamy (některé položky mohou být skryty)."
 
@@ -4894,22 +4942,22 @@ msgstr "Připojení přijato na %s"
 msgid "%1$s has joined %2$s"
 msgstr "%1$s se připojil k %2$s"
 
-#: ../../addon/fromgplus/fromgplus.php:29
+#: ../../addon/fromgplus/fromgplus.php:33
 #: ../../addon.old/fromgplus/fromgplus.php:29
 msgid "Google+ Import Settings"
 msgstr "Nastavení importu z Google+ "
 
-#: ../../addon/fromgplus/fromgplus.php:32
+#: ../../addon/fromgplus/fromgplus.php:36
 #: ../../addon.old/fromgplus/fromgplus.php:32
 msgid "Enable Google+ Import"
 msgstr "Povolit Import z Google+"
 
-#: ../../addon/fromgplus/fromgplus.php:35
+#: ../../addon/fromgplus/fromgplus.php:39
 #: ../../addon.old/fromgplus/fromgplus.php:35
 msgid "Google Account ID"
 msgstr "název účtu Google "
 
-#: ../../addon/fromgplus/fromgplus.php:55
+#: ../../addon/fromgplus/fromgplus.php:59
 #: ../../addon.old/fromgplus/fromgplus.php:55
 msgid "Google+ Import Settings saved."
 msgstr "Nastavení importu z Google+ uloženo."
@@ -4924,7 +4972,7 @@ msgstr "Facebook zakázán"
 msgid "Updating contacts"
 msgstr "Aktualizace kontaktů"
 
-#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
+#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:199
 #: ../../addon.old/facebook/facebook.php:551
 #: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
@@ -4945,7 +4993,7 @@ msgstr "Nainstalovat pro tento účet Facebook konektor."
 msgid "Remove Facebook connector"
 msgstr "Odstranit konektor na Facebook"
 
-#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
+#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:224
 #: ../../addon.old/facebook/facebook.php:576
 #: ../../addon.old/fbpost/fbpost.php:217
 msgid ""
@@ -4953,7 +5001,7 @@ msgid ""
 "changed.]"
 msgstr "Opětovná autentikace [Toto je nezbytné kdykoliv se změní Vaše heslo na Facebooku.]"
 
-#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
+#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:231
 #: ../../addon.old/facebook/facebook.php:583
 #: ../../addon.old/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
@@ -5033,13 +5081,13 @@ msgstr "Problémy s Facebook Real-Time aktualizacemi"
 msgid "Facebook Connector Settings"
 msgstr "Nastavení Facebook konektoru "
 
-#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
+#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:302
 #: ../../addon.old/facebook/facebook.php:744
 #: ../../addon.old/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr "Facebook API Key"
 
-#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262
+#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:309
 #: ../../addon.old/facebook/facebook.php:754
 #: ../../addon.old/fbpost/fbpost.php:262
 msgid ""
@@ -5067,13 +5115,13 @@ msgid ""
 "going on."
 msgstr "Správnost klíče API nemohla být detekovaná. Děje se něco podivného."
 
-#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
+#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:311
 #: ../../addon.old/facebook/facebook.php:766
 #: ../../addon.old/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr "App-ID / API-Key"
 
-#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
+#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:312
 #: ../../addon.old/facebook/facebook.php:767
 #: ../../addon.old/fbpost/fbpost.php:265
 msgid "Application secret"
@@ -5117,7 +5165,7 @@ msgstr "Real-Time aktualizace nejsou aktivovány."
 msgid "Activate Real-Time Updates"
 msgstr "Aktivovat Real-Time aktualizace"
 
-#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
+#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:329
 #: ../../addon/dav/friendica/layout.fnk.php:361
 #: ../../addon.old/facebook/facebook.php:799
 #: ../../addon.old/fbpost/fbpost.php:282
@@ -5125,13 +5173,13 @@ msgstr "Aktivovat Real-Time aktualizace"
 msgid "The new values have been saved."
 msgstr "Nové hodnoty byly uloženy"
 
-#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
+#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:348
 #: ../../addon.old/facebook/facebook.php:823
 #: ../../addon.old/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr "Přidat příspěvek na Facebook"
 
-#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
+#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:446
 #: ../../addon.old/facebook/facebook.php:921
 #: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
@@ -5139,31 +5187,31 @@ msgid ""
 "conflict."
 msgstr "Příspěvek na Facebook zrušen kvůli konfliktu přístupových práv mezi sítěmi."
 
-#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
+#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:722
 #: ../../addon.old/facebook/facebook.php:1149
 #: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr "Zobrazení na Friendica"
 
-#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
+#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:759
 #: ../../addon.old/facebook/facebook.php:1182
 #: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr "Zaslání příspěvku na Facebook selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
 
-#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
+#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:799
 #: ../../addon.old/facebook/facebook.php:1222
 #: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr "Vaše připojení na Facebook přestalo být platné. Prosím znovu se přihlaste."
 
-#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
+#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:800
 #: ../../addon.old/facebook/facebook.php:1223
 #: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr "Připojení na Facebook bylo zneplatněno."
 
-#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685
+#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:801
 #: ../../addon.old/facebook/facebook.php:1224
 #: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
@@ -5188,48 +5236,56 @@ msgstr "Nastavení StatusNet automatického následování (AutoFollow)"
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr "Automaticky následovat jakékoliv StatusNet následníky/přispivatele"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr "Životnost vyrovnávací paměti (v hodinách)"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr "Statistika vyrovnávací paměti"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr "Počet položek"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr "Velikost vyrovnávací paměti"
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr "Vymazat celou vyrovnávací paměť"
 
-#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172
+#: ../../addon/fbpost/fbpost.php:179 ../../addon.old/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
 msgstr "Příspěvky na Facebook zakázán."
 
-#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199
+#: ../../addon/fbpost/fbpost.php:206 ../../addon.old/fbpost/fbpost.php:199
 msgid "Facebook Post"
 msgstr "Facebook příspěvek"
 
-#: ../../addon/fbpost/fbpost.php:205 ../../addon.old/fbpost/fbpost.php:205
+#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
 msgstr "Instalovat pro tento účet konektor pro příspěvky na Facebook."
 
-#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:212
+#: ../../addon/fbpost/fbpost.php:219 ../../addon.old/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
 msgstr "Odstranit konektor pro příspěvky na Facebook"
 
-#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240
+#: ../../addon/fbpost/fbpost.php:235
+msgid "Suppress \"View on friendica\""
+msgstr "Potlačit \"Zobrazit na friendica\""
+
+#: ../../addon/fbpost/fbpost.php:245
+msgid "Post to page/group:"
+msgstr "Příspěvek na stránku/skupinu"
+
+#: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
 msgstr "Nastavení konektoru pro příspěvky na Facebook"
 
@@ -5540,12 +5596,12 @@ msgid "%s - Click to open/close"
 msgstr "%s - Klikněte pro otevření/zavření"
 
 #: ../../addon/page/page.php:62 ../../addon/page/page.php:92
-#: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62
+#: ../../addon/forumlist/forumlist.php:64 ../../addon.old/page/page.php:62
 #: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60
 msgid "Forums"
 msgstr "Fóra"
 
-#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94
+#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:98
 #: ../../addon.old/page/page.php:130
 #: ../../addon.old/forumlist/forumlist.php:94
 msgid "Forums:"
@@ -5579,11 +5635,15 @@ msgstr "Nastavení Planets"
 msgid "Enable Planets Plugin"
 msgstr "Povolit Planets plugin"
 
+#: ../../addon/forumdirectory/forumdirectory.php:22
+msgid "Forum Directory"
+msgstr "Adresář Fór"
+
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:927
+#: ../../include/nav.php:64 ../../boot.php:949
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5617,13 +5677,13 @@ msgstr "Nejaktivnější uživatelé"
 msgid "Latest photos"
 msgstr "Poslední fotky"
 
-#: ../../addon/communityhome/communityhome.php:133
+#: ../../addon/communityhome/communityhome.php:134
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr "Poslední \"líbí se mi\""
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
+#: ../../addon/communityhome/communityhome.php:156
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@@ -5777,7 +5837,7 @@ msgstr "Dny"
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@@ -5788,7 +5848,7 @@ msgstr "Neděle"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@@ -5796,35 +5856,35 @@ msgid "Monday"
 msgstr "Pondělí"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr "Úterý"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr "Středa"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr "Čtvrtek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr "Pátek"
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@@ -6192,7 +6252,7 @@ msgstr "Rozšířený kalendář s podporou CalDAV"
 
 #: ../../addon/dav/friendica/main.php:279
 #: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:774
+#: ../../include/enotify.php:28 ../../include/notifier.php:778
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -6464,6 +6524,7 @@ msgid "may only be a partial list"
 msgstr "pouze pro část seznamu"
 
 #: ../../addon/remote_permissions/remote_permissions.php:196
+#: ../../addon/altpager/altpager.php:99
 msgid "Global"
 msgstr "Globální"
 
@@ -6472,6 +6533,7 @@ msgid "The posts of every user on this server show the post recipients"
 msgstr "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků"
 
 #: ../../addon/remote_permissions/remote_permissions.php:197
+#: ../../addon/altpager/altpager.php:100
 msgid "Individual"
 msgstr "Individuálové"
 
@@ -6546,57 +6608,57 @@ msgstr "Přeneste sem soubory k nahrání"
 msgid "Failed"
 msgstr "Neúspěch"
 
-#: ../../addon/js_upload/js_upload.php:297
+#: ../../addon/js_upload/js_upload.php:303
 #: ../../addon.old/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr "Žádné soubory nebyly nahrány."
 
-#: ../../addon/js_upload/js_upload.php:303
+#: ../../addon/js_upload/js_upload.php:309
 #: ../../addon.old/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr "Nahraný soubor je prázdný"
 
-#: ../../addon/js_upload/js_upload.php:326
+#: ../../addon/js_upload/js_upload.php:332
 #: ../../addon.old/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr "Soubor má neplatnou příponu, ta by měla být jednou z"
 
-#: ../../addon/js_upload/js_upload.php:337
+#: ../../addon/js_upload/js_upload.php:343
 #: ../../addon.old/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr "Nahrávání bylo zrušeno nebo došlo k chybě na serveru"
 
-#: ../../addon/forumlist/forumlist.php:63
+#: ../../addon/forumlist/forumlist.php:67
 #: ../../addon.old/forumlist/forumlist.php:63
 msgid "show/hide"
 msgstr "zobrazit/skrýt"
 
-#: ../../addon/forumlist/forumlist.php:77
+#: ../../addon/forumlist/forumlist.php:81
 #: ../../addon.old/forumlist/forumlist.php:77
 msgid "No forum subscriptions"
 msgstr "Žádné registrace k fórům"
 
-#: ../../addon/forumlist/forumlist.php:131
+#: ../../addon/forumlist/forumlist.php:134
 #: ../../addon.old/forumlist/forumlist.php:131
 msgid "Forumlist settings updated."
 msgstr "Nastavení Forumlist aktualizováno."
 
-#: ../../addon/forumlist/forumlist.php:159
+#: ../../addon/forumlist/forumlist.php:162
 #: ../../addon.old/forumlist/forumlist.php:159
 msgid "Forumlist Settings"
 msgstr "Nastavení Forumlist"
 
-#: ../../addon/forumlist/forumlist.php:161
+#: ../../addon/forumlist/forumlist.php:164
 #: ../../addon.old/forumlist/forumlist.php:161
 msgid "Randomise forum list"
 msgstr "Zamíchat list fór"
 
-#: ../../addon/forumlist/forumlist.php:164
+#: ../../addon/forumlist/forumlist.php:167
 #: ../../addon.old/forumlist/forumlist.php:164
 msgid "Show forums on profile page"
 msgstr "Zobrazit fóra na profilové stránce"
 
-#: ../../addon/forumlist/forumlist.php:167
+#: ../../addon/forumlist/forumlist.php:170
 #: ../../addon.old/forumlist/forumlist.php:167
 msgid "Show forums on network page"
 msgstr "Zobrazit fóra na stránce Síť"
@@ -6792,11 +6854,8 @@ msgid "The default zoom level. (1:world, 18:highest)"
 msgstr "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)"
 
 #: ../../addon/group_text/group_text.php:46
-#: ../../addon/editplain/editplain.php:46
-#: ../../addon.old/group_text/group_text.php:46
-#: ../../addon.old/editplain/editplain.php:46
-msgid "Editplain settings updated."
-msgstr "Editplain nastavení aktualizováno"
+msgid "Group Text settings updated."
+msgstr "Nastavení textu skupiny aktualizováno."
 
 #: ../../addon/group_text/group_text.php:76
 #: ../../addon.old/group_text/group_text.php:76
@@ -6926,16 +6985,24 @@ msgstr "Defaultně poslat na Libertree"
 msgid "Altpager settings updated."
 msgstr "Nastavení Altpager aktualizováno."
 
-#: ../../addon/altpager/altpager.php:79
+#: ../../addon/altpager/altpager.php:83
 #: ../../addon.old/altpager/altpager.php:79
 msgid "Alternate Pagination Setting"
 msgstr "Alternate Pagination nastavení"
 
-#: ../../addon/altpager/altpager.php:81
+#: ../../addon/altpager/altpager.php:85
 #: ../../addon.old/altpager/altpager.php:81
 msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
 msgstr "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?"
 
+#: ../../addon/altpager/altpager.php:99
+msgid "Force global use of the alternate pager"
+msgstr "Vynutit globální použití alternativního stránkování"
+
+#: ../../addon/altpager/altpager.php:100
+msgid "Each user chooses whether to use the alternate pager"
+msgstr "Každý uživatel si vybere, zda-li použije alternativní stránkování."
+
 #: ../../addon/mathjax/mathjax.php:37 ../../addon.old/mathjax/mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
@@ -6957,6 +7024,12 @@ msgid ""
 "be either the MathJax CDN or another installation of MathJax."
 msgstr "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax."
 
+#: ../../addon/editplain/editplain.php:46
+#: ../../addon.old/group_text/group_text.php:46
+#: ../../addon.old/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr "Editplain nastavení aktualizováno"
+
 #: ../../addon/editplain/editplain.php:76
 #: ../../addon.old/editplain/editplain.php:76
 msgid "Editplain Settings"
@@ -7261,7 +7334,7 @@ msgstr "Poslat propojené #-tagy a @-jména na StatusNet"
 msgid "Clear OAuth configuration"
 msgstr "Vymazat konfiguraci OAuth"
 
-#: ../../addon/statusnet/statusnet.php:568
+#: ../../addon/statusnet/statusnet.php:692
 #: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr "API URL"
@@ -7271,30 +7344,42 @@ msgstr "API URL"
 msgid "Infinite Improbability Drive"
 msgstr "Infinite Improbability Drive"
 
-#: ../../addon/tumblr/tumblr.php:36 ../../addon.old/tumblr/tumblr.php:36
+#: ../../addon/tumblr/tumblr.php:144
+msgid "You are now authenticated to tumblr."
+msgstr "Nyní jste přihlášen k tumblr."
+
+#: ../../addon/tumblr/tumblr.php:145
+msgid "return to the connector page"
+msgstr "návrat ke stránce konektor"
+
+#: ../../addon/tumblr/tumblr.php:158 ../../addon.old/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr "Příspěvek na Tumbir"
 
-#: ../../addon/tumblr/tumblr.php:67 ../../addon.old/tumblr/tumblr.php:67
+#: ../../addon/tumblr/tumblr.php:185 ../../addon.old/tumblr/tumblr.php:67
 msgid "Tumblr Post Settings"
 msgstr "Nastavení příspěvků na Tumbir"
 
-#: ../../addon/tumblr/tumblr.php:69 ../../addon.old/tumblr/tumblr.php:69
+#: ../../addon/tumblr/tumblr.php:188
+msgid "(Re-)Authenticate your tumblr page"
+msgstr "(Znovu) přihlásit k Vaší tumblr stránce"
+
+#: ../../addon/tumblr/tumblr.php:192 ../../addon.old/tumblr/tumblr.php:69
 msgid "Enable Tumblr Post Plugin"
 msgstr "Povolit rozšíření Tumbir"
 
-#: ../../addon/tumblr/tumblr.php:74 ../../addon.old/tumblr/tumblr.php:74
-msgid "Tumblr login"
-msgstr "Tumbir přihlašovací jméno"
-
-#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79
-msgid "Tumblr password"
-msgstr "Tumbir heslo"
-
-#: ../../addon/tumblr/tumblr.php:84 ../../addon.old/tumblr/tumblr.php:84
+#: ../../addon/tumblr/tumblr.php:197 ../../addon.old/tumblr/tumblr.php:84
 msgid "Post to Tumblr by default"
 msgstr "Standardně posílat příspěvky na Tumbir"
 
+#: ../../addon/tumblr/tumblr.php:217
+msgid "Post to page:"
+msgstr "Příspěvek ke stránce:"
+
+#: ../../addon/tumblr/tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr "Nyní nejste přihlášen k tumblr."
+
 #: ../../addon/numfriends/numfriends.php:46
 #: ../../addon.old/numfriends/numfriends.php:46
 msgid "Numfriends settings updated."
@@ -7495,11 +7580,11 @@ msgstr "Defaultně zasílat veřejné komentáře na Twitter"
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr "Poslat propojené #-tagy a @-jména na Twitter"
 
-#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr "Consumer key"
 
-#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr "Consumer secret"
 
@@ -7637,135 +7722,137 @@ msgstr "Nastavení šířku grafické šablony"
 msgid "Color scheme"
 msgstr "Barevné schéma"
 
-#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
-#: ../../include/nav.php:115
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr "Vaše příspěvky a konverzace"
 
-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr "Vaše profilová stránka"
 
-#: ../../view/theme/diabook/theme.php:88
+#: ../../view/theme/diabook/theme.php:89
 msgid "Your contacts"
 msgstr "Vaše kontakty"
 
-#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
 msgid "Your photos"
 msgstr "Vaše fotky"
 
-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
 msgid "Your events"
 msgstr "Vaše události"
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr "Osobní poznámky"
 
-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr "Vaše osobní fotky"
 
-#: ../../view/theme/diabook/theme.php:93
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr "Komunitní stránky"
 
-#: ../../view/theme/diabook/theme.php:377
-#: ../../view/theme/diabook/theme.php:591
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr "Komunitní profily"
 
-#: ../../view/theme/diabook/theme.php:398
-#: ../../view/theme/diabook/theme.php:596
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr "Poslední uživatelé"
 
-#: ../../view/theme/diabook/theme.php:427
-#: ../../view/theme/diabook/theme.php:598
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr "Poslední líbí/nelíbí"
 
-#: ../../view/theme/diabook/theme.php:472
-#: ../../view/theme/diabook/theme.php:597
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr "Poslední fotografie"
 
-#: ../../view/theme/diabook/theme.php:509
-#: ../../view/theme/diabook/theme.php:594
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr "Nalézt Přátele"
 
-#: ../../view/theme/diabook/theme.php:510
+#: ../../view/theme/diabook/theme.php:517
 msgid "Local Directory"
 msgstr "Lokální Adresář"
 
-#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr "Podobné zájmy"
 
-#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr "Pozvat přátele"
 
-#: ../../view/theme/diabook/theme.php:531
-#: ../../view/theme/diabook/theme.php:590
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr "Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:536
+#: ../../view/theme/diabook/theme.php:577
 msgid "Set zoomfactor for Earth Layers"
 msgstr "Nastavit faktor přiblížení pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:578
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr "Nastavit zeměpistnou délku (X) pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:538
+#: ../../view/theme/diabook/theme.php:579
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr "Nastavit zeměpistnou šířku (X) pro Earth Layers"
 
-#: ../../view/theme/diabook/theme.php:551
 #: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr "Pomoc nebo @ProNováčky ?"
 
-#: ../../view/theme/diabook/theme.php:558
-#: ../../view/theme/diabook/theme.php:593
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr "Propojené služby"
 
-#: ../../view/theme/diabook/theme.php:565
-#: ../../view/theme/diabook/theme.php:595
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
 msgid "Last Tweets"
 msgstr "Poslední tweety"
 
-#: ../../view/theme/diabook/theme.php:568
+#: ../../view/theme/diabook/theme.php:609
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr "Nastavit vyhledávací frázi na twitteru"
 
-#: ../../view/theme/diabook/theme.php:587
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313
 msgid "don't show"
 msgstr "nikdy nezobrazit"
 
-#: ../../view/theme/diabook/theme.php:587
-#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312
 msgid "show"
 msgstr "zobrazit"
 
-#: ../../view/theme/diabook/theme.php:588
+#: ../../view/theme/diabook/theme.php:630
 msgid "Show/hide boxes at right-hand column:"
 msgstr "Zobrazit/skrýt boxy na pravém sloupci:"
 
@@ -7939,6 +8026,10 @@ msgstr "XMPP/IM"
 msgid "MySpace"
 msgstr "MySpace"
 
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
+msgstr "Google+"
+
 #: ../../include/profile_selectors.php:6
 msgid "Male"
 msgstr "Muž"
@@ -8180,7 +8271,7 @@ msgstr "Začíná:"
 msgid "Finishes:"
 msgstr "Končí:"
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:767
+#: ../../include/delivery.php:457 ../../include/notifier.php:771
 msgid "(no subject)"
 msgstr "(Bez předmětu)"
 
@@ -8212,11 +8303,11 @@ msgstr "novější"
 msgid "older"
 msgstr "starší"
 
-#: ../../include/text.php:597
+#: ../../include/text.php:604
 msgid "No contacts"
 msgstr "Žádné kontakty"
 
-#: ../../include/text.php:606
+#: ../../include/text.php:613
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -8224,207 +8315,207 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontaktů"
 msgstr[2] "%d kontaktů"
 
-#: ../../include/text.php:719
+#: ../../include/text.php:726
 msgid "poke"
 msgstr "šťouchnout"
 
-#: ../../include/text.php:719 ../../include/conversation.php:210
+#: ../../include/text.php:726 ../../include/conversation.php:210
 msgid "poked"
 msgstr "šťouchnut"
 
-#: ../../include/text.php:720
+#: ../../include/text.php:727
 msgid "ping"
 msgstr "cinknout"
 
-#: ../../include/text.php:720
+#: ../../include/text.php:727
 msgid "pinged"
 msgstr "cinkut"
 
-#: ../../include/text.php:721
+#: ../../include/text.php:728
 msgid "prod"
 msgstr "pobídnout"
 
-#: ../../include/text.php:721
+#: ../../include/text.php:728
 msgid "prodded"
 msgstr "pobídnut"
 
-#: ../../include/text.php:722
+#: ../../include/text.php:729
 msgid "slap"
 msgstr "dát facku"
 
-#: ../../include/text.php:722
+#: ../../include/text.php:729
 msgid "slapped"
 msgstr "být uhozen"
 
-#: ../../include/text.php:723
+#: ../../include/text.php:730
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:723
+#: ../../include/text.php:730
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:724
+#: ../../include/text.php:731
 msgid "rebuff"
 msgstr "odmítnout"
 
-#: ../../include/text.php:724
+#: ../../include/text.php:731
 msgid "rebuffed"
 msgstr "odmítnut"
 
-#: ../../include/text.php:736
+#: ../../include/text.php:743
 msgid "happy"
 msgstr "šťasný"
 
-#: ../../include/text.php:737
+#: ../../include/text.php:744
 msgid "sad"
 msgstr "smutný"
 
-#: ../../include/text.php:738
+#: ../../include/text.php:745
 msgid "mellow"
 msgstr "jemný"
 
-#: ../../include/text.php:739
+#: ../../include/text.php:746
 msgid "tired"
 msgstr "unavený"
 
-#: ../../include/text.php:740
+#: ../../include/text.php:747
 msgid "perky"
 msgstr "emergický"
 
-#: ../../include/text.php:741
+#: ../../include/text.php:748
 msgid "angry"
 msgstr "nazlobený"
 
-#: ../../include/text.php:742
+#: ../../include/text.php:749
 msgid "stupified"
 msgstr "otupen"
 
-#: ../../include/text.php:743
+#: ../../include/text.php:750
 msgid "puzzled"
 msgstr "popletený"
 
-#: ../../include/text.php:744
+#: ../../include/text.php:751
 msgid "interested"
 msgstr "zajímavý"
 
-#: ../../include/text.php:745
+#: ../../include/text.php:752
 msgid "bitter"
 msgstr "hořký"
 
-#: ../../include/text.php:746
+#: ../../include/text.php:753
 msgid "cheerful"
 msgstr "radnostný"
 
-#: ../../include/text.php:747
+#: ../../include/text.php:754
 msgid "alive"
 msgstr "naživu"
 
-#: ../../include/text.php:748
+#: ../../include/text.php:755
 msgid "annoyed"
 msgstr "otráven"
 
-#: ../../include/text.php:749
+#: ../../include/text.php:756
 msgid "anxious"
 msgstr "znepokojený"
 
-#: ../../include/text.php:750
+#: ../../include/text.php:757
 msgid "cranky"
 msgstr "mrzutý"
 
-#: ../../include/text.php:751
+#: ../../include/text.php:758
 msgid "disturbed"
 msgstr "vyrušen"
 
-#: ../../include/text.php:752
+#: ../../include/text.php:759
 msgid "frustrated"
 msgstr "frustrovaný"
 
-#: ../../include/text.php:753
+#: ../../include/text.php:760
 msgid "motivated"
 msgstr "motivovaný"
 
-#: ../../include/text.php:754
+#: ../../include/text.php:761
 msgid "relaxed"
 msgstr "uvolněný"
 
-#: ../../include/text.php:755
+#: ../../include/text.php:762
 msgid "surprised"
 msgstr "překvapený"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "January"
 msgstr "Ledna"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "February"
 msgstr "Února"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "March"
 msgstr "Března"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "April"
 msgstr "Dubna"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "May"
 msgstr "Května"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "June"
 msgstr "Června"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "July"
 msgstr "Července"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "August"
 msgstr "Srpna"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "September"
 msgstr "Září"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "October"
 msgstr "Října"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "November"
 msgstr "Listopadu"
 
-#: ../../include/text.php:919
+#: ../../include/text.php:926
 msgid "December"
 msgstr "Prosinec"
 
-#: ../../include/text.php:1005
+#: ../../include/text.php:1010
 msgid "bytes"
 msgstr "bytů"
 
-#: ../../include/text.php:1032 ../../include/text.php:1044
+#: ../../include/text.php:1037 ../../include/text.php:1049
 msgid "Click to open/close"
 msgstr "Klikněte pro otevření/zavření"
 
-#: ../../include/text.php:1217 ../../include/user.php:236
+#: ../../include/text.php:1222 ../../include/user.php:236
 msgid "default"
 msgstr "standardní"
 
-#: ../../include/text.php:1229
+#: ../../include/text.php:1234
 msgid "Select an alternate language"
 msgstr "Vyběr alternativního jazyka"
 
-#: ../../include/text.php:1439
+#: ../../include/text.php:1444
 msgid "activity"
 msgstr "aktivita"
 
-#: ../../include/text.php:1442
+#: ../../include/text.php:1447
 msgid "post"
 msgstr "příspěvek"
 
-#: ../../include/text.php:1597
+#: ../../include/text.php:1602
 msgid "Item filed"
 msgstr "Položka vyplněna"
 
@@ -8432,19 +8523,19 @@ msgstr "Položka vyplněna"
 msgid "Sharing notification from Diaspora network"
 msgstr "Sdílení oznámení ze sítě Diaspora"
 
-#: ../../include/diaspora.php:2222
+#: ../../include/diaspora.php:2236
 msgid "Attachments:"
 msgstr "Přílohy:"
 
-#: ../../include/network.php:849
+#: ../../include/network.php:847
 msgid "view full size"
 msgstr "zobrazit v plné velikosti"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr "vložený obsah"
 
-#: ../../include/oembed.php:146
+#: ../../include/oembed.php:147
 msgid "Embedding disabled"
 msgstr "Vkládání zakázáno"
 
@@ -8460,15 +8551,24 @@ msgstr "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s
 msgid "Error! I can't import this file: DB schema version is not compatible."
 msgstr "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní."
 
-#: ../../include/uimport.php:92
+#: ../../include/uimport.php:81
+msgid "Error! Cannot check nickname"
+msgstr "Chyba! Nelze ověřit přezdívku"
+
+#: ../../include/uimport.php:85
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr "Uživatel '%s' již na tomto serveru existuje!"
+
+#: ../../include/uimport.php:104
 msgid "User creation error"
 msgstr "Chyba vytváření uživatele"
 
-#: ../../include/uimport.php:110
+#: ../../include/uimport.php:122
 msgid "User profile creation error"
 msgstr "Chyba vytváření uživatelského účtu"
 
-#: ../../include/uimport.php:155
+#: ../../include/uimport.php:167
 #, php-format
 msgid "%d contact not imported"
 msgid_plural "%d contacts not imported"
@@ -8476,7 +8576,7 @@ msgstr[0] "%d kontakt nenaimporován"
 msgstr[1] "%d kontaktů nenaimporováno"
 msgstr[2] "%d kontakty nenaimporovány"
 
-#: ../../include/uimport.php:233
+#: ../../include/uimport.php:245
 msgid "Done. You can now login with your username and password"
 msgstr "Hotovo. Nyní  se můžete přihlásit se svými uživatelským účtem a heslem"
 
@@ -8511,7 +8611,7 @@ msgstr "Vytvořit novou skupinu"
 msgid "Contacts not in any group"
 msgstr "Kontakty, které nejsou v žádné skupině"
 
-#: ../../include/nav.php:46 ../../boot.php:926
+#: ../../include/nav.php:46 ../../boot.php:948
 msgid "Logout"
 msgstr "Odhlásit se"
 
@@ -8519,7 +8619,7 @@ msgstr "Odhlásit se"
 msgid "End this session"
 msgstr "Konec této relace"
 
-#: ../../include/nav.php:49 ../../boot.php:1687
+#: ../../include/nav.php:49 ../../boot.php:1724
 msgid "Status"
 msgstr "Stav"
 
@@ -8567,55 +8667,63 @@ msgstr "Adresář"
 msgid "Conversations from your friends"
 msgstr "Konverzace od Vašich přátel"
 
-#: ../../include/nav.php:121
+#: ../../include/nav.php:114
+msgid "Network Reset"
+msgstr "Síťový Reset"
+
+#: ../../include/nav.php:114
+msgid "Load Network page with no filters"
+msgstr "Načíst stránku Síť bez filtrů"
+
+#: ../../include/nav.php:122
 msgid "Friend Requests"
 msgstr "Žádosti přátel"
 
-#: ../../include/nav.php:123
+#: ../../include/nav.php:124
 msgid "See all notifications"
 msgstr "Zobrazit všechny upozornění"
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:125
 msgid "Mark all system notifications seen"
 msgstr "Označit všechny upozornění systému jako přečtené"
 
-#: ../../include/nav.php:128
+#: ../../include/nav.php:129
 msgid "Private mail"
 msgstr "Soukromá pošta"
 
-#: ../../include/nav.php:129
+#: ../../include/nav.php:130
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:131
 msgid "Outbox"
 msgstr "Odeslaná pošta"
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage"
 msgstr "Spravovat"
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage other pages"
 msgstr "Spravovat jiné stránky"
 
-#: ../../include/nav.php:138 ../../boot.php:1201
+#: ../../include/nav.php:140 ../../boot.php:1238
 msgid "Profiles"
 msgstr "Profily"
 
-#: ../../include/nav.php:138 ../../boot.php:1201
-msgid "Manage/edit profiles"
-msgstr "Spravovat/upravit profily"
+#: ../../include/nav.php:140
+msgid "Manage/Edit Profiles"
+msgstr "Spravovat/Editovat Profily"
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:142
 msgid "Manage/edit friends and contacts"
 msgstr "Spravovat/upravit přátelé a kontakty"
 
-#: ../../include/nav.php:146
+#: ../../include/nav.php:149
 msgid "Site setup and configuration"
 msgstr "Nastavení webu a konfigurace"
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:173
 msgid "Nothing new here"
 msgstr "Zde není nic nového"
 
@@ -8659,37 +8767,37 @@ msgstr "Příklady: Robert Morgenstein, rybaření"
 msgid "Random Profile"
 msgstr "Náhodný Profil"
 
-#: ../../include/contact_widgets.php:68
+#: ../../include/contact_widgets.php:70
 msgid "Networks"
 msgstr "Sítě"
 
-#: ../../include/contact_widgets.php:71
+#: ../../include/contact_widgets.php:73
 msgid "All Networks"
 msgstr "Všechny sítě"
 
-#: ../../include/contact_widgets.php:98
+#: ../../include/contact_widgets.php:103 ../../include/features.php:59
 msgid "Saved Folders"
 msgstr "Uložené složky"
 
-#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
 msgid "Everything"
 msgstr "Všechno"
 
-#: ../../include/contact_widgets.php:126
+#: ../../include/contact_widgets.php:135
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../../include/auth.php:35
+#: ../../include/auth.php:36
 msgid "Logged out."
 msgstr "Odhlášen."
 
-#: ../../include/auth.php:114
+#: ../../include/auth.php:126
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím Vámi zadaným OpenID. Prosím ověřte si, že jste ID zadali správně. "
 
-#: ../../include/auth.php:114
+#: ../../include/auth.php:126
 msgid "The error message was:"
 msgstr "Chybová zpráva byla:"
 
@@ -8750,42 +8858,190 @@ msgstr "sekund"
 msgid "%1$d %2$s ago"
 msgstr "před %1$d %2$s"
 
-#: ../../include/datetime.php:472 ../../include/items.php:1689
+#: ../../include/datetime.php:472 ../../include/items.php:1695
 #, php-format
 msgid "%s's birthday"
 msgstr "%s má narozeniny"
 
-#: ../../include/datetime.php:473 ../../include/items.php:1690
+#: ../../include/datetime.php:473 ../../include/items.php:1696
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Veselé narozeniny %s"
 
-#: ../../include/onepoll.php:414
+#: ../../include/onepoll.php:421
 msgid "From: "
 msgstr "Od:"
 
-#: ../../include/bbcode.php:185 ../../include/bbcode.php:406
+#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
 msgid "Image/photo"
 msgstr "Obrázek/fotografie"
 
-#: ../../include/bbcode.php:371 ../../include/bbcode.php:391
+#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
 msgid "$1 wrote:"
 msgstr "$1 napsal:"
 
-#: ../../include/bbcode.php:410 ../../include/bbcode.php:411
+#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
 msgid "Encrypted content"
 msgstr "Šifrovaný obsah"
 
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr "Obecné funkčnosti"
+
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
+msgstr "Vícenásobné profily"
+
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
+msgstr "Schopnost vytvořit vícenásobné profily"
+
+#: ../../include/features.php:30
+msgid "Post Composition Features"
+msgstr "Nastavení vytváření příspěvků"
+
+#: ../../include/features.php:31
+msgid "Richtext Editor"
+msgstr "Richtext Editor"
+
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
+msgstr "Povolit richtext editor"
+
+#: ../../include/features.php:32
+msgid "Post Preview"
+msgstr "Náhled příspěvku"
+
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
+msgstr "Povolit náhledy příspěvků a komentářů před jejich zveřejněním"
+
+#: ../../include/features.php:37
+msgid "Network Sidebar Widgets"
+msgstr "Síťové postranní widgety"
+
+#: ../../include/features.php:38
+msgid "Search by Date"
+msgstr "Vyhledávat dle Data"
+
+#: ../../include/features.php:38
+msgid "Ability to select posts by date ranges"
+msgstr "Možnost označit příspěvky dle časového intervalu"
+
+#: ../../include/features.php:39
+msgid "Group Filter"
+msgstr "Skupinový Filtr"
+
+#: ../../include/features.php:39
+msgid "Enable widget to display Network posts only from selected group"
+msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené skupiny"
+
+#: ../../include/features.php:40
+msgid "Network Filter"
+msgstr "Síťový Filtr"
+
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected network"
+msgstr "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě"
+
+#: ../../include/features.php:41
+msgid "Save search terms for re-use"
+msgstr "Uložit kritéria vyhledávání pro znovupoužití"
+
+#: ../../include/features.php:46
+msgid "Network Tabs"
+msgstr "Síťové záložky"
+
+#: ../../include/features.php:47
+msgid "Network Personal Tab"
+msgstr "Osobní síťový záložka "
+
+#: ../../include/features.php:47
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval "
+
+#: ../../include/features.php:48
+msgid "Network New Tab"
+msgstr "Nová záložka síť"
+
+#: ../../include/features.php:48
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)"
+
+#: ../../include/features.php:49
+msgid "Network Shared Links Tab"
+msgstr "záložka Síťové sdílené odkazy "
+
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts with links in them"
+msgstr "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně"
+
+#: ../../include/features.php:54
+msgid "Post/Comment Tools"
+msgstr "Nástroje Příspěvků/Komentářů"
+
+#: ../../include/features.php:55
+msgid "Multiple Deletion"
+msgstr "Násobné mazání"
+
+#: ../../include/features.php:55
+msgid "Select and delete multiple posts/comments at once"
+msgstr "Označit a smazat více "
+
+#: ../../include/features.php:56
+msgid "Edit Sent Posts"
+msgstr "Editovat Odeslané příspěvky"
+
+#: ../../include/features.php:56
+msgid "Edit and correct posts and comments after sending"
+msgstr "Editovat a opravit příspěvky a komentáře po odeslání"
+
+#: ../../include/features.php:57
+msgid "Tagging"
+msgstr "Štítkování"
+
+#: ../../include/features.php:57
+msgid "Ability to tag existing posts"
+msgstr "Schopnost přidat štítky ke stávajícím příspvěkům"
+
+#: ../../include/features.php:58
+msgid "Post Categories"
+msgstr "Kategorie příspěvků"
+
+#: ../../include/features.php:58
+msgid "Add categories to your posts"
+msgstr "Přidat kategorie k Vašim příspěvkům"
+
+#: ../../include/features.php:59
+msgid "Ability to file posts under folders"
+msgstr "Možnost řadit příspěvky do složek"
+
+#: ../../include/features.php:60
+msgid "Dislike Posts"
+msgstr "Označit příspěvky jako neoblíbené"
+
+#: ../../include/features.php:60
+msgid "Ability to dislike posts/comments"
+msgstr "Možnost označit příspěvky/komentáře jako neoblíbené"
+
+#: ../../include/features.php:61
+msgid "Star Posts"
+msgstr "Příspěvky s hvězdou"
+
+#: ../../include/features.php:61
+msgid "Ability to mark special posts with a star indicator"
+msgstr "Možnost označit příspěvky s indikátorem hvězdy"
+
 #: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Nelze nalézt záznam v DNS pro databázový server '%s'"
 
-#: ../../include/message.php:15 ../../include/message.php:171
+#: ../../include/message.php:15 ../../include/message.php:172
 msgid "[no subject]"
 msgstr "[bez předmětu]"
 
-#: ../../include/acl_selectors.php:286
+#: ../../include/acl_selectors.php:311
 msgid "Visible to everybody"
 msgstr "Viditelné pro všechny"
 
@@ -9030,15 +9286,15 @@ msgstr "Nepodařilo se získat kontaktní informace."
 msgid "following"
 msgstr "následující"
 
-#: ../../include/items.php:3357
+#: ../../include/items.php:3363
 msgid "A new person is sharing with you at "
 msgstr "Nový člověk si s vámi sdílí na"
 
-#: ../../include/items.php:3357
+#: ../../include/items.php:3363
 msgid "You have a new follower at "
 msgstr "Máte nového následovníka na"
 
-#: ../../include/items.php:4038
+#: ../../include/items.php:4047
 msgid "Archives"
 msgstr "Archív"
 
@@ -9122,7 +9378,7 @@ msgstr "Prosím nahrejte profilovou fotografii"
 msgid "Welcome back "
 msgstr "Vítejte zpět "
 
-#: ../../include/security.php:354
+#: ../../include/security.php:357
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -9177,11 +9433,11 @@ msgstr "příspěvek/položka"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "uživatel %1$s označil %2$s's %3$s jako oblíbeného"
 
-#: ../../include/conversation.php:599 ../../object/Item.php:218
+#: ../../include/conversation.php:599 ../../object/Item.php:226
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: ../../include/conversation.php:600 ../../object/Item.php:219
+#: ../../include/conversation.php:600 ../../object/Item.php:227
 msgid "Filed under:"
 msgstr "Vyplněn pod:"
 
@@ -9221,46 +9477,46 @@ msgstr "%2$d lidem se to nelíbí."
 msgid "and"
 msgstr "a"
 
-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:875
 #, php-format
 msgid ", and %d other people"
 msgstr ", a %d dalších lidí"
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s like this."
 msgstr "%s se to líbí."
 
-#: ../../include/conversation.php:873
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s don't like this."
 msgstr "%s se to nelíbí."
 
-#: ../../include/conversation.php:897 ../../include/conversation.php:915
+#: ../../include/conversation.php:904 ../../include/conversation.php:922
 msgid "Visible to everybody"
 msgstr "Viditelné pro všechny"
 
-#: ../../include/conversation.php:899 ../../include/conversation.php:917
+#: ../../include/conversation.php:906 ../../include/conversation.php:924
 msgid "Please enter a video link/URL:"
 msgstr "Prosím zadejte URL adresu videa:"
 
-#: ../../include/conversation.php:900 ../../include/conversation.php:918
+#: ../../include/conversation.php:907 ../../include/conversation.php:925
 msgid "Please enter an audio link/URL:"
 msgstr "Prosím zadejte URL adresu zvukového záznamu:"
 
-#: ../../include/conversation.php:901 ../../include/conversation.php:919
+#: ../../include/conversation.php:908 ../../include/conversation.php:926
 msgid "Tag term:"
 msgstr "Štítek:"
 
-#: ../../include/conversation.php:903 ../../include/conversation.php:921
+#: ../../include/conversation.php:910 ../../include/conversation.php:928
 msgid "Where are you right now?"
 msgstr "Kde právě jste?"
 
-#: ../../include/conversation.php:904
+#: ../../include/conversation.php:911
 msgid "Delete item(s)?"
 msgstr "Smazat položku(y)?"
 
-#: ../../include/conversation.php:983
+#: ../../include/conversation.php:990
 msgid "permissions"
 msgstr "oprávnění"
 
@@ -9276,105 +9532,117 @@ msgstr "Tato akce překročí limit nastavené Vaším předplatným."
 msgid "This action is not available under your subscription plan."
 msgstr "Tato akce není v rámci Vašeho předplatného dostupná."
 
-#: ../../boot.php:588
+#: ../../boot.php:607
 msgid "Delete this item?"
 msgstr "Odstranit tuto položku?"
 
-#: ../../boot.php:591
+#: ../../boot.php:610
 msgid "show fewer"
 msgstr "zobrazit méně"
 
-#: ../../boot.php:798
+#: ../../boot.php:819
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualizace %s selhala. Zkontrolujte protokol chyb."
 
-#: ../../boot.php:800
+#: ../../boot.php:821
 #, php-format
 msgid "Update Error at %s"
 msgstr "Chyba aktualizace na %s"
 
-#: ../../boot.php:901
+#: ../../boot.php:922
 msgid "Create a New Account"
 msgstr "Vytvořit nový účet"
 
-#: ../../boot.php:929
+#: ../../boot.php:951
 msgid "Nickname or Email address: "
 msgstr "Přezdívka nebo e-mailová adresa:"
 
-#: ../../boot.php:930
+#: ../../boot.php:952
 msgid "Password: "
 msgstr "Heslo: "
 
-#: ../../boot.php:933
+#: ../../boot.php:953
+msgid "Remember me"
+msgstr "Pamatuj si mne"
+
+#: ../../boot.php:956
 msgid "Or login using OpenID: "
 msgstr "Nebo přihlášení pomocí OpenID: "
 
-#: ../../boot.php:939
+#: ../../boot.php:962
 msgid "Forgot your password?"
 msgstr "Zapomněli jste své heslo?"
 
-#: ../../boot.php:1050
+#: ../../boot.php:1087
 msgid "Requested account is not available."
 msgstr "Požadovaný účet není dostupný."
 
-#: ../../boot.php:1127
+#: ../../boot.php:1164
 msgid "Edit profile"
 msgstr "Upravit profil"
 
-#: ../../boot.php:1193
+#: ../../boot.php:1230
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../../boot.php:1315 ../../boot.php:1401
+#: ../../boot.php:1238
+msgid "Manage/edit profiles"
+msgstr "Spravovat/upravit profily"
+
+#: ../../boot.php:1352 ../../boot.php:1438
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:1316 ../../boot.php:1402
+#: ../../boot.php:1353 ../../boot.php:1439
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1361 ../../boot.php:1442
+#: ../../boot.php:1398 ../../boot.php:1479
 msgid "[today]"
 msgstr "[Dnes]"
 
-#: ../../boot.php:1373
+#: ../../boot.php:1410
 msgid "Birthday Reminders"
 msgstr "Připomínka narozenin"
 
-#: ../../boot.php:1374
+#: ../../boot.php:1411
 msgid "Birthdays this week:"
 msgstr "Narozeniny tento týden:"
 
-#: ../../boot.php:1435
+#: ../../boot.php:1472
 msgid "[No description]"
 msgstr "[Žádný popis]"
 
-#: ../../boot.php:1453
+#: ../../boot.php:1490
 msgid "Event Reminders"
 msgstr "Připomenutí událostí"
 
-#: ../../boot.php:1454
+#: ../../boot.php:1491
 msgid "Events this week:"
 msgstr "Události tohoto týdne:"
 
-#: ../../boot.php:1690
+#: ../../boot.php:1727
 msgid "Status Messages and Posts"
 msgstr "Statusové zprávy a příspěvky "
 
-#: ../../boot.php:1697
+#: ../../boot.php:1734
 msgid "Profile Details"
 msgstr "Detaily profilu"
 
-#: ../../boot.php:1714
+#: ../../boot.php:1751
 msgid "Events and Calendar"
 msgstr "Události a kalendář"
 
-#: ../../boot.php:1721
+#: ../../boot.php:1758
 msgid "Only You Can See This"
 msgstr "Toto můžete vidět jen Vy"
 
-#: ../../index.php:380
+#: ../../object/Item.php:238
+msgid "via"
+msgstr "přes"
+
+#: ../../index.php:398
 msgid "toggle mobile"
 msgstr "přepnout mobil"
 
@@ -9433,3 +9701,11 @@ msgstr "Použití OEmbed pro videa na YouTube"
 #: ../../addon.old/oembed.old/oembed.php:71
 msgid "URL to embed:"
 msgstr "URL adresa k vložení:"
+
+#: ../../addon.old/tumblr/tumblr.php:74
+msgid "Tumblr login"
+msgstr "Tumbir přihlašovací jméno"
+
+#: ../../addon.old/tumblr/tumblr.php:79
+msgid "Tumblr password"
+msgstr "Tumbir heslo"
diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 000000000..baa7c180a
--- /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 000000000..867e63332
--- /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 000000000..baa7c180a
--- /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 000000000..1430e8311
--- /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 000000000..fc953b76c
--- /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 000000000..c9baae798
--- /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 000000000..e770362fa
--- /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 000000000..28f851750
--- /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 000000000..b52abc3b1
--- /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 000000000..0b4c585cf
--- /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 000000000..75db8ebbf
--- /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 000000000..fa1f828c1
--- /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 000000000..9186e7332
--- /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 000000000..f120891e8
--- /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 000000000..2578a4e7c
--- /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 000000000..ebbc2a9e1
--- /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 000000000..c8ac0216c
--- /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/cs/strings.php b/view/cs/strings.php
index cf5b9281c..65b365115 100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@@ -84,7 +84,6 @@ $a->strings["Public access denied."] = "Veřejný přístup odepřen.";
 $a->strings["No photos selected"] = "Není vybrána žádná fotografie";
 $a->strings["Access to this item is restricted."] = "Přístup k této položce je omezen.";
 $a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Použil jste %1$.2f Mbajtů z %2$.2f Mbajtů úložiště fotografií.";
-$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Použil jste %1$.2f Mbytes kapacity úložiště fotografií.";
 $a->strings["Upload Photos"] = "Nahrání fotografií ";
 $a->strings["New album name: "] = "Název nového alba: ";
 $a->strings["or existing album name: "] = "nebo stávající název alba: ";
@@ -457,10 +456,12 @@ $a->strings["Forgot your Password?"] = "Zapomněli jste heslo?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Zadejte svůj e-mailovou adresu a odešlete žádost o zaslání Vašeho nového hesla. Poté zkontrolujte svůj e-mail pro další instrukce.";
 $a->strings["Nickname or Email: "] = "Přezdívka nebo e-mail: ";
 $a->strings["Reset"] = "Reset";
+$a->strings["Additional features"] = "Další funkčnosti";
 $a->strings["Missing some important data!"] = "Chybí některé důležité údaje!";
 $a->strings["Update"] = "Aktualizace";
 $a->strings["Failed to connect with email account using the settings provided."] = "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení.";
 $a->strings["Email settings updated."] = "Nastavení e-mailu aktualizována.";
+$a->strings["Features updated"] = "Aktualizované funkčnosti";
 $a->strings["Passwords do not match. Password unchanged."] = "Hesla se neshodují. Heslo nebylo změněno.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Prázdné hesla nejsou povolena. Heslo nebylo změněno.";
 $a->strings["Password changed."] = "Heslo bylo změněno.";
@@ -484,6 +485,9 @@ $a->strings["No name"] = "Bez názvu";
 $a->strings["Remove authorization"] = "Odstranit oprávnění";
 $a->strings["No Plugin settings configured"] = "Žádný doplněk není nastaven";
 $a->strings["Plugin Settings"] = "Nastavení doplňku";
+$a->strings["Off"] = "Vypnuto";
+$a->strings["On"] = "Zapnuto";
+$a->strings["Additional Features"] = "Další Funkčnosti";
 $a->strings["Built-in support for %s connectivity is %s"] = "Vestavěná podpora pro připojení s %s je %s";
 $a->strings["enabled"] = "povoleno";
 $a->strings["disabled"] = "zakázáno";
@@ -593,10 +597,10 @@ $a->strings["Sort by Post Date"] = "Řadit podle data příspěvku";
 $a->strings["Posts that mention or involve you"] = "Příspěvky, které Vás zmiňují nebo zahrnují";
 $a->strings["New"] = "Nové";
 $a->strings["Activity Stream - by date"] = "Proud aktivit - dle data";
-$a->strings["Starred"] = "S hvězdičkou";
-$a->strings["Favourite Posts"] = "Oblíbené přízpěvky";
 $a->strings["Shared Links"] = "Sdílené odkazy";
 $a->strings["Interesting Links"] = "Zajímavé odkazy";
+$a->strings["Starred"] = "S hvězdičkou";
+$a->strings["Favourite Posts"] = "Oblíbené přízpěvky";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "Upozornění: Tato skupina obsahuje %s člena z nezabezpečené sítě.",
 	1 => "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě.",
@@ -608,9 +612,10 @@ $a->strings["Private messages to this person are at risk of public disclosure."]
 $a->strings["Invalid contact."] = "Neplatný kontakt.";
 $a->strings["Personal Notes"] = "Osobní poznámky";
 $a->strings["Save"] = "Uložit";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu.";
 $a->strings["Import"] = "Import";
 $a->strings["Move account"] = "Přesunout účet";
-$a->strings["You can move here an account from another Friendica server. 
\r\n                            You need to export your account form the old server and upload it here. We will create here your old account with all your contacts. We will try also to inform you friends that you moved here.
\r\n                            This feature is experimental. We can't move here contacts from ostatus network (statusnet/identi.ca) or from diaspora"] = "Zde si můžete přesunout účet z jiného serveru Friendika. 
\n                            Můžete si vyexportovat svůj účet na vašem starším serveru a nahrát je zde. Zde Vám vytvoříme váš starý účet se všemi kontakty. Zároveň budeme informovat Vaše přátele o tom, že jste sem přesunuli.
\n                            Tato funkce je experimentální. Nemůžeme přesunout kontakty z ostatus sítí (statusnet/identi.ca) nebo diaspory";
+$a->strings["You can import an account from another Friendica server. 
\r\n                            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.
\r\n                            This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from diaspora"] = "Je možné  importovat účet z jiného Friendica serveru. 
\nPotřebujete exportovat Váš účet ze starého serveru a importovat ho zde. My následně znovu vytvoříme Váš účet zde se všemi Vašimi kontakty. Také se pokusíme informovat všechny Vaše přátele o tom, že jste se sem přesunuli.
\nTato funkčnost je experimentální. Nemůžeme importovat kontakty ze sítě OStatus (statusnet/identi.ca) nebo z diaspory.";
 $a->strings["Account file"] = "Soubor s účtem";
 $a->strings["To export your accont, go to \"Settings->Export your porsonal data\" and select \"Export account\""] = "K exportu Vašeho účtu, jděte do \"Nastavení->Export vašich osobních dat\" a zvolte \" Export účtu\"";
 $a->strings["Number of daily wall messages for %s exceeded. Message failed."] = "Došlo k překročení maximálního počtu zpráv na zeď během jednoho dne. Zpráva %s nedoručena.";
@@ -688,7 +693,6 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
 $a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat.";
 $a->strings["Registration request at %s"] = "Žádost o registraci na %s";
 $a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru.";
-$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "Došlo k překročení maximálního povoleného počtu registrací za den na tomto serveru. Zkuste to  zítra znovu.";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Tento formulář můžete (volitelně) vyplnit s pomocí OpenID tím, že vyplníte své OpenID a kliknutete na tlačítko 'Zaregistrovat'.";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Pokud nepoužíváte OpenID, nechte prosím toto pole prázdné a vyplňte zbylé položky.";
 $a->strings["Your OpenID (optional): "] = "Vaše OpenID (nepovinné): ";
@@ -812,6 +816,8 @@ $a->strings["Maximum length in pixels of the longest side of uploaded images. De
 $a->strings["JPEG image quality"] = "JPEG kvalita obrázku";
 $a->strings["Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality."] = "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Defaultní je 100, což znamená plnou kvalitu.";
 $a->strings["Register policy"] = "Politika registrace";
+$a->strings["Maximum Daily Registrations"] = "Maximální počet denních registrací";
+$a->strings["If registration is permitted above, this sets the maximum number of new user registrations to accept per day.  If register is set to closed, this setting has no effect."] = "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt.";
 $a->strings["Register text"] = "Registrace textu";
 $a->strings["Will be displayed prominently on the registration page."] = "Bude zřetelně zobrazeno na registrační stránce.";
 $a->strings["Accounts abandoned after x days"] = "Účet je opuštěn po x dnech";
@@ -969,6 +975,7 @@ $a->strings["New profile created."] = "Nový profil vytvořen.";
 $a->strings["Profile unavailable to clone."] = "Profil není možné naklonovat.";
 $a->strings["Hide your contact/friend list from viewers of this profile?"] = "Skrýt u tohoto profilu Vaše kontakty / seznam přátel před před dalšími uživateli zobrazující si tento profil?";
 $a->strings["Edit Profile Details"] = "Upravit podrobnosti profilu ";
+$a->strings["Change Profile Photo"] = "Změna Profilové fotky";
 $a->strings["View this profile"] = "Zobrazit tento profil";
 $a->strings["Create a new profile using these settings"] = "Vytvořit nový profil pomocí tohoto nastavení";
 $a->strings["Clone this profile"] = "Klonovat tento profil";
@@ -1147,6 +1154,8 @@ $a->strings["Facebook Post disabled"] = "Příspěvky na Facebook zakázán.";
 $a->strings["Facebook Post"] = "Facebook příspěvek";
 $a->strings["Install Facebook Post connector for this account."] = "Instalovat pro tento účet konektor pro příspěvky na Facebook.";
 $a->strings["Remove Facebook Post connector"] = "Odstranit konektor pro příspěvky na Facebook";
+$a->strings["Suppress \"View on friendica\""] = "Potlačit \"Zobrazit na friendica\"";
+$a->strings["Post to page/group:"] = "Příspěvek na stránku/skupinu";
 $a->strings["Facebook Post Settings"] = "Nastavení konektoru pro příspěvky na Facebook";
 $a->strings["%d person likes this"] = array(
 	0 => "%d člověku se toto líbí",
@@ -1227,6 +1236,7 @@ $a->strings["Randomise Page/Forum list"] = "Náhodný stránka/fórum seznam";
 $a->strings["Show pages/forums on profile page"] = "Zobrazit stránky/fóra na profilové stránce";
 $a->strings["Planets Settings"] = "Nastavení Planets";
 $a->strings["Enable Planets Plugin"] = "Povolit Planets plugin";
+$a->strings["Forum Directory"] = "Adresář Fór";
 $a->strings["Login"] = "Přihlásit se";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "Poslední uživatelé";
@@ -1450,7 +1460,7 @@ $a->strings["Tile Server URL"] = "URL adresa Tile serveru";
 $a->strings["A list of public tile servers"] = "Seznam veřejných tile serverů";
 $a->strings["Default zoom"] = "Defaultní přiblížení";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní úroveň přiblížení (1:svět, 18:nejvyšší)";
-$a->strings["Editplain settings updated."] = "Editplain nastavení aktualizováno";
+$a->strings["Group Text settings updated."] = "Nastavení textu skupiny aktualizováno.";
 $a->strings["Group Text"] = "Skupinový text";
 $a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Použijte pouze textový (neobrázkový) výběr skupiny v menu editace skupin.";
 $a->strings["Could NOT install Libravatar successfully.
It requires PHP >= 5.3"] = "Libravatar není možné úspěšně nainstalovat .
Vyžaduje PHP >= 5.3";
@@ -1475,10 +1485,13 @@ $a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree";
 $a->strings["Altpager settings updated."] = "Nastavení Altpager aktualizováno.";
 $a->strings["Alternate Pagination Setting"] = "Alternate Pagination nastavení";
 $a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Použít odkazy na \"novější\" a \"starší\" stránky místo čísel stránek?";
+$a->strings["Force global use of the alternate pager"] = "Vynutit globální použití alternativního stránkování";
+$a->strings["Each user chooses whether to use the alternate pager"] = "Každý uživatel si vybere, zda-li použije alternativní stránkování.";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na Vaší zdi, záložce síť a soukromých zprávách.";
 $a->strings["Use the MathJax renderer"] = "Použít Mathjax vykreslování";
 $a->strings["MathJax Base URL"] = "Základní MathJax adresa URL";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax.";
+$a->strings["Editplain settings updated."] = "Editplain nastavení aktualizováno";
 $a->strings["Editplain Settings"] = "Nastavení Editplain";
 $a->strings["Disable richtext status editor"] = "Zakázat richtext status editor";
 $a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.
Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.";
@@ -1537,12 +1550,15 @@ $a->strings["Send linked #-tags and @-names to StatusNet"] = "Poslat propojené
 $a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
 $a->strings["API URL"] = "API URL";
 $a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
+$a->strings["You are now authenticated to tumblr."] = "Nyní jste přihlášen k tumblr.";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
 $a->strings["Post to Tumblr"] = "Příspěvek na Tumbir";
 $a->strings["Tumblr Post Settings"] = "Nastavení příspěvků na Tumbir";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Znovu) přihlásit k Vaší tumblr stránce";
 $a->strings["Enable Tumblr Post Plugin"] = "Povolit rozšíření Tumbir";
-$a->strings["Tumblr login"] = "Tumbir přihlašovací jméno";
-$a->strings["Tumblr password"] = "Tumbir heslo";
 $a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir";
+$a->strings["Post to page:"] = "Příspěvek ke stránce:";
+$a->strings["You are not authenticated to tumblr"] = "Nyní nejste přihlášen k tumblr.";
 $a->strings["Numfriends settings updated."] = "Numfriends nastavení aktualizováno";
 $a->strings["Numfriends Settings"] = "Nastavení Numfriends";
 $a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
@@ -1685,6 +1701,7 @@ $a->strings["Zot!"] = "Zot!";
 $a->strings["LinkedIn"] = "LinkedIn";
 $a->strings["XMPP/IM"] = "XMPP/IM";
 $a->strings["MySpace"] = "MySpace";
+$a->strings["Google+"] = "Google+";
 $a->strings["Male"] = "Muž";
 $a->strings["Female"] = "Žena";
 $a->strings["Currently Male"] = "V současné době muž";
@@ -1818,6 +1835,8 @@ $a->strings["Embedding disabled"] = "Vkládání zakázáno";
 $a->strings["Error decoding account file"] = "Chyba dekódování uživatelského účtu";
 $a->strings["Error! No version data in file! This is not a Friendica account file?"] = "Chyba! V datovém souboru není označení verze! Je to opravdu soubor s účtem Friendica?";
 $a->strings["Error! I can't import this file: DB schema version is not compatible."] = "Chyba! Nemohu importovat soubor: verze DB schématu není kompatibilní.";
+$a->strings["Error! Cannot check nickname"] = "Chyba! Nelze ověřit přezdívku";
+$a->strings["User '%s' already exists on this server!"] = "Uživatel '%s' již na tomto serveru existuje!";
 $a->strings["User creation error"] = "Chyba vytváření uživatele";
 $a->strings["User profile creation error"] = "Chyba vytváření uživatelského účtu";
 $a->strings["%d contact not imported"] = array(
@@ -1847,6 +1866,8 @@ $a->strings["Conversations on this site"] = "Konverzace na tomto webu";
 $a->strings["Directory"] = "Adresář";
 $a->strings["People directory"] = "Adresář";
 $a->strings["Conversations from your friends"] = "Konverzace od Vašich přátel";
+$a->strings["Network Reset"] = "Síťový Reset";
+$a->strings["Load Network page with no filters"] = "Načíst stránku Síť bez filtrů";
 $a->strings["Friend Requests"] = "Žádosti přátel";
 $a->strings["See all notifications"] = "Zobrazit všechny upozornění";
 $a->strings["Mark all system notifications seen"] = "Označit všechny upozornění systému jako přečtené";
@@ -1856,7 +1877,7 @@ $a->strings["Outbox"] = "Odeslaná pošta";
 $a->strings["Manage"] = "Spravovat";
 $a->strings["Manage other pages"] = "Spravovat jiné stránky";
 $a->strings["Profiles"] = "Profily";
-$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily";
+$a->strings["Manage/Edit Profiles"] = "Spravovat/Editovat Profily";
 $a->strings["Manage/edit friends and contacts"] = "Spravovat/upravit přátelé a kontakty";
 $a->strings["Site setup and configuration"] = "Nastavení webu a konfigurace";
 $a->strings["Nothing new here"] = "Zde není nic nového";
@@ -1901,6 +1922,43 @@ $a->strings["From: "] = "Od:";
 $a->strings["Image/photo"] = "Obrázek/fotografie";
 $a->strings["$1 wrote:"] = "$1 napsal:";
 $a->strings["Encrypted content"] = "Šifrovaný obsah";
+$a->strings["General Features"] = "Obecné funkčnosti";
+$a->strings["Multiple Profiles"] = "Vícenásobné profily";
+$a->strings["Ability to create multiple profiles"] = "Schopnost vytvořit vícenásobné profily";
+$a->strings["Post Composition Features"] = "Nastavení vytváření příspěvků";
+$a->strings["Richtext Editor"] = "Richtext Editor";
+$a->strings["Enable richtext editor"] = "Povolit richtext editor";
+$a->strings["Post Preview"] = "Náhled příspěvku";
+$a->strings["Allow previewing posts and comments before publishing them"] = "Povolit náhledy příspěvků a komentářů před jejich zveřejněním";
+$a->strings["Network Sidebar Widgets"] = "Síťové postranní widgety";
+$a->strings["Search by Date"] = "Vyhledávat dle Data";
+$a->strings["Ability to select posts by date ranges"] = "Možnost označit příspěvky dle časového intervalu";
+$a->strings["Group Filter"] = "Skupinový Filtr";
+$a->strings["Enable widget to display Network posts only from selected group"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené skupiny";
+$a->strings["Network Filter"] = "Síťový Filtr";
+$a->strings["Enable widget to display Network posts only from selected network"] = "Povolit widget pro zobrazení příspěvků v Síti pouze ze zvolené sítě";
+$a->strings["Save search terms for re-use"] = "Uložit kritéria vyhledávání pro znovupoužití";
+$a->strings["Network Tabs"] = "Síťové záložky";
+$a->strings["Network Personal Tab"] = "Osobní síťový záložka ";
+$a->strings["Enable tab to display only Network posts that you've interacted on"] = "Povolit záložku pro zobrazení pouze síťových příspěvků, na které jste reagoval ";
+$a->strings["Network New Tab"] = "Nová záložka síť";
+$a->strings["Enable tab to display only new Network posts (from the last 12 hours)"] = "Povolit záložku pro zobrazení pouze nových příspěvků (za posledních 12 hodin)";
+$a->strings["Network Shared Links Tab"] = "záložka Síťové sdílené odkazy ";
+$a->strings["Enable tab to display only Network posts with links in them"] = "Povolit záložky pro zobrazování pouze Síťových příspěvků s vazbou na ně";
+$a->strings["Post/Comment Tools"] = "Nástroje Příspěvků/Komentářů";
+$a->strings["Multiple Deletion"] = "Násobné mazání";
+$a->strings["Select and delete multiple posts/comments at once"] = "Označit a smazat více ";
+$a->strings["Edit Sent Posts"] = "Editovat Odeslané příspěvky";
+$a->strings["Edit and correct posts and comments after sending"] = "Editovat a opravit příspěvky a komentáře po odeslání";
+$a->strings["Tagging"] = "Štítkování";
+$a->strings["Ability to tag existing posts"] = "Schopnost přidat štítky ke stávajícím příspvěkům";
+$a->strings["Post Categories"] = "Kategorie příspěvků";
+$a->strings["Add categories to your posts"] = "Přidat kategorie k Vašim příspěvkům";
+$a->strings["Ability to file posts under folders"] = "Možnost řadit příspěvky do složek";
+$a->strings["Dislike Posts"] = "Označit příspěvky jako neoblíbené";
+$a->strings["Ability to dislike posts/comments"] = "Možnost označit příspěvky/komentáře jako neoblíbené";
+$a->strings["Star Posts"] = "Příspěvky s hvězdou";
+$a->strings["Ability to mark special posts with a star indicator"] = "Možnost označit příspěvky s indikátorem hvězdy";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Nelze nalézt záznam v DNS pro databázový server '%s'";
 $a->strings["[no subject]"] = "[bez předmětu]";
 $a->strings["Visible to everybody"] = "Viditelné pro všechny";
@@ -2018,11 +2076,13 @@ $a->strings["Update Error at %s"] = "Chyba aktualizace na %s";
 $a->strings["Create a New Account"] = "Vytvořit nový účet";
 $a->strings["Nickname or Email address: "] = "Přezdívka nebo e-mailová adresa:";
 $a->strings["Password: "] = "Heslo: ";
+$a->strings["Remember me"] = "Pamatuj si mne";
 $a->strings["Or login using OpenID: "] = "Nebo přihlášení pomocí OpenID: ";
 $a->strings["Forgot your password?"] = "Zapomněli jste své heslo?";
 $a->strings["Requested account is not available."] = "Požadovaný účet není dostupný.";
 $a->strings["Edit profile"] = "Upravit profil";
 $a->strings["Message"] = "Zpráva";
+$a->strings["Manage/edit profiles"] = "Spravovat/upravit profily";
 $a->strings["g A l F d"] = "g A l F d";
 $a->strings["F d"] = "d. F";
 $a->strings["[today]"] = "[Dnes]";
@@ -2035,6 +2095,7 @@ $a->strings["Status Messages and Posts"] = "Statusové zprávy a příspěvky ";
 $a->strings["Profile Details"] = "Detaily profilu";
 $a->strings["Events and Calendar"] = "Události a kalendář";
 $a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
+$a->strings["via"] = "přes";
 $a->strings["toggle mobile"] = "přepnout mobil";
 $a->strings["Bg settings updated."] = "Nastavení Bg aktualizováno.";
 $a->strings["Bg Settings"] = "Nastavení Bg";
@@ -2050,3 +2111,5 @@ $a->strings["Post to Drupal by default"] = "Defaultní umístění na Drupal ";
 $a->strings["OEmbed settings updated"] = "OEmbed nastavení aktualizováno";
 $a->strings["Use OEmbed for YouTube videos"] = "Použití OEmbed pro videa na YouTube";
 $a->strings["URL to embed:"] = "URL adresa k vložení:";
+$a->strings["Tumblr login"] = "Tumbir přihlašovací jméno";
+$a->strings["Tumblr password"] = "Tumbir heslo";
diff --git a/view/de/messages.po b/view/de/messages.po
index fddccca05..95224e538 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-12-16 10:00-0800\n"
-"PO-Revision-Date: 2012-12-17 09:03+0000\n"
+"POT-Creation-Date: 2012-12-22 10:00-0800\n"
+"PO-Revision-Date: 2012-12-24 08:27+0000\n"
 "Last-Translator: bavatar \n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -55,8 +55,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -108,8 +108,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w
 msgid "Return to contact editor"
 msgstr "Zurück zum Kontakteditor"
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705
 msgid "Name"
 msgstr "Name"
 
@@ -152,9 +152,9 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/photos.php:1519 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137
 #: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
 #: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
 #: ../../mod/admin.php:1115 ../../mod/profiles.php:604
@@ -304,7 +304,7 @@ msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../include/nav.php:52 ../../boot.php:1761
 msgid "Events"
 msgstr "Veranstaltungen"
 
@@ -362,8 +362,8 @@ msgstr "Beschreibung"
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1291
 msgid "Location:"
 msgstr "Ort:"
 
@@ -376,8 +376,8 @@ msgid "Share this event"
 msgstr "Veranstaltung teilen"
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45
 #: ../../include/conversation.php:1009
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
@@ -425,37 +425,37 @@ msgid ""
 msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?"
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr "Ja"
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr "Nein"
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1754
 msgid "Photo Albums"
 msgstr "Fotoalben"
 
 #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
 #: ../../mod/photos.php:1092 ../../mod/photos.php:1107
 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
-#: ../../addon/communityhome/communityhome.php:110
+#: ../../addon/communityhome/communityhome.php:111
 #: ../../view/theme/diabook/theme.php:492
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
@@ -478,7 +478,7 @@ msgstr "Kontaktinformationen nicht verfügbar"
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
-#: ../../addon/communityhome/communityhome.php:111
+#: ../../addon/communityhome/communityhome.php:112
 #: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
@@ -672,7 +672,7 @@ msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621
 #: ../../object/Item.php:267 ../../object/Item.php:576
 msgid "Comment"
 msgstr "Kommentar"
@@ -685,7 +685,7 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
+#: ../../mod/content.php:724 ../../mod/settings.php:623
 #: ../../mod/group.php:168 ../../mod/admin.php:699
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
@@ -758,7 +758,7 @@ msgid "Post to Email"
 msgstr "An E-Mail senden"
 
 #: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1015,7 +1015,7 @@ msgstr "Friendica"
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr "Diaspora"
@@ -1035,7 +1035,7 @@ msgstr "Adresse deines Profils:"
 msgid "Submit Request"
 msgstr "Anfrage abschicken"
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr "Kontoeinstellungen"
 
@@ -1067,7 +1067,7 @@ msgstr "Konto löschen"
 #: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1349,7 +1349,7 @@ msgid ""
 msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten."
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr "l, d. F Y\\, H:i"
 
@@ -1415,7 +1415,7 @@ msgid "is interested in:"
 msgstr "ist interessiert an:"
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1229
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1482,7 +1482,7 @@ msgstr[1] "Kommentar"
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
+#: ../../include/contact_widgets.php:204 ../../boot.php:622
 #: ../../object/Item.php:292 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -1572,7 +1572,7 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:180
 #: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -2051,7 +2051,7 @@ msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -2090,7 +2090,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2104,7 +2104,7 @@ msgid ""
 "Password reset failed."
 msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:976
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -2156,63 +2156,63 @@ msgstr "Zusätzliche Features"
 msgid "Missing some important data!"
 msgstr "Wichtige Daten fehlen!"
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr "Aktualisierungen"
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr "E-Mail Einstellungen bearbeitet."
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr "Features aktualisiert"
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr "Passwort ändern."
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr " Bitte verwende einen kürzeren Namen."
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr " Name ist zu kurz."
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr " Keine gültige E-Mail."
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr "Ändern der E-Mail nicht möglich. "
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt."
 
-#: ../../mod/settings.php:457
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte."
 
-#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
 #: ../../addon/remote_permissions/remote_permissions.php:204
 #: ../../addon/impressum/impressum.php:78
@@ -2228,456 +2228,456 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gib
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr "Programm hinzufügen"
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
 #: ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
 #: ../../addon/statusnet/statusnet.php:693
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr "Umleiten"
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr "Icon URL"
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr "Du kannst dieses Programm nicht bearbeiten."
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr "Verbundene Programme"
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr "Anwenderschlüssel beginnt mit"
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr "Autorisierung entziehen"
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr "Keine Plugin-Einstellungen konfiguriert"
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr "Aus"
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr "An"
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr "Zusätzliche Features"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "enabled"
 msgstr "eingeschaltet"
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:683
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:715
 msgid "Email access is disabled on this site."
 msgstr "Zugriff auf E-Mails für diese Seite deaktiviert."
 
-#: ../../mod/settings.php:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr "Verbindungs-Einstellungen"
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr "E-Mail/Postfach-Einstellungen"
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an."
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr "Letzter erfolgreicher E-Mail Check"
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr "IMAP-Server-Name:"
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr "IMAP-Port:"
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr "Sicherheit:"
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr "Keine"
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr "E-Mail-Login-Name:"
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr "E-Mail-Passwort:"
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr "Reply-to Adresse:"
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr "Aktion nach Import:"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr "Als gelesen markieren"
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr "In einen Ordner verschieben"
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr "In diesen Ordner verschieben:"
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:404
 msgid "No special theme for mobile devices"
 msgstr "Kein spezielles Theme für mobile Geräte verwenden."
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr "Theme:"
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr "Mobiles Theme"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimal 10 Sekunden, kein Maximum"
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr "Maximal 100 Beiträge"
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr "Keine Smilies anzeigen"
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr "Normales Konto"
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr "Dieses Konto ist ein normales persönliches Profil"
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr "Marktschreier-Konto"
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr "Forum/Promi-Konto"
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr "Automatische Freunde Seite"
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert"
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr "Privates Forum [Versuchsstadium]"
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr "Privates Forum, nur für Mitglieder"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Profil-Details vor unbekannten Betrachtern verbergen?"
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?"
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?"
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr "Dürfen dir Unbekannte private Nachrichten schicken?"
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
 msgid "Profile is not published."
 msgstr "Profil ist nicht veröffentlicht."
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "oder"
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr "Die Adresse deines Profils lautet:"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr "Erweiterte Verfallseinstellungen"
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr "Erweitertes Verfallen"
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr "Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr "Persönliche Notizen verfallen lassen:"
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr "Markierte Beiträge verfallen lassen:"
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr "Fotos verfallen lassen:"
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr "Nur Beiträge anderer verfallen:"
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr "Kontoeinstellungen"
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr "Passwort-Einstellungen"
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr "Neues Passwort:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr "Bestätigen:"
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr "Kompletter Name:"
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr "E-Mail-Adresse:"
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr "Deine Zeitzone:"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Privatsphäre-Einstellungen"
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr "(um SPAM zu vermeiden)"
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr "Standard-Zugriffsrechte für Beiträge"
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr "(klicke zum öffnen/schließen)"
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr "Benachrichtigungseinstellungen"
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr "Standardmäßig eine Statusnachricht posten, wenn:"
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr "– du eine Kontaktanfrage akzeptierst"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst"
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an interesting profile change"
 msgstr "– du eine interessante Änderung an deinem Profil durchführst"
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr "Benachrichtigungs-E-Mail senden wenn:"
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr "– du eine Kontaktanfrage erhältst"
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr "– eine deiner Kontaktanfragen akzeptiert wurde"
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr "– jemand etwas auf deine Pinnwand schreibt"
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr "– jemand auch einen Kommentar verfasst"
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr "– du eine private Nachricht erhältst"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr "– du eine Empfehlung erhältst"
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr "– du in einem Beitrag erwähnt wirst"
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst"
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Konto-/Seitentyp-Einstellungen"
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verhalten dieses Kontos in bestimmten Situationen:"
 
@@ -2780,7 +2780,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela
 msgid "Invalid contact."
 msgstr "Ungültiger Kontakt."
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1768
 msgid "Personal Notes"
 msgstr "Persönliche Notizen"
 
@@ -2943,7 +2943,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1744
 msgid "Profile"
 msgstr "Profil"
 
@@ -3248,7 +3248,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936
 msgid "Register"
 msgstr "Registrieren"
 
@@ -3257,7 +3257,7 @@ msgid "People Search"
 msgstr "Personensuche"
 
 #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
-#: ../../addon/communityhome/communityhome.php:163
+#: ../../addon/communityhome/communityhome.php:164
 #: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
 #: ../../include/diaspora.php:1848 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
@@ -3267,8 +3267,8 @@ msgstr "Foto"
 
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
+#: ../../addon/communityhome/communityhome.php:159
+#: ../../addon/communityhome/communityhome.php:168
 #: ../../view/theme/diabook/theme.php:459
 #: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
@@ -3280,7 +3280,7 @@ msgid "status"
 msgstr "Status"
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
-#: ../../addon/communityhome/communityhome.php:172
+#: ../../addon/communityhome/communityhome.php:173
 #: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
@@ -3305,7 +3305,7 @@ msgid "Access denied."
 msgstr "Zugriff verweigert."
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../include/nav.php:51 ../../boot.php:1751
 msgid "Photos"
 msgstr "Bilder"
 
@@ -3566,7 +3566,7 @@ msgstr "DB Updates"
 msgid "Logs"
 msgstr "Protokolle"
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr "Administration"
 
@@ -4195,7 +4195,7 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1139
 msgid "Requested profile is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
@@ -4601,23 +4601,23 @@ msgstr "Alter: "
 msgid "Edit/Manage Profiles"
 msgstr "Verwalte/Editiere Profile"
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1257
 msgid "Change profile photo"
 msgstr "Profilbild ändern"
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1258
 msgid "Create New Profile"
 msgstr "Neues Profil anlegen"
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1268
 msgid "Profile Image"
 msgstr "Profilbild"
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1271
 msgid "visible to everybody"
 msgstr "sichtbar für jeden"
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1272
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -4639,7 +4639,7 @@ msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt"
 msgid "No potential page delegates located."
 msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden."
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr "Delegiere das Management für die Seite"
 
@@ -4749,19 +4749,19 @@ msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1293
 msgid "Gender:"
 msgstr "Geschlecht:"
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1296
 msgid "Status:"
 msgstr "Status:"
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1298
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -5288,7 +5288,7 @@ msgstr "Unterdrücke \"Auf Friendica Ansehen\""
 
 #: ../../addon/fbpost/fbpost.php:245
 msgid "Post to page/group:"
-msgstr ""
+msgstr "Auf FB Seite/Gruppe veröffentlichen"
 
 #: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
@@ -5646,7 +5646,7 @@ msgstr "Foren Verzeichnis"
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../include/nav.php:64 ../../boot.php:962
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -5680,12 +5680,12 @@ msgstr "Aktivste Nutzer"
 msgid "Latest photos"
 msgstr "Neueste Fotos"
 
-#: ../../addon/communityhome/communityhome.php:133
+#: ../../addon/communityhome/communityhome.php:134
 #: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr "Neueste Favoriten"
 
-#: ../../addon/communityhome/communityhome.php:155
+#: ../../addon/communityhome/communityhome.php:156
 #: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
@@ -6254,8 +6254,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr "Erweiterter Kalender mit CalDAV Unterstützung."
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8266,11 +8266,11 @@ msgstr "Ist mir nicht wichtig"
 msgid "Ask me"
 msgstr "Frag mich"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr "Beginnt:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr "Endet:"
 
@@ -8533,11 +8533,11 @@ msgstr "Anhänge:"
 msgid "view full size"
 msgstr "Volle Größe anzeigen"
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:138
 msgid "Embedded content"
 msgstr "Eingebetteter Inhalt"
 
-#: ../../include/oembed.php:146
+#: ../../include/oembed.php:147
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
 
@@ -8612,7 +8612,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Contacts not in any group"
 msgstr "Kontakte in keiner Gruppe"
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:961
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -8620,7 +8620,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1737
 msgid "Status"
 msgstr "Status"
 
@@ -8708,23 +8708,27 @@ msgstr "Verwalten"
 msgid "Manage other pages"
 msgstr "Andere Seiten verwalten"
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr "Delegierungen"
+
+#: ../../include/nav.php:142 ../../boot.php:1251
 msgid "Profiles"
 msgstr "Profile"
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr "Profile Verwalten/Editieren"
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr "Freunde und Kontakte verwalten/editieren"
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr "Einstellungen der Seite und Konfiguration"
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr "Keine Neuigkeiten."
 
@@ -8868,19 +8872,26 @@ msgstr "%ss Geburtstag"
 msgid "Happy Birthday %s"
 msgstr "Herzlichen Glückwunsch %s"
 
-#: ../../include/onepoll.php:421
+#: ../../include/onepoll.php:439
 msgid "From: "
 msgstr "Von: "
 
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:202 ../../include/bbcode.php:482
 msgid "Image/photo"
 msgstr "Bild/Foto"
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:254
+#, php-format
+msgid ""
+"%s wrote the following post:"
+msgstr "%s schrieb den folgenden Beitrag:"
+
+#: ../../include/bbcode.php:447 ../../include/bbcode.php:467
 msgid "$1 wrote:"
 msgstr "$1 hat geschrieben:"
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:487 ../../include/bbcode.php:488
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
@@ -9532,109 +9543,109 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements."
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar."
 
-#: ../../boot.php:607
+#: ../../boot.php:620
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:610
+#: ../../boot.php:623
 msgid "show fewer"
 msgstr "weniger anzeigen"
 
-#: ../../boot.php:819
+#: ../../boot.php:832
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."
 
-#: ../../boot.php:821
+#: ../../boot.php:834
 #, php-format
 msgid "Update Error at %s"
 msgstr "Updatefehler bei %s"
 
-#: ../../boot.php:922
+#: ../../boot.php:935
 msgid "Create a New Account"
 msgstr "Neues Konto erstellen"
 
-#: ../../boot.php:951
+#: ../../boot.php:964
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder E-Mail-Adresse: "
 
-#: ../../boot.php:952
+#: ../../boot.php:965
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:953
+#: ../../boot.php:966
 msgid "Remember me"
 msgstr "Anmeldedaten merken"
 
-#: ../../boot.php:956
+#: ../../boot.php:969
 msgid "Or login using OpenID: "
 msgstr "Oder melde dich mit deiner OpenID an: "
 
-#: ../../boot.php:962
+#: ../../boot.php:975
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:1087
+#: ../../boot.php:1100
 msgid "Requested account is not available."
 msgstr "Das angefragte Profil ist nicht vorhanden."
 
-#: ../../boot.php:1164
+#: ../../boot.php:1177
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: ../../boot.php:1230
+#: ../../boot.php:1243
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../boot.php:1238
+#: ../../boot.php:1251
 msgid "Manage/edit profiles"
 msgstr "Profile verwalten/editieren"
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1365 ../../boot.php:1451
 msgid "g A l F d"
 msgstr "l, d. F G \\U\\h\\r"
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1366 ../../boot.php:1452
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1411 ../../boot.php:1492
 msgid "[today]"
 msgstr "[heute]"
 
-#: ../../boot.php:1410
+#: ../../boot.php:1423
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:1411
+#: ../../boot.php:1424
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:1472
+#: ../../boot.php:1485
 msgid "[No description]"
 msgstr "[keine Beschreibung]"
 
-#: ../../boot.php:1490
+#: ../../boot.php:1503
 msgid "Event Reminders"
 msgstr "Veranstaltungserinnerungen"
 
-#: ../../boot.php:1491
+#: ../../boot.php:1504
 msgid "Events this week:"
 msgstr "Veranstaltungen diese Woche"
 
-#: ../../boot.php:1727
+#: ../../boot.php:1740
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../boot.php:1734
+#: ../../boot.php:1747
 msgid "Profile Details"
 msgstr "Profildetails"
 
-#: ../../boot.php:1751
+#: ../../boot.php:1764
 msgid "Events and Calendar"
 msgstr "Ereignisse und Kalender"
 
-#: ../../boot.php:1758
+#: ../../boot.php:1771
 msgid "Only You Can See This"
 msgstr "Nur du kannst das sehen"
 
diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 000000000..f902d96b4
--- /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 000000000..b4b994c64
--- /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 000000000..19f81a5e3
--- /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 fr 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 000000000..2fd04bb65
--- /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 000000000..72234dc67
--- /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 000000000..75d6a77e8
--- /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 000000000..f5eaef66b
--- /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 000000000..a507afbda
--- /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 000000000..a76968610
--- /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 000000000..7daa6fbf9
--- /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 Gre,
+{{$siteName}} Administrator
diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl
new file mode 100644
index 000000000..eb08c20b7
--- /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 000000000..af0a0b9bb
--- /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 000000000..78d4aa6b7
--- /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 000000000..de2182e9d
--- /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 000000000..5b614709a
--- /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 000000000..e90d67261
--- /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 000000000..e6e7f2707
--- /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 000000000..f53dc6c9c
--- /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/de/strings.php b/view/de/strings.php
index 297e7fac3..ae06508fe 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1024,7 +1024,6 @@ $a->strings["Delegate Page Management"] = "Delegiere das Management für die Sei
 $a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!";
 $a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager";
 $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite";
-$a->strings["Delegations"] = "Bevollmächtigungen";
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
 $a->strings["Add"] = "Hinzufügen";
 $a->strings["No entries."] = "Keine Einträge";
@@ -1147,7 +1146,7 @@ $a->strings["Facebook Post"] = "Facebook Relai";
 $a->strings["Install Facebook Post connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
 $a->strings["Remove Facebook Post connector"] = "Facebook-Connector entfernen";
 $a->strings["Suppress \"View on friendica\""] = "Unterdrücke \"Auf Friendica Ansehen\"";
-$a->strings["Post to page/group:"] = "";
+$a->strings["Post to page/group:"] = "Auf FB Seite/Gruppe veröffentlichen";
 $a->strings["Facebook Post Settings"] = "Facebook-Beitragseinstellungen";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
@@ -1864,6 +1863,7 @@ $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
 $a->strings["Manage other pages"] = "Andere Seiten verwalten";
+$a->strings["Delegations"] = "Delegierungen";
 $a->strings["Profiles"] = "Profile";
 $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren";
 $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren";
@@ -1907,6 +1907,7 @@ $a->strings["%s's birthday"] = "%ss Geburtstag";
 $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
 $a->strings["From: "] = "Von: ";
 $a->strings["Image/photo"] = "Bild/Foto";
+$a->strings["%s wrote the following post:"] = "%s schrieb den folgenden Beitrag:";
 $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
 $a->strings["General Features"] = "Allgemeine Features";
@@ -2077,7 +2078,7 @@ $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
 $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
 $a->strings["[No description]"] = "[keine Beschreibung]";
 $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
-$a->strings["Events this week:"] = "Veranstaltungen diese Woche:";
+$a->strings["Events this week:"] = "Veranstaltungen diese Woche";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["Profile Details"] = "Profildetails";
 $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
@@ -2098,7 +2099,5 @@ $a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträ
 $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert.";
 $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden";
 $a->strings["URL to embed:"] = "URL zum Einbetten:";
-$a->strings['%s wrote the following post:'] = 
-            '%s hat diesen Beitrag ursprünglich gepostet:';
 $a->strings["Tumblr login"] = "Tumblr Login";
 $a->strings["Tumblr password"] = "Tumblr Passwort";
diff --git a/view/directory_item.tpl b/view/directory_item.tpl
index b45da4465..d496cb2ad 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 000000000..ba07b19da
--- /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 000000000..229b4fee8
--- /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 000000000..745bf03fe
--- /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 000000000..c3bc4697e
--- /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 000000000..3b79d2791
--- /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 000000000..0d94be3c2
--- /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 000000000..bfc1082bf
--- /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 000000000..dbdd1a997
--- /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 000000000..d01b8ff27
--- /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 000000000..a0983b6b9
--- /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 000000000..dd313c1f7
--- /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 000000000..2987a8dc5
--- /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 000000000..eab7623a4
--- /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 000000000..ddde9fe51
--- /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 000000000..173828d56
--- /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 000000000..84fc9ad90
--- /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 000000000..4e960b916
--- /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 000000000..d026ba66e
--- /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 000000000..4b7f240f9
--- /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 000000000..d78eae217
--- /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 000000000..86e09003a
--- /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 000000000..be3c81777
--- /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 000000000..5696245c7
--- /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 000000000..3add926fe
--- /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 000000000..41545bf2d
--- /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 000000000..4f80df28f
--- /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 000000000..22b77b724
--- /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 000000000..eb93eb369
--- /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 000000000..c65b13497
--- /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 000000000..10c35863e
--- /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 000000000..cb787a8a6
--- /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 000000000..8f495d9ef
--- /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/event.tpl b/view/event.tpl
index ac9f889ec..1f71289b3 100644
--- a/view/event.tpl
+++ b/view/event.tpl
@@ -1,7 +1,7 @@
 {{ for $events as $event }}
 	

 	
-	{{ if $event.item.author-name }}$event.item.author-name{{ endif }}
+	{{ if $event.item.author_name }}$event.item.author_name{{ endif }}
 	$event.html
 	{{ if $event.item.plink }}{{ endif }}
 	{{ if $event.edit }}{{ endif }}
diff --git a/view/events.tpl b/view/events.tpl
index 5a9787de3..be7dc2fb2 100644
--- a/view/events.tpl
+++ b/view/events.tpl
@@ -14,7 +14,7 @@ $tabs
 {{ for $events as $event }}
 	

 	{{ if $event.is_first }}
$event.d
{{ endif }}
-	{{ if $event.item.author-name }}$event.item.author-name{{ endif }}
+	{{ if $event.item.author_name }}$event.item.author_name{{ endif }}
 	$event.html
 	{{ if $event.item.plink }}{{ endif }}
 	{{ if $event.edit }}{{ endif }}
diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl
index 1e97237f4..7db31d716 100644
--- a/view/filebrowser.tpl
+++ b/view/filebrowser.tpl
@@ -77,7 +77,7 @@
 		

 	

 	

-		
+		
 	
	
 	
 	
diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 000000000..bd7c441ea
--- /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 000000000..408b643ec
--- /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 000000000..76828474b
--- /dev/null
+++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl
@@ -0,0 +1,15 @@
+
+Cher(e) {{$username}},
+
+	 {{$from}}  a comment un lment ou une conversation que vous suivez.
+
+-----
+{{$body}}
+-----
+
+Connectez-vous  {{$siteurl}} si vous souhaitez voir la conversation complte :
+
+{{$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 000000000..05fec413e
--- /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 000000000..e0c0078e5
--- /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 000000000..75d6a77e8
--- /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 000000000..e3ca25325
--- /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 000000000..0674e08cc
--- /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 000000000..cf1c28627
--- /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 000000000..71c545ed6
--- /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 rpondre  vos messages privs.
+
+Merci,
+{{$siteName}} Administrateur
diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl
new file mode 100644
index 000000000..28eed70f1
--- /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 000000000..373f314b0
--- /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 000000000..22b6d8a94
--- /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 000000000..3f5f8a1f4
--- /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 000000000..991fad857
--- /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 2fa2b1a55..35d298111 100644
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -15,9 +15,9 @@
 

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

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

 {{ endif }}
 {{ if $desc }}
$desc
{{ endif }}
diff --git a/view/install_checks.tpl b/view/install_checks.tpl
index 176611d4b..a3aa2b266 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/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl
new file mode 100644
index 000000000..127f05a45
--- /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 000000000..1bc440269
--- /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 000000000..bbf86cf15
--- /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 000000000..d2010ac8f
--- /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 000000000..c19551208
--- /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 000000000..0673224d1
--- /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 000000000..cf6362c4b
--- /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 000000000..36d8f217a
--- /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 000000000..201f87131
--- /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 000000000..f35dc3dc9
--- /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 000000000..80d611807
--- /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 000000000..f35dc3dc9
--- /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 000000000..0bfc37552
--- /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 000000000..daeaae901
--- /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 000000000..5696245c7
--- /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 000000000..69fce8141
--- /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 000000000..c336cf3c1
--- /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 000000000..f0bf679d0
--- /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 000000000..79e133fce
--- /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 000000000..046588e1f
--- /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 000000000..23dcaf2c8
--- /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 000000000..743370b3d
--- /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 000000000..df3a7323c
--- /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 000000000..909ec86d4
--- /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 000000000..3fa724c3b
--- /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 000000000..ad7f83abc
--- /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/mail_display.tpl b/view/mail_display.tpl
index 8fbc12929..396aa46c0 100644
--- a/view/mail_display.tpl
+++ b/view/mail_display.tpl
@@ -1,10 +1,10 @@
 
-{{ for $mails as $mail }}
-	{{ inc mail_conv.tpl }}{{endinc}}
+{{ for $mails as $mail_item }}
+	{{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
 {{ endfor }}
 
 {{ if $canreply }}
 {{ inc prv_message.tpl }}{{ endinc }}
 {{ else }}
 $unknown_text
-{{endif }}
\ No newline at end of file
+{{endif }}
diff --git a/view/nav.tpl b/view/nav.tpl
index 8969accb7..04c4931fc 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -64,5 +64,5 @@
 
 
 
diff --git a/view/nb-no/smarty3/follow_notify_eml.tpl b/view/nb-no/smarty3/follow_notify_eml.tpl
new file mode 100644
index 000000000..094539cf5
--- /dev/null
+++ b/view/nb-no/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Kjære {{$myname}},
+
+Du har en ny følgesvenn på {{$sitename}} - '{{$requestor}}'.
+
+Du kan besøke profilen deres på {{$url}}. 
+
+Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen.
+
+{{$siteurl}}
+
+Med vennlig hilsen,
+
+	{{$sitename}} administrator
\ No newline at end of file
diff --git a/view/nb-no/smarty3/friend_complete_eml.tpl b/view/nb-no/smarty3/friend_complete_eml.tpl
new file mode 100644
index 000000000..17cc38a8c
--- /dev/null
+++ b/view/nb-no/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Kjære {{$username}},
+
+	Gode nyheter... '{{$fn}}' ved '{{$dfrn_url}}' har godtatt 
+din forespørsel om kobling hos '{{$sitename}}'.
+
+Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post
+uten hindringer.
+
+Vennligst besøk din side "Kontakter" ved {{$sitename}} hvis du ønsker å gjøre  
+noen endringer på denne forbindelsen. 
+
+{{$siteurl}}
+
+[For eksempel, så kan du lage en egen profil med informasjon som ikke er
+tilgjengelig for alle - og angi visningsrettigheter til '{{$fn}}'].
+
+Med vennlig hilsen,
+
+	{{$sitename}} administrator
+
+ 
\ No newline at end of file
diff --git a/view/nb-no/smarty3/intro_complete_eml.tpl b/view/nb-no/smarty3/intro_complete_eml.tpl
new file mode 100644
index 000000000..edf699936
--- /dev/null
+++ b/view/nb-no/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Kjære {{$username}},
+
+	'{{$fn}}' ved '{{$dfrn_url}}' har godtatt 
+din forespørsel om kobling ved {{$sitename}}'.
+
+	'{{$fn}}' har valgt å godta deg som "fan", som begrenser 
+noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger.
+Hvis dette er en kjendis- eller forumside, så ble disse innstillingene
+angitt automatisk.
+
+	'{{$fn}}' kan velge å utvide dette til en to-veis eller mer åpen 
+forbindelse i fremtiden. 
+
+	Du vil nå motta offentlige statusoppdateringer fra '{{$fn}}', 
+som vil vises på din "Nettverk"-side ved  
+
+{{$siteurl}}
+
+Med vennlig hilsen,
+
+	{{$sitename}} administrator
\ No newline at end of file
diff --git a/view/nb-no/smarty3/lostpass_eml.tpl b/view/nb-no/smarty3/lostpass_eml.tpl
new file mode 100644
index 000000000..e0f335ff1
--- /dev/null
+++ b/view/nb-no/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Kjære {{$username}},
+	En forespørsel ble nylig mottatt hos {{$sitename}} om å tilbakestille din kontos 
+passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken
+nedenfor eller lim den inn på adresselinjen i nettleseren din. 
+
+Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken
+som er oppgitt og ignorer og/eller slett denne e-posten. 
+
+Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du
+sendte denne forespørselen. 
+
+Følg denne lenken for å bekrefte din identitet:
+
+{{$reset_link}}
+
+Du vil da motta en oppfølgings melding med det nye passordet.
+
+Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging.
+
+Innloggingsdetaljene er som følger:
+
+Nettstedsadresse:»{{$siteurl}}
+Brukernavn:»{{$email}}
+
+
+
+
+Beste hilsen,
+	{{$sitename}} administrator
+
+ 
\ No newline at end of file
diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl
new file mode 100644
index 000000000..2d3144bc5
--- /dev/null
+++ b/view/nb-no/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Kjære {{$username}},
+	Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne 
+meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til 
+noe du husker).
+
+
+Dine logg inn-detaljer er som følger:
+
+Nettsted:»{{$siteurl}}
+Brukernavn:»{{$email}}
+Passord:»{{$new_password}}
+
+Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging.
+
+
+Med vennlig hilsen,
+	{{$sitename}} administrator
+
+ 
\ No newline at end of file
diff --git a/view/nb-no/smarty3/register_open_eml.tpl b/view/nb-no/smarty3/register_open_eml.tpl
new file mode 100644
index 000000000..7fe8e5983
--- /dev/null
+++ b/view/nb-no/smarty3/register_open_eml.tpl
@@ -0,0 +1,34 @@
+
+Kjære {{$username}},
+	Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. 
+Innloggingsdetaljene er som følger:
+
+
+Nettstedsadresse:»{{$siteurl}}
+Brukernavn:»{{$email}}
+Passord:»{{$password}}
+
+Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget 
+inn.
+
+Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden.
+
+Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din 
+(på siden "Profiler") slik at folk lettere kan finne deg.
+
+Vi anbefaler å oppgi fullt navn, legge til et profilbilde,
+legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og 
+kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk
+enn det.
+
+Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige. 
+Hvis du er ny og ikke kjenner noen her, så kan de hjelpe
+deg å få noen nye og interessante venner.  
+
+
+Takk og velkommen til {{$sitename}}.
+
+Beste hilsen,
+	{{$sitename}} administrator
+
+ 
\ No newline at end of file
diff --git a/view/nb-no/smarty3/register_verify_eml.tpl b/view/nb-no/smarty3/register_verify_eml.tpl
new file mode 100644
index 000000000..9efb9b08b
--- /dev/null
+++ b/view/nb-no/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever  
+din godkjenning. 
+
+
+Innloggingsdetaljene er som følger:
+
+Fullt navn:»{{$username}}
+Nettstedsadresse:»{{$siteurl}}
+Brukernavn:»{{$email}}
+
+
+For å godkjenne denne forespørselen, vennligst besøk følgende lenke:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+For å avslå denne forespørselen og fjerne kontoen, vennligst besøk:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Mange takk.
diff --git a/view/nb-no/smarty3/request_notify_eml.tpl b/view/nb-no/smarty3/request_notify_eml.tpl
new file mode 100644
index 000000000..ae89c6141
--- /dev/null
+++ b/view/nb-no/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Kjære {{$myname}},
+
+Du har akkurat mottatt en kontaktforespørsel hos {{$sitename}} 
+
+fra '{{$requestor}}'.
+
+Du kan besøke profilen på {{$url}}.
+
+Vennligst logg inn på ditt nettsted for å se hele introduksjonen 
+og godkjenne eller ignorere/avbryte forespørselen.
+
+{{$siteurl}}
+
+Beste hilsen,
+
+	{{$siteurl}} administrator
\ No newline at end of file
diff --git a/view/nb-no/smarty3/update_fail_eml.tpl b/view/nb-no/smarty3/update_fail_eml.tpl
new file mode 100644
index 000000000..1116f2cd7
--- /dev/null
+++ b/view/nb-no/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hei,  
+jeg er {{$sitename}}.   
+Friendica-utviklerne slapp nylig oppdateringen {{$update}}, 
+men da jeg prøvde å installere den, gikk noe forferdelig galt.  
+Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en 
+Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig. 
+
+Feilmeldingen er '{{$error}}'.   
+
+Jeg beklager,  
+din Friendica-tjener hos {{$siteurl}} 
\ No newline at end of file
diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
index dd00ed097..f27f158f5 100644
--- a/view/nogroup-template.tpl
+++ b/view/nogroup-template.tpl
@@ -1,7 +1,7 @@
 
$header

 
-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
+{{ for $contacts as $c }}
+	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 

 
diff --git a/view/notifications_network_item.tpl b/view/notifications_network_item.tpl
index bd86548fc..261ab3643 100644
--- a/view/notifications_network_item.tpl
+++ b/view/notifications_network_item.tpl
@@ -1,3 +1,3 @@
 

-	{$item_text} {$item_when}
-

\ No newline at end of file
+	$item_text $item_when
+
diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
index 1df78cb7b..7ae354024 100644
--- a/view/photos_recent.tpl
+++ b/view/photos_recent.tpl
@@ -4,8 +4,8 @@
 {{ endif }}
 
 

-{{ for $photos as $photo }}
-	{{ inc photo_top.tpl }}{{ endinc }}
+{{ for $photos as $ph }}
+	{{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
 {{ endfor }}
 

 

diff --git a/view/pl/smarty3/follow_notify_eml.tpl b/view/pl/smarty3/follow_notify_eml.tpl
new file mode 100644
index 000000000..0fdbbf49f
--- /dev/null
+++ b/view/pl/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Drogi {{$myname}},
+
+Masz nowego obserwującego na {{$sitename}} -  '{{$requestor}}'.
+
+Możesz odwiedzić jego profil na {{$url}}.
+
+Zaloguj się na swoją stronę by potwierdzić lub zignorować/anulować prośbę.
+
+{{$siteurl}}
+
+Pozdrawiam,
+
+	{{$sitename}} Administrator
\ No newline at end of file
diff --git a/view/pl/smarty3/friend_complete_eml.tpl b/view/pl/smarty3/friend_complete_eml.tpl
new file mode 100644
index 000000000..12918b6b6
--- /dev/null
+++ b/view/pl/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Drogi {{$username}},
+
+	Świetne wieści! '{{$fn}}' na '{{$dfrn_url}}' przyjął / przyjęła 
+Twoją prośbę o znajomość na '{{$sitename}}'.
+
+Jesteście teraz znajomymi i możecie wymieniać się zmianami statusów, zdjęciami i wiadomościami
+bez ograniczeń.
+
+Zajrzyj na stronę 'Kontakty' na {{$sitename}} jeśli chcesz dokonać 
+zmian w tej relacji. 
+
+{{$siteurl}}
+
+[Możesz np.: utworzyć oddzielny profil z informacjami, który nie będzie
+dostępny dla wszystkich - i przypisać sprawdzanie uprawnień do '{{$fn}}'].
+
+Z poważaniem, 
+
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/pl/smarty3/intro_complete_eml.tpl b/view/pl/smarty3/intro_complete_eml.tpl
new file mode 100644
index 000000000..55dc1d78e
--- /dev/null
+++ b/view/pl/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Drogi {{$username}},
+
+	'{{$fn}}' w '{{$dfrn_url}}' zaakceptował 
+twoje połączenie na '{{$sitename}}'.
+
+	'{{$fn}}' zaakceptował Cię jako "fana", uniemożliwiając 
+pewne sposoby komunikacji - takie jak prywatne wiadomości czy niektóre formy
+interakcji pomiędzy profilami. Jeśli jest to strona gwiazdy lub  społeczności, ustawienia zostały
+zastosowane automatycznie.
+
+	'{{$fn}}' może rozszeżyć to w dwustronną komunikację lub więcej (doprecyzować) 
+relacje w przyszłości. 
+
+	Będziesz teraz otrzymywać aktualizacje statusu od '{{$fn}}', 
+który będzie pojawiać się na Twojej stronie "Sieć"  
+
+{{$siteurl}}
+
+Z poważaniem,
+
+	Administrator {{$sitename}}
\ No newline at end of file
diff --git a/view/pl/smarty3/lostpass_eml.tpl b/view/pl/smarty3/lostpass_eml.tpl
new file mode 100644
index 000000000..7d5240cfa
--- /dev/null
+++ b/view/pl/smarty3/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+{{$username}},
+	Ze strony {{$sitename}} wpłynęła prośba z zresetowanie 
+hasła. W celu potwierdzenia kliknij w weryfikacyjny link
+zamieszczony poniżej, lub wklej go do pasku adresu twojej przeglądarki. 
+
+Jeśli uważasz, że wiadomość nie jest przeznaczona dla ciebie, nie klikaj w linka!
+Zignoruj tego emaila i usuń. 
+
+Twoje hasło nie może zostać zmienione zanim nie potwierdzimy
+twojego żądania. 
+
+Aby potwierdzić kliknik w link weryfikacyjny:
+
+{{$reset_link}}
+
+Otrzymasz od nas wiadomość zwrotną zawierającą nowe hasło.
+
+Po zalogowaniu się, będziesz miał możliwość zmiany hasła na takie jakie chcesz.
+
+Dane do zalogowania:
+
+Adres strony: {{$siteurl}}
+Login: {{$email}}
+
+
+
+
+Z poważaniem,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/pl/smarty3/passchanged_eml.tpl b/view/pl/smarty3/passchanged_eml.tpl
new file mode 100644
index 000000000..b8ba39cdf
--- /dev/null
+++ b/view/pl/smarty3/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Drogi {{$username}},
+	Twoje hasło zostało zmienione. Zachowaj tę 
+Informację dla dokumentacji (lub zmień swoje hasło 
+na takie, które zapamiętasz).
+
+
+Dane do logowania:
+
+Strona:»{{$siteurl}}
+Twój login:»{{$email}}
+Twoje nowe hasło:»{{$new_password}}
+
+Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta
+
+
+Z poważaniem,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/pl/smarty3/register_open_eml.tpl b/view/pl/smarty3/register_open_eml.tpl
new file mode 100644
index 000000000..604ebfacc
--- /dev/null
+++ b/view/pl/smarty3/register_open_eml.tpl
@@ -0,0 +1,36 @@
+
+Drogi {{$username}},
+	Dziękujemy za rejestrację na {{$sitename}}. Twoje konto zostało utworzone pomyślnie.  
+Dane do logowania:
+
+
+Strona:»{{$siteurl}}
+Twój Nick:»{{$email}}
+Hasło:»{{$password}}
+
+Możesz zmienić swoje hasło odwiedzając zakładkę ustawienia konta po zalogowaniu 
+ 
+się.
+
+Przejrzyj też inne ustawienia konta. To zajmie Ci tylko chwilę.
+
+Jeżeli chcesz, by inni mogli Cię łatwo znaleść wystarczy dodać podstawowe informacje 
+o sobie na stronie "Profile".
+
+Zalecamy dodać prawdziwe imię i nazwisko, zdjęcie profilowe,
+słowa kluczowe (pomocne w zdobywaniu nowych przyjaciół) - i 
+może kraj, w którym mieszkasz, jeżeli nie chcesz dodać bardziej szczegółowych
+
+informacji niż ta.
+
+Szanujemy też twoją prywatność, więc żadna z podpowiadanych wyżej czynności nie jest przymusowa. 
+Jeżeli jesteś nowy i nie znasz tu nikogo, mogą one jedynie
+pomóć w zdobywaniu nowych znajomości.  
+
+
+Dziękujemy i witamy na {{$sitename}}.
+
+Z poważaniem,
+	{{$sitename}} Administrator
+
+ 
\ No newline at end of file
diff --git a/view/pl/smarty3/register_verify_eml.tpl b/view/pl/smarty3/register_verify_eml.tpl
new file mode 100644
index 000000000..017e0ec0b
--- /dev/null
+++ b/view/pl/smarty3/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+Nowy wniosek o rejestrację użytkownika wpłynął na {{$sitename}} i wymaga 
+potwierdzenia. 
+
+
+Oto szczegóły konta:
+
+Pełna nazwa:»{{$username}}
+Jesteś na:	{{$siteurl}}
+Login:»{{$email}}
+
+
+Aby potwierdzić rejestrację wejdź na:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+
+Aby anulować rejestrację i usunąć konto wejdź na:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Dziękuję.
diff --git a/view/pl/smarty3/request_notify_eml.tpl b/view/pl/smarty3/request_notify_eml.tpl
new file mode 100644
index 000000000..ea31ca876
--- /dev/null
+++ b/view/pl/smarty3/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Drogi/a {{$myname}},
+
+Otrzymałeś właśnie zaproszenie do znajomych na stronie {{$sitename}} 
+
+od '{{$requestor}}'.
+
+Skorzystaj z tego linku, aby odwiedzić jego profil: {{$url}}.
+
+Proszę się zalogować, aby zobaczyć pełen opis 
+i zaakceptować lub zignorować / anulować.
+
+{{$siteurl}}
+
+Pozdrawiam
+
+	{{$sitename}} administrator
\ No newline at end of file
diff --git a/view/pl/smarty3/update_fail_eml.tpl b/view/pl/smarty3/update_fail_eml.tpl
new file mode 100644
index 000000000..809fd552e
--- /dev/null
+++ b/view/pl/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Hey,  
+Jestem {{$sitename}}.   
+Deweloperzy friendica wydali ostatnio aktualizację {{$update}}, 
+ale kiedy próbowałem ją zainstalować, coś poszło nie tak.  
+To musi być szybko poprawione, ale nie mogę zrobić tego sam. Proszę o kontakt z 
+deweloperami friendica, jeśli nie możesz mi pomóc na własną rękę. Moja baza danych może być uszkodzona. 
+
+Komunikat o błędzie: '{{$error}}'.   
+
+Przepraszam, 
+twój serwer friendica w {{$siteurl}}
\ No newline at end of file
diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
index 9549b695d..394f6afcf 100644
--- a/view/poco_xml.tpl
+++ b/view/poco_xml.tpl
@@ -9,8 +9,8 @@
 
 
 {{ if $response.totalResults }}
-{{ for $response.entry as $entry }}
-{{ inc poco_entry_xml.tpl }}{{ endinc }}
+{{ for $response.entry as $ent }}
+{{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
 {{ endfor }}
 {{ else }}
 
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index d1e684795..6e137f28f 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			
 				$profile.locality{{ if $profile.locality }}, {{ endif }}
 				$profile.region
-				$profile.postal-code
+				$profile.postal_code
 			
-			{{ if $profile.country-name }}$profile.country-name{{ endif }}
+			{{ if $profile.country_name }}$profile.country_name{{ endif }}
 		
 		
 	{{ endif }}
diff --git a/view/pt-br/smarty3/intro_complete_eml.tpl b/view/pt-br/smarty3/intro_complete_eml.tpl
new file mode 100644
index 000000000..3689d653c
--- /dev/null
+++ b/view/pt-br/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Prezado/a {{$username}},
+
+	'{{$fn}}' em '{{$dfrn_url}}' aceitou 
+seu pedido de coneção em '{{$sitename}}'.
+
+	'{{$fn}}' optou por aceitá-lo com "fan", que restringe 
+algumas formas de comunicação, tais como mensagens privadas e algumas interações
+com o  perfil. Se essa é uma página de celebridade ou de comunidade essas configurações foram
+aplicadas automaticamente.
+
+	'{{$fn}}' pode escolher estender isso para uma comunicação bidirecional ourelacionamento mais permissivo 
+no futuro. 
+
+	Você começará a receber atualizações públicas de '{{$fn}}' 
+que aparecerão na sua página 'Rede'   
+
+{{$siteurl}}
+
+Cordialmente,
+
+	Administrador do {{$sitemname}}
\ No newline at end of file
diff --git a/view/pt-br/smarty3/update_fail_eml.tpl b/view/pt-br/smarty3/update_fail_eml.tpl
new file mode 100644
index 000000000..f8f5e2ef2
--- /dev/null
+++ b/view/pt-br/smarty3/update_fail_eml.tpl
@@ -0,0 +1,11 @@
+Oi, 
+Eu sou {{$sitename}}   
+Os desenvolvedores do friendica lançaram uma atualização {{$update}} recentemente, 
+mas quando tentei instalá-la algo de errado aconeteceu.  
+Isso precisa ser corrigido logo e não posso fazê-lo sozinho. Por favor contacte um 
+desenvolvedor do friendica se você não puder fazer a correção. Meu banco de dados pode estar inválido. 
+
+A mensagem de erro é : '{{$error}}'.   
+
+Lamento. 
+Seu servidor friendica em {{$siteurl}}
\ No newline at end of file
diff --git a/view/settings_features.tpl b/view/settings_features.tpl
index 4065d8fc7..1b106d411 100644
--- a/view/settings_features.tpl
+++ b/view/settings_features.tpl
@@ -8,7 +8,7 @@
 
$f.0

 
 {{ for $f.1 as $fcat }}
-	{{ inc $field_yesno with $field=$fcat }}{{endinc}}
+	{{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
 {{ endfor }}
 {{ endfor }}
 
diff --git a/view/smarty3/404.tpl b/view/smarty3/404.tpl
new file mode 100644
index 000000000..518ad1d29
--- /dev/null
+++ b/view/smarty3/404.tpl
@@ -0,0 +1 @@
+
{{$message}}

diff --git a/view/smarty3/acl_selector.tpl b/view/smarty3/acl_selector.tpl
new file mode 100644
index 000000000..e9f8030d7
--- /dev/null
+++ b/view/smarty3/acl_selector.tpl
@@ -0,0 +1,26 @@
+

+	
+	{{$showall}}
+	

+		

+		

+	

+	
+

+
+
+
+
diff --git a/view/smarty3/admin_aside.tpl b/view/smarty3/admin_aside.tpl
new file mode 100644
index 000000000..a9d26a89f
--- /dev/null
+++ b/view/smarty3/admin_aside.tpl
@@ -0,0 +1,42 @@
+
+
{{$admtxt}}

+
+
+{{if $admin.update}}
+
+{{/if}}
+
+
+{{if $admin.plugins_admin}}
{{$plugadmtxt}}
{{/if}}
+
    
+	{{foreach $admin.plugins_admin as $l}}
+	
  • {{$l.1}}
    • 
+	{{/foreach}}
+

+	
+	
+
{{$logtxt}}

+
+
diff --git a/view/smarty3/admin_logs.tpl b/view/smarty3/admin_logs.tpl
new file mode 100644
index 000000000..e5412429f
--- /dev/null
+++ b/view/smarty3/admin_logs.tpl
@@ -0,0 +1,19 @@
+

+	
{{$title}} - {{$page}}

+	
+	
+    
+
+	{{include file="field_checkbox.tpl" field=$debugging}}
+	{{include file="field_input.tpl" field=$logfile}}
+	{{include file="field_select.tpl" field=$loglevel}}
+	
+	

+	
+	
+	
+	
{{$logname}}

+	
{{$data}}

+
+	
+

diff --git a/view/smarty3/admin_plugins.tpl b/view/smarty3/admin_plugins.tpl
new file mode 100644
index 000000000..01c178c3e
--- /dev/null
+++ b/view/smarty3/admin_plugins.tpl
@@ -0,0 +1,15 @@
+

+	
{{$title}} - {{$page}}

+	
+		
    
+		{{foreach $plugins as $p}}
+			
  • 
+				
+				{{$p.2.name}} - {{$p.2.version}}
+				{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
+
+					
    {{$p.2.description}}
    
+			
    • 
+		{{/foreach}}
+		

+

diff --git a/view/smarty3/admin_plugins_details.tpl b/view/smarty3/admin_plugins_details.tpl
new file mode 100644
index 000000000..47c33bec3
--- /dev/null
+++ b/view/smarty3/admin_plugins_details.tpl
@@ -0,0 +1,36 @@
+

+	
{{$title}} - {{$page}}

+	
+	
 {{$info.name}} - {{$info.version}} : {{$action}}

+	
{{$info.description}}

+	
+	
{{$str_author}}
+	{{foreach $info.author as $a}}
+		{{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}},
+	{{/foreach}}
+	

+
+	
{{$str_maintainer}}
+	{{foreach $info.maintainer as $a}}
+		{{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}},
+	{{/foreach}}
+	

+	
+	{{if $screenshot}}
+	{{$screenshot.1}}
+	{{/if}}
+
+	{{if $admin_form}}
+	
{{$settings}}

+	

+		{{$admin_form}}
+	

+	{{/if}}
+
+	{{if $readme}}
+	
Readme

+	

+		{{$readme}}
+	

+	{{/if}}
+

diff --git a/view/smarty3/admin_remoteupdate.tpl b/view/smarty3/admin_remoteupdate.tpl
new file mode 100644
index 000000000..6260741ed
--- /dev/null
+++ b/view/smarty3/admin_remoteupdate.tpl
@@ -0,0 +1,98 @@
+
+
+
+

+	
 
Your version:
{{$localversion}}
 

+{{if $needupdate}}
+	
 
New version:
{{$remoteversion}}
 

+
+	

+	
+
+	{{if $canwrite}}
+		

+	{{else}}
+		
Your friendica installation is not writable by web server.

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

+			{{include file="field_input.tpl" field=$ftphost}}
+			{{include file="field_input.tpl" field=$ftppath}}
+			{{include file="field_input.tpl" field=$ftpuser}}
+			{{include file="field_password.tpl" field=$ftppwd}}
+			

+		{{/if}}
+	{{/if}}
+	

+{{else}}
+
No updates

+{{/if}}
+

diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl
new file mode 100644
index 000000000..79e68a40c
--- /dev/null
+++ b/view/smarty3/admin_site.tpl
@@ -0,0 +1,108 @@
+
+

+	
{{$title}} - {{$page}}

+	
+	

+    
+
+	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_textarea.tpl" field=$banner}}
+	{{include file="field_select.tpl" field=$language}}
+	{{include file="field_select.tpl" field=$theme}}
+	{{include file="field_select.tpl" field=$theme_mobile}}
+	{{include file="field_select.tpl" field=$ssl_policy}}
+	{{include file="field_checkbox.tpl" field=$new_share}}
+
+	
+	

+	
+	
{{$registration}}

+	{{include file="field_input.tpl" field=$register_text}}
+	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_input.tpl" field=$daily_registrations}}
+	{{include file="field_checkbox.tpl" field=$no_multi_reg}}
+	{{include file="field_checkbox.tpl" field=$no_openid}}
+	{{include file="field_checkbox.tpl" field=$no_regfullname}}
+	
+	

+
+	
{{$upload}}

+	{{include file="field_input.tpl" field=$maximagesize}}
+	{{include file="field_input.tpl" field=$maximagelength}}
+	{{include file="field_input.tpl" field=$jpegimagequality}}
+	
+	
{{$corporate}}

+	{{include file="field_input.tpl" field=$allowed_sites}}
+	{{include file="field_input.tpl" field=$allowed_email}}
+	{{include file="field_checkbox.tpl" field=$block_public}}
+	{{include file="field_checkbox.tpl" field=$force_publish}}
+	{{include file="field_checkbox.tpl" field=$no_community_page}}
+	{{include file="field_checkbox.tpl" field=$ostatus_disabled}}
+	{{include file="field_checkbox.tpl" field=$diaspora_enabled}}
+	{{include file="field_checkbox.tpl" field=$dfrn_only}}
+	{{include file="field_input.tpl" field=$global_directory}}
+	{{include file="field_checkbox.tpl" field=$thread_allow}}
+	{{include file="field_checkbox.tpl" field=$newuser_private}}
+	
+	

+	
+	
{{$advanced}}

+	{{include file="field_checkbox.tpl" field=$no_utf}}
+	{{include file="field_checkbox.tpl" field=$verifyssl}}
+	{{include file="field_input.tpl" field=$proxy}}
+	{{include file="field_input.tpl" field=$proxyuser}}
+	{{include file="field_input.tpl" field=$timeout}}
+	{{include file="field_input.tpl" field=$delivery_interval}}
+	{{include file="field_input.tpl" field=$poll_interval}}
+	{{include file="field_input.tpl" field=$maxloadavg}}
+	{{include file="field_input.tpl" field=$abandon_days}}
+	{{include file="field_input.tpl" field=$lockpath}}
+	{{include file="field_input.tpl" field=$temppath}}
+	{{include file="field_input.tpl" field=$basepath}}
+
+	
{{$performance}}

+	{{include file="field_checkbox.tpl" field=$use_fulltext_engine}}
+	{{include file="field_input.tpl" field=$itemcache}}
+	{{include file="field_input.tpl" field=$itemcache_duration}}
+
+	
+	

+	
+	

+

diff --git a/view/smarty3/admin_summary.tpl b/view/smarty3/admin_summary.tpl
new file mode 100644
index 000000000..339dbddb6
--- /dev/null
+++ b/view/smarty3/admin_summary.tpl
@@ -0,0 +1,40 @@
+

+	
{{$title}} - {{$page}}

+
+	

+		
{{$queues.label}}

+		
{{$queues.deliverq}} - {{$queues.queue}}

+	

+	

+		
{{$pending.0}}

+		
{{$pending.1}}
+	

+
+	

+		
{{$users.0}}

+		
{{$users.1}}

+	

+	{{foreach $accounts as $p}}
+		

+			
{{$p.0}}

+			
{{if $p.1}}{{$p.1}}{{else}}0{{/if}}

+		

+	{{/foreach}}
+
+
+	

+		
{{$plugins.0}}

+		
+		{{foreach $plugins.1 as $p}}
+			
{{$p}}

+		{{/foreach}}
+		
+	

+
+	

+		
{{$version.0}}

+		
{{$version.1}} - {{$build}}
+	

+
+
+

diff --git a/view/smarty3/admin_users.tpl b/view/smarty3/admin_users.tpl
new file mode 100644
index 000000000..5658fc7e5
--- /dev/null
+++ b/view/smarty3/admin_users.tpl
@@ -0,0 +1,98 @@
+
+

+	
{{$title}} - {{$page}}

+	
+	

+        
+		
+		
{{$h_pending}}

+		{{if $pending}}
+			
+				
+				
+					{{foreach $th_pending as $th}}{{/foreach}}
+					
+					
+				
+				
+				
+			{{foreach $pending as $u}}
+				
+					
+					
+					
+					
+					
+				
+			{{/foreach}}
+				
+			
{{$th}}
{{$u.created}}{{$u.name}}
+						
+						
+					

+			
{{$select_all}}

+			
 
			
+		{{else}}
+			
{{$no_pending}}

+		{{/if}}
+	
+	
+		
+	
+		
{{$h_users}}

+		{{if $users}}
+			
+				
+				
+					
+					{{foreach $th_users as $th}}{{/foreach}}
+					
+					
+				
+				
+				
+				{{foreach $users as $u}}
+					
+						
+						
+						
+						
+						
+						
+						
+						
+                                    {{/if}}
+						
+					
+				{{/foreach}}
+				
+			
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} 
+                                    {{if $u.is_admin}}
+                                         
+                                    {{else}}
+                                        
+                                    {{if $u.is_admin}}
+                                         
+                                    {{else}}
+                                        
+                                        
+                                    {{/if}}
+						

+			
{{$select_all}}

+			
 
						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	

+

diff --git a/view/smarty3/album_edit.tpl b/view/smarty3/album_edit.tpl
new file mode 100644
index 000000000..61653c47c
--- /dev/null
+++ b/view/smarty3/album_edit.tpl
@@ -0,0 +1,15 @@
+

+

+
+
+
+
+
+

+
+
+
+
+

+

+

diff --git a/view/smarty3/api_config_xml.tpl b/view/smarty3/api_config_xml.tpl
new file mode 100644
index 000000000..8c0766c73
--- /dev/null
+++ b/view/smarty3/api_config_xml.tpl
@@ -0,0 +1,66 @@
+
+ 
+  {{$config.site.name}}
+  {{$config.site.server}}
+  default
+  
+  {{$config.site.logo}}
+
+  true
+  en
+  {{$config.site.email}}
+  
+  
+  UTC
+  {{$config.site.closed}}
+
+  false
+  {{$config.site.private}}
+  {{$config.site.textlimit}}
+  {{$config.site.ssl}}
+  {{$config.site.sslserver}}
+  30
+
+
+ 
+  cc
+  
+  http://creativecommons.org/licenses/by/3.0/
+  Creative Commons Attribution 3.0
+  http://i.creativecommons.org/l/by/3.0/80x15.png
+
+
+ 
+  
+
+ 
+  
+
+ 
+  
+
+ 
+
+  
+
+ 
+  false
+  20
+  600
+
+ 
+
+  false
+  INVALID SERVER
+  5222
+  update
+
+ 
+  StatusNet
+
+
+ 
+  false
+  0
+
+
diff --git a/view/smarty3/api_friends_xml.tpl b/view/smarty3/api_friends_xml.tpl
new file mode 100644
index 000000000..d3a218142
--- /dev/null
+++ b/view/smarty3/api_friends_xml.tpl
@@ -0,0 +1,7 @@
+
+
+
+	{{foreach $users as $u}}
+	{{include file="api_user_xml.tpl" user=$u}}
+	{{/foreach}}
+
diff --git a/view/smarty3/api_ratelimit_xml.tpl b/view/smarty3/api_ratelimit_xml.tpl
new file mode 100644
index 000000000..e4b470a25
--- /dev/null
+++ b/view/smarty3/api_ratelimit_xml.tpl
@@ -0,0 +1,6 @@
+
+ {{$hash.remaining_hits}}
+ {{$hash.hourly_limit}}
+ {{$hash.reset_time}}
+ {{$hash.resettime_in_seconds}}
+
diff --git a/view/smarty3/api_status_xml.tpl b/view/smarty3/api_status_xml.tpl
new file mode 100644
index 000000000..cbb736e22
--- /dev/null
+++ b/view/smarty3/api_status_xml.tpl
@@ -0,0 +1,46 @@
+{{if $status}}
+    {{$status.created_at}}
+    {{$status.id}}
+    {{$status.text}}
+    {{$status.source}}
+    {{$status.truncated}}
+    {{$status.in_reply_to_status_id}}
+    {{$status.in_reply_to_user_id}}
+    {{$status.favorited}}
+    {{$status.in_reply_to_screen_name}}
+    {{$status.geo}}
+    {{$status.coordinates}}
+    {{$status.place}}
+    {{$status.contributors}}
+	
+	  {{$status.user.id}}
+	  {{$status.user.name}}
+	  {{$status.user.screen_name}}
+	  {{$status.user.location}}
+	  {{$status.user.description}}
+	  {{$status.user.profile_image_url}}
+	  {{$status.user.url}}
+	  {{$status.user.protected}}
+	  {{$status.user.followers}}
+	  {{$status.user.profile_background_color}}
+  	  {{$status.user.profile_text_color}}
+  	  {{$status.user.profile_link_color}}
+  	  {{$status.user.profile_sidebar_fill_color}}
+  	  {{$status.user.profile_sidebar_border_color}}
+  	  {{$status.user.friends_count}}
+  	  {{$status.user.created_at}}
+  	  {{$status.user.favourites_count}}
+  	  {{$status.user.utc_offset}}
+  	  {{$status.user.time_zone}}
+  	  {{$status.user.profile_background_image_url}}
+  	  {{$status.user.profile_background_tile}}
+  	  {{$status.user.profile_use_background_image}}
+  	  
+  	  {{$status.user.geo_enabled}}
+  	  {{$status.user.verified}}
+  	  
+  	  {{$status.user.statuses_count}}
+  	  {{$status.user.lang}}
+  	  {{$status.user.contributors_enabled}}
+	  
+{{/if}}
diff --git a/view/smarty3/api_test_xml.tpl b/view/smarty3/api_test_xml.tpl
new file mode 100644
index 000000000..80a541c39
--- /dev/null
+++ b/view/smarty3/api_test_xml.tpl
@@ -0,0 +1 @@
+{{$ok}}
diff --git a/view/smarty3/api_timeline_atom.tpl b/view/smarty3/api_timeline_atom.tpl
new file mode 100644
index 000000000..4baed1604
--- /dev/null
+++ b/view/smarty3/api_timeline_atom.tpl
@@ -0,0 +1,90 @@
+
+ StatusNet
+ {{$rss.self}}
+ Friendica
+ Friendica API feed
+ {{$rss.logo}}
+ {{$rss.atom_updated}}
+ 
+ 
+ 
+ 
+ 
+	http://activitystrea.ms/schema/1.0/person
+	{{$user.url}}
+	{{$user.name}}
+	
+	
+	
+	
+	
+	
+	{{$user.screen_name}}
+	{{$user.name}}
+	
+		homepage
+		{{$user.url}}
+		true
+	
+	
+ 
+
+ 
+ 
+	http://activitystrea.ms/schema/1.0/person
+	{{$user.contact_url}}
+	{{$user.name}}
+	
+	
+	
+	
+	
+	{{$user.screen_name}}
+	{{$user.name}}
+	
+		homepage
+		{{$user.url}}
+		true
+	
+	
+ 
+ 
+ 
+  	{{foreach $statuses as $status}}
+	
+		{{$status.objecttype}}
+		{{$status.message_id}}
+		{{$status.text}}
+		{{$status.statusnet_html}}
+		
+		{{$status.verb}}
+		{{$status.published}}
+		{{$status.updated}}
+
+		
+		
+		
+		
+
+		
+			http://activitystrea.ms/schema/1.0/person
+			{{$status.user.url}}
+			{{$status.user.name}}
+			
+			
+
+			
+			{{$status.user.screen_name}}
+			{{$status.user.name}}
+			
+			
+				homepage
+				{{$status.user.url}}
+				true
+			
+		
+		 
+
+	    
+    {{/foreach}}
+
diff --git a/view/smarty3/api_timeline_rss.tpl b/view/smarty3/api_timeline_rss.tpl
new file mode 100644
index 000000000..075cc8348
--- /dev/null
+++ b/view/smarty3/api_timeline_rss.tpl
@@ -0,0 +1,26 @@
+
+  
+    Friendica
+    {{$rss.alternate}}
+    
+    Friendica timeline
+    {{$rss.language}}
+    40
+	
+		{{$user.link}}
+		{{$user.name}}'s items
+		{{$user.profile_image_url}}
+	
+	
+{{foreach $statuses as $status}}
+  
+    {{$status.user.name}}: {{$status.text}}
+    {{$status.text}}
+    {{$status.created_at}}
+    {{$status.url}}
+    {{$status.url}}
+    {{$status.source}}
+  
+{{/foreach}}
+  
+
diff --git a/view/smarty3/api_timeline_xml.tpl b/view/smarty3/api_timeline_xml.tpl
new file mode 100644
index 000000000..f14d73e9c
--- /dev/null
+++ b/view/smarty3/api_timeline_xml.tpl
@@ -0,0 +1,20 @@
+
+{{foreach $statuses as $status}} 
+  {{$status.text}}
+  {{$status.truncated}}
+  {{$status.created_at}}
+  {{$status.in_reply_to_status_id}}
+  {{$status.source}}
+  {{$status.id}}
+  {{$status.in_reply_to_user_id}}
+  {{$status.in_reply_to_screen_name}}
+  {{$status.geo}}
+  {{$status.favorited}}
+{{include file="api_user_xml.tpl" user=$status.user}}  {{$status.statusnet_html}}
+  {{$status.statusnet_conversation_id}}
+  {{$status.url}}
+  {{$status.coordinates}}
+  {{$status.place}}
+  {{$status.contributors}}
+ 
+{{/foreach}}
diff --git a/view/smarty3/api_user_xml.tpl b/view/smarty3/api_user_xml.tpl
new file mode 100644
index 000000000..3b51992f6
--- /dev/null
+++ b/view/smarty3/api_user_xml.tpl
@@ -0,0 +1,46 @@
+  
+   {{$user.id}}
+   {{$user.name}}
+   {{$user.screen_name}}
+   {{$user.location}}
+   {{$user.description}}
+   {{$user.profile_image_url}}
+   {{$user.url}}
+   {{$user.protected}}
+   {{$user.followers_count}}
+   {{$user.friends_count}}
+   {{$user.created_at}}
+   {{$user.favourites_count}}
+   {{$user.utc_offset}}
+   {{$user.time_zone}}
+   {{$user.statuses_count}}
+   {{$user.following}}
+   {{$user.profile_background_color}}
+   {{$user.profile_text_color}}
+   {{$user.profile_link_color}}
+   {{$user.profile_sidebar_fill_color}}
+   {{$user.profile_sidebar_border_color}}
+   {{$user.profile_background_image_url}}
+   {{$user.profile_background_tile}}
+   {{$user.profile_use_background_image}}
+   {{$user.notifications}}
+   {{$user.geo_enabled}}
+   {{$user.verified}}
+   {{$user.lang}}
+   {{$user.contributors_enabled}}
+   {{if $user.status}}
+    {{$user.status.created_at}}
+    {{$user.status.id}}
+    {{$user.status.text}}
+    {{$user.status.source}}
+    {{$user.status.truncated}}
+    {{$user.status.in_reply_to_status_id}}
+    {{$user.status.in_reply_to_user_id}}
+    {{$user.status.favorited}}
+    {{$user.status.in_reply_to_screen_name}}
+    {{$user.status.geo}}
+    {{$user.status.coordinates}}
+    {{$user.status.place}}
+    {{$user.status.contributors}}
+  {{/if}}
+  
diff --git a/view/smarty3/apps.tpl b/view/smarty3/apps.tpl
new file mode 100644
index 000000000..335e0ca97
--- /dev/null
+++ b/view/smarty3/apps.tpl
@@ -0,0 +1,7 @@
+
{{$title}}

+
+
    
+	{{foreach $apps as $ap}}
+	
  • {{$ap}}
    • 
+	{{/foreach}}
+

diff --git a/view/smarty3/atom_feed.tpl b/view/smarty3/atom_feed.tpl
new file mode 100644
index 000000000..ccb85a48a
--- /dev/null
+++ b/view/smarty3/atom_feed.tpl
@@ -0,0 +1,29 @@
+
+ 
+
+  {{$feed_id}}
+  {{$feed_title}}
+  Friendica
+  
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
+
+  {{$feed_updated}}
+
+  
+    {{$name}}
+    {{$profile_page}}
+    
+    
+    {{$birthday}}
+  
diff --git a/view/smarty3/atom_feed_dfrn.tpl b/view/smarty3/atom_feed_dfrn.tpl
new file mode 100644
index 000000000..307001fbe
--- /dev/null
+++ b/view/smarty3/atom_feed_dfrn.tpl
@@ -0,0 +1,29 @@
+
+ 
+
+  {{$feed_id}}
+  {{$feed_title}}
+  Friendica
+  
+  {{$hub}}
+  {{$salmon}}
+  {{$community}}
+
+  {{$feed_updated}}
+
+  
+    {{$name}}
+    {{$profile_page}}
+    
+    
+    {{$birthday}}
+  
diff --git a/view/smarty3/atom_mail.tpl b/view/smarty3/atom_mail.tpl
new file mode 100644
index 000000000..9b843f585
--- /dev/null
+++ b/view/smarty3/atom_mail.tpl
@@ -0,0 +1,17 @@
+
+
+
+	
+		{{$name}}
+		{{$profile_page}}
+		{{$thumb}}
+	
+
+	{{$item_id}}
+	{{$parent_id}}
+	{{$created}}
+	{{$subject}}
+	{{$content}}
+
+
+
diff --git a/view/smarty3/atom_relocate.tpl b/view/smarty3/atom_relocate.tpl
new file mode 100644
index 000000000..78fdd7fad
--- /dev/null
+++ b/view/smarty3/atom_relocate.tpl
@@ -0,0 +1,17 @@
+
+
+
+	{{$url}}
+	{{$name}}
+	{{$photo}}
+	{{$thumb}}
+	{{$micro}}
+	{{$request}}
+	{{$confirm}}
+	{{$notify}}
+	{{$poll}}
+	{{$sitepubkey}}
+
+
+
+
diff --git a/view/smarty3/atom_suggest.tpl b/view/smarty3/atom_suggest.tpl
new file mode 100644
index 000000000..972b9bc0b
--- /dev/null
+++ b/view/smarty3/atom_suggest.tpl
@@ -0,0 +1,11 @@
+
+
+
+	{{$url}}
+	{{$name}}
+	{{$photo}}
+	{{$request}}
+	{{$note}}
+
+
+
diff --git a/view/smarty3/auto_request.tpl b/view/smarty3/auto_request.tpl
new file mode 100644
index 000000000..dfc5a4c80
--- /dev/null
+++ b/view/smarty3/auto_request.tpl
@@ -0,0 +1,37 @@
+
+
{{$header}}

+
+

+{{$page_desc}}

+

+

+

+{{$invite_desc}}
+

+

+{{$desc}}
+

+
+

+
+

+	
+	
+	

+

+
+
+

+
+

+
+	

+		
+		
+	

+

diff --git a/view/smarty3/birthdays_reminder.tpl b/view/smarty3/birthdays_reminder.tpl
new file mode 100644
index 000000000..672e77aec
--- /dev/null
+++ b/view/smarty3/birthdays_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+
+
+{{/if}}
+
diff --git a/view/smarty3/categories_widget.tpl b/view/smarty3/categories_widget.tpl
new file mode 100644
index 000000000..10d4d2f83
--- /dev/null
+++ b/view/smarty3/categories_widget.tpl
@@ -0,0 +1,12 @@
+

+	
{{$title}}

+	
{{$desc}}

+	
+	
+	
+

diff --git a/view/smarty3/comment_item.tpl b/view/smarty3/comment_item.tpl
new file mode 100644
index 000000000..8e5c0ef4c
--- /dev/null
+++ b/view/smarty3/comment_item.tpl
@@ -0,0 +1,39 @@
+		{{if $threaded}}
+		

+		{{else}}
+		

+		{{/if}}
+			

+				
+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+				{{if $qcomment}}
+					
+				{{/if}}
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/smarty3/common_friends.tpl b/view/smarty3/common_friends.tpl
new file mode 100644
index 000000000..9adb30b71
--- /dev/null
+++ b/view/smarty3/common_friends.tpl
@@ -0,0 +1,12 @@
+

+	

+		
+			{{$name}}
+		
+	

+	

+	

+		{{$name}}
+	

+	

+

\ No newline at end of file
diff --git a/view/smarty3/common_tabs.tpl b/view/smarty3/common_tabs.tpl
new file mode 100644
index 000000000..be3645966
--- /dev/null
+++ b/view/smarty3/common_tabs.tpl
@@ -0,0 +1,5 @@
+
diff --git a/view/smarty3/contact_block.tpl b/view/smarty3/contact_block.tpl
new file mode 100644
index 000000000..e688af287
--- /dev/null
+++ b/view/smarty3/contact_block.tpl
@@ -0,0 +1,12 @@
+

+
{{$contacts}}

+{{if $micropro}}
+		{{$viewcontacts}}
+		

+		{{foreach $micropro as $m}}
+			{{$m}}
+		{{/foreach}}
+		

+{{/if}}
+

+

diff --git a/view/smarty3/contact_edit.tpl b/view/smarty3/contact_edit.tpl
new file mode 100644
index 000000000..4f65f76a3
--- /dev/null
+++ b/view/smarty3/contact_edit.tpl
@@ -0,0 +1,88 @@
+
+
{{$header}}

+
+

+
+	{{$tab_str}}
+
+	
+
+	
+
+
+	

+		
+	

+	

+
+
+

+
+
+	{{if $poll_enabled}}
+		

+			
{{$lastupdtext}} {{$last_update}}

+			{{$updpub}} {{$poll_interval}} {{$udnow}}
+		

+	{{/if}}
+	

+
+	{{include file="field_checkbox.tpl" field=$hidden}}
+
+

+
{{$lbl_info1}}

+	
+	
+

+

+
+
+

+
{{$lbl_vis1}}

+
{{$lbl_vis2}}
 
+

+{{$profile_select}}
+

+
+
+
+

+

diff --git a/view/smarty3/contact_end.tpl b/view/smarty3/contact_end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/contact_head.tpl b/view/smarty3/contact_head.tpl
new file mode 100644
index 000000000..72e7edbfb
--- /dev/null
+++ b/view/smarty3/contact_head.tpl
@@ -0,0 +1,30 @@
+
+          
+
diff --git a/view/smarty3/contact_template.tpl b/view/smarty3/contact_template.tpl
new file mode 100644
index 000000000..790431a9f
--- /dev/null
+++ b/view/smarty3/contact_template.tpl
@@ -0,0 +1,25 @@
+
+

+	

+		

+
+			{{$contact.name}}
+
+			{{if $contact.photo_menu}}
+			menu
+                

+                    
    
+                        {{$contact.photo_menu}}
+                    

+                

+			{{/if}}
+		

+			
+	

+	

+		
{{$contact.name}}

+
+	

+

diff --git a/view/smarty3/contacts-end.tpl b/view/smarty3/contacts-end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/contacts-head.tpl b/view/smarty3/contacts-head.tpl
new file mode 100644
index 000000000..41f8ebddb
--- /dev/null
+++ b/view/smarty3/contacts-head.tpl
@@ -0,0 +1,17 @@
+
+
+
+
+
diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl
new file mode 100644
index 000000000..de074fc3c
--- /dev/null
+++ b/view/smarty3/contacts-template.tpl
@@ -0,0 +1,26 @@
+
{{$header}}{{if $total}} ({{$total}}){{/if}}

+
+{{if $finding}}
{{$finding}}
{{/if}}
+
+

+

+{{$desc}}
+
+
+

+

+

+
+{{$tabs}}
+
+
+{{foreach $contacts as $c}}
+	{{include file="contact_template.tpl" contact=$c}}
+{{/foreach}}
+

+
+{{$paginate}}
+
+
+
+
diff --git a/view/smarty3/contacts-widget-sidebar.tpl b/view/smarty3/contacts-widget-sidebar.tpl
new file mode 100644
index 000000000..d7b9c4b5d
--- /dev/null
+++ b/view/smarty3/contacts-widget-sidebar.tpl
@@ -0,0 +1,6 @@
+{{$vcard_widget}}
+{{$follow_widget}}
+{{$groups_widget}}
+{{$findpeople_widget}}
+{{$networks_widget}}
+
diff --git a/view/smarty3/content.tpl b/view/smarty3/content.tpl
new file mode 100644
index 000000000..466045d39
--- /dev/null
+++ b/view/smarty3/content.tpl
@@ -0,0 +1,2 @@
+

+

diff --git a/view/smarty3/conversation.tpl b/view/smarty3/conversation.tpl
new file mode 100644
index 000000000..ce5dc5a2f
--- /dev/null
+++ b/view/smarty3/conversation.tpl
@@ -0,0 +1,29 @@
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+

+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			

+			{{$thread.num_comments}} {{$thread.hide_text}}
+			

+			{{/if}}
+		
+		{{include file="file:{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+

+{{/foreach}}
+
+

+
+{{if $dropping}}
+
+

+{{/if}}
diff --git a/view/smarty3/crepair.tpl b/view/smarty3/crepair.tpl
new file mode 100644
index 000000000..2a05b9678
--- /dev/null
+++ b/view/smarty3/crepair.tpl
@@ -0,0 +1,46 @@
+
+

+
+
{{$contact_name}}

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+ 
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
+
+

+
+
diff --git a/view/smarty3/cropbody.tpl b/view/smarty3/cropbody.tpl
new file mode 100644
index 000000000..da5b1e859
--- /dev/null
+++ b/view/smarty3/cropbody.tpl
@@ -0,0 +1,58 @@
+
{{$title}}

+

+{{$desc}}
+

+

+{{$title}}
+

+

+

+

+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+

+
+

+
+

diff --git a/view/smarty3/cropend.tpl b/view/smarty3/cropend.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/crophead.tpl b/view/smarty3/crophead.tpl
new file mode 100644
index 000000000..48f375426
--- /dev/null
+++ b/view/smarty3/crophead.tpl
@@ -0,0 +1,4 @@
+      
+      
+      
+      
diff --git a/view/smarty3/delegate.tpl b/view/smarty3/delegate.tpl
new file mode 100644
index 000000000..cbaa8da86
--- /dev/null
+++ b/view/smarty3/delegate.tpl
@@ -0,0 +1,57 @@
+
{{$header}}

+
+
{{$desc}}

+
+{{if $managers}}
+
{{$head_managers}}

+
+{{foreach $managers as $x}}
+
+

+
+
+
+

+
+{{/foreach}}
+

+

+{{/if}}
+
+
+
{{$head_delegates}}

+
+{{if $delegates}}
+{{foreach $delegates as $x}}
+
+

+
+
+
+

+
+{{/foreach}}
+

+{{else}}
+{{$none}}
+{{/if}}
+

+
+
+
{{$head_potentials}}

+{{if $potentials}}
+{{foreach $potentials as $x}}
+
+

+
+
+
+

+
+{{/foreach}}
+

+{{else}}
+{{$none}}
+{{/if}}
+

+
diff --git a/view/smarty3/dfrn_req_confirm.tpl b/view/smarty3/dfrn_req_confirm.tpl
new file mode 100644
index 000000000..655af22d4
--- /dev/null
+++ b/view/smarty3/dfrn_req_confirm.tpl
@@ -0,0 +1,21 @@
+
+

+{{$welcome}}
+

+{{$please}}
+
+

+
 
+
+
+
+{{$aes_allow}}
+
+
+
+
+
+

+
+

+

\ No newline at end of file
diff --git a/view/smarty3/dfrn_request.tpl b/view/smarty3/dfrn_request.tpl
new file mode 100644
index 000000000..aa5cbd6e4
--- /dev/null
+++ b/view/smarty3/dfrn_request.tpl
@@ -0,0 +1,65 @@
+
+
{{$header}}

+
+

+{{$page_desc}}

+

+{{$invite_desc}}
+

+

+{{$desc}}
+

+
+

+
+

+	
+	
+	

+

+
+

+{{$pls_answer}}
+

+
+

+
+
+

+{{$does_know}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

+
+
+

+{{$add_note}}
+

+	

+	
+	

+
+
+

+
+	

+		
+		
+	

+

diff --git a/view/smarty3/diasp_dec_hdr.tpl b/view/smarty3/diasp_dec_hdr.tpl
new file mode 100644
index 000000000..636ff7bd0
--- /dev/null
+++ b/view/smarty3/diasp_dec_hdr.tpl
@@ -0,0 +1,8 @@
+
+  {{$inner_iv}}
+  {{$inner_key}}
+  
+    {{$author_name}}
+    {{$author_uri}}
+  
+
diff --git a/view/smarty3/diaspora_comment.tpl b/view/smarty3/diaspora_comment.tpl
new file mode 100644
index 000000000..27ec3dffc
--- /dev/null
+++ b/view/smarty3/diaspora_comment.tpl
@@ -0,0 +1,11 @@
+
+  
+    
+      {{$guid}}
+      {{$parent_guid}}
+      {{$authorsig}}
+      {{$body}}
+      {{$handle}}
+    
+  
+
\ No newline at end of file
diff --git a/view/smarty3/diaspora_comment_relay.tpl b/view/smarty3/diaspora_comment_relay.tpl
new file mode 100644
index 000000000..37a9e88b3
--- /dev/null
+++ b/view/smarty3/diaspora_comment_relay.tpl
@@ -0,0 +1,12 @@
+
+  
+    
+      {{$guid}}
+      {{$parent_guid}}
+      {{$parentsig}}
+      {{$authorsig}}
+      {{$body}}
+      {{$handle}}
+    
+  
+
\ No newline at end of file
diff --git a/view/smarty3/diaspora_conversation.tpl b/view/smarty3/diaspora_conversation.tpl
new file mode 100644
index 000000000..dc4482e4b
--- /dev/null
+++ b/view/smarty3/diaspora_conversation.tpl
@@ -0,0 +1,29 @@
+
+  
+    
+      {{$conv.guid}}
+      {{$conv.subject}}
+      {{$conv.created_at}}
+
+      {{foreach $conv.messages as $msg}}
+
+      
+        {{$msg.guid}}
+        {{$msg.parent_guid}}
+        {{if $msg.parent_author_signature}}
+        {{$msg.parent_author_signature}}
+        {{/if}}
+        {{$msg.author_signature}}
+        {{$msg.text}}
+        {{$msg.created_at}}
+        {{$msg.diaspora_handle}}
+        {{$msg.conversation_guid}}
+      
+
+      {{/foreach}}
+
+      {{$conv.diaspora_handle}}
+      {{$conv.participant_handles}}
+    
+  
+
diff --git a/view/smarty3/diaspora_like.tpl b/view/smarty3/diaspora_like.tpl
new file mode 100644
index 000000000..b03aef37a
--- /dev/null
+++ b/view/smarty3/diaspora_like.tpl
@@ -0,0 +1,12 @@
+
+  
+    
+      {{$target_type}}
+      {{$guid}}
+      {{$parent_guid}}
+      {{$authorsig}}
+      {{$positive}}
+      {{$handle}}
+    
+  
+
diff --git a/view/smarty3/diaspora_like_relay.tpl b/view/smarty3/diaspora_like_relay.tpl
new file mode 100644
index 000000000..30df4cac6
--- /dev/null
+++ b/view/smarty3/diaspora_like_relay.tpl
@@ -0,0 +1,13 @@
+
+  
+    
+      {{$guid}}
+      {{$target_type}}
+      {{$parent_guid}}
+      {{$parentsig}}
+      {{$authorsig}}
+      {{$positive}}
+      {{$handle}}
+    
+  
+
diff --git a/view/smarty3/diaspora_message.tpl b/view/smarty3/diaspora_message.tpl
new file mode 100644
index 000000000..3413d79b0
--- /dev/null
+++ b/view/smarty3/diaspora_message.tpl
@@ -0,0 +1,13 @@
+
+  
+      
+        {{$msg.guid}}
+        {{$msg.parent_guid}}
+        {{$msg.author_signature}}
+        {{$msg.text}}
+        {{$msg.created_at}}
+        {{$msg.diaspora_handle}}
+        {{$msg.conversation_guid}}
+      
+  
+
diff --git a/view/smarty3/diaspora_photo.tpl b/view/smarty3/diaspora_photo.tpl
new file mode 100644
index 000000000..cd7ef5802
--- /dev/null
+++ b/view/smarty3/diaspora_photo.tpl
@@ -0,0 +1,13 @@
+
+  
+    
+      {{$path}}
+      {{$filename}}
+      {{$msg_guid}}
+      {{$guid}}
+      {{$handle}}
+      {{$public}}
+      {{$created_at}}
+    
+  
+
\ No newline at end of file
diff --git a/view/smarty3/diaspora_post.tpl b/view/smarty3/diaspora_post.tpl
new file mode 100644
index 000000000..abbcc4c61
--- /dev/null
+++ b/view/smarty3/diaspora_post.tpl
@@ -0,0 +1,11 @@
+
+  
+    
+      {{$body}}
+      {{$guid}}
+      {{$handle}}
+      {{$public}}
+      {{$created}}
+    
+  
+
\ No newline at end of file
diff --git a/view/smarty3/diaspora_profile.tpl b/view/smarty3/diaspora_profile.tpl
new file mode 100644
index 000000000..04f2e2948
--- /dev/null
+++ b/view/smarty3/diaspora_profile.tpl
@@ -0,0 +1,16 @@
+
+ 
+  {{$handle}}
+  {{$first}}
+  {{$last}}
+  {{$large}}
+  {{$small}}
+  {{$medium}}
+  {{$dob}}
+  {{$gender}}
+  {{$about}}
+  {{$location}}
+  {{$searchable}}
+  {{$tags}}
+
+      
diff --git a/view/smarty3/diaspora_relay_retraction.tpl b/view/smarty3/diaspora_relay_retraction.tpl
new file mode 100644
index 000000000..5e7aed41f
--- /dev/null
+++ b/view/smarty3/diaspora_relay_retraction.tpl
@@ -0,0 +1,10 @@
+
+  
+    
+      {{$type}}
+      {{$guid}}
+      {{$signature}}
+      {{$handle}}
+    
+  
+
diff --git a/view/smarty3/diaspora_relayable_retraction.tpl b/view/smarty3/diaspora_relayable_retraction.tpl
new file mode 100644
index 000000000..927e394f3
--- /dev/null
+++ b/view/smarty3/diaspora_relayable_retraction.tpl
@@ -0,0 +1,11 @@
+
+  
+    
+      {{$target_type}}
+      {{$guid}}
+      {{$parentsig}}
+      {{$authorsig}}
+      {{$handle}}
+    
+  
+
diff --git a/view/smarty3/diaspora_retract.tpl b/view/smarty3/diaspora_retract.tpl
new file mode 100644
index 000000000..26e2cb94e
--- /dev/null
+++ b/view/smarty3/diaspora_retract.tpl
@@ -0,0 +1,9 @@
+
+  
+    
+      {{$guid}}
+      {{$type}}
+      {{$handle}}
+    
+  
+
\ No newline at end of file
diff --git a/view/smarty3/diaspora_share.tpl b/view/smarty3/diaspora_share.tpl
new file mode 100644
index 000000000..59eb06124
--- /dev/null
+++ b/view/smarty3/diaspora_share.tpl
@@ -0,0 +1,8 @@
+
+  
+    
+      {{$sender}}
+      {{$recipient}}
+    
+  
+
\ No newline at end of file
diff --git a/view/smarty3/diaspora_signed_retract.tpl b/view/smarty3/diaspora_signed_retract.tpl
new file mode 100644
index 000000000..f0f346da8
--- /dev/null
+++ b/view/smarty3/diaspora_signed_retract.tpl
@@ -0,0 +1,10 @@
+
+  
+    
+      {{$guid}}
+      {{$type}}
+      {{$handle}}
+      {{$signature}}
+    
+  
+
diff --git a/view/smarty3/diaspora_vcard.tpl b/view/smarty3/diaspora_vcard.tpl
new file mode 100644
index 000000000..9d234a398
--- /dev/null
+++ b/view/smarty3/diaspora_vcard.tpl
@@ -0,0 +1,57 @@
+

+	

+		
Nickname

+		
		
+			{{$diaspora.nickname}}
+		

+	

+	

+		
Full name

+		

+			{{$diaspora.fullname}}
+		

+	

+
+	

+		
First name

+		

+		{{$diaspora.firstname}}
+		

+	

+	

+		
Family name

+		

+		{{$diaspora.lastname}}
+		

+	

+	

+		
URL

+		

+			{{$diaspora.podloc}}/
+		

+	

+	

+		
Photo

+		

+			
+		

+	

+	

+		
Photo

+		
 
+			
+		

+	

+	

+		
Photo

+		

+			
+		

+	

+	

+		
Searchable

+		

+			{{$diaspora.searchable}}
+		

+	

+

diff --git a/view/smarty3/directory_header.tpl b/view/smarty3/directory_header.tpl
new file mode 100644
index 000000000..c2ca64682
--- /dev/null
+++ b/view/smarty3/directory_header.tpl
@@ -0,0 +1,16 @@
+
{{$sitedir}}

+
+{{$globaldir}}
+{{$admin}}
+
+{{$finding}}
+
+

+

+{{$desc}}
+
+
+

+

+

+
diff --git a/view/smarty3/directory_item.tpl b/view/smarty3/directory_item.tpl
new file mode 100644
index 000000000..f4bd66d77
--- /dev/null
+++ b/view/smarty3/directory_item.tpl
@@ -0,0 +1,11 @@
+
+

+	
 
+		

+			{{$alt_text}}
+		

+	

+
+	
{{$name}}

+	
{{$details}}

+

diff --git a/view/smarty3/display-head.tpl b/view/smarty3/display-head.tpl
new file mode 100644
index 000000000..3d4e7e96a
--- /dev/null
+++ b/view/smarty3/display-head.tpl
@@ -0,0 +1,8 @@
+
+
diff --git a/view/smarty3/email_notify_html.tpl b/view/smarty3/email_notify_html.tpl
new file mode 100644
index 000000000..38c933aac
--- /dev/null
+++ b/view/smarty3/email_notify_html.tpl
@@ -0,0 +1,27 @@
+
+
+
+	{{$banner}}
+	
+
+
+
+	
+	
+
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+	
+
{{$product}}
{{$preamble}}
{{$source_name}}
{{$title}}
{{$htmlversion}}
{{$hsitelink}}
{{$hitemlink}}
{{$thanks}}
{{$site_admin}}

+
+
diff --git a/view/smarty3/email_notify_text.tpl b/view/smarty3/email_notify_text.tpl
new file mode 100644
index 000000000..3de006095
--- /dev/null
+++ b/view/smarty3/email_notify_text.tpl
@@ -0,0 +1,13 @@
+
+{{$preamble}}
+	
+{{$title}}
+
+{{$textversion}}
+				
+{{$tsitelink}}
+{{$titemlink}}
+
+{{$thanks}}
+{{$site_admin}}
+
diff --git a/view/smarty3/end.tpl b/view/smarty3/end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/event.tpl b/view/smarty3/event.tpl
new file mode 100644
index 000000000..2a0868d25
--- /dev/null
+++ b/view/smarty3/event.tpl
@@ -0,0 +1,10 @@
+{{foreach $events as $event}}
+	

+	
+	{{if $event.item.author_name}}{{$event.item.author_name}}{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}{{/if}}
+	{{if $event.edit}}{{/if}}
+	

+	

+{{/foreach}}
diff --git a/view/smarty3/event_end.tpl b/view/smarty3/event_end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/event_form.tpl b/view/smarty3/event_form.tpl
new file mode 100644
index 000000000..0091b59aa
--- /dev/null
+++ b/view/smarty3/event_form.tpl
@@ -0,0 +1,49 @@
+
{{$title}}

+
+

+{{$desc}}
+

+
+

+
+
+
+
+
+
{{$s_text}}

+{{$s_dsel}} {{$s_tsel}}
+
+
{{$f_text}}

+{{$f_dsel}} {{$f_tsel}}
+
+

+
+ 
{{$n_text}}

+
+

+
+ 
{{$a_text}}

+
+

+
+
{{$t_text}}

+
+
+
+
{{$d_text}}

+
+
+
+
{{$l_text}}

+
+
+ 
{{$sh_text}}

+

+
+{{$acl}}
+
+

+
+

+
+
diff --git a/view/smarty3/event_head.tpl b/view/smarty3/event_head.tpl
new file mode 100644
index 000000000..2e2992e07
--- /dev/null
+++ b/view/smarty3/event_head.tpl
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
diff --git a/view/smarty3/events-js.tpl b/view/smarty3/events-js.tpl
new file mode 100644
index 000000000..c87d20529
--- /dev/null
+++ b/view/smarty3/events-js.tpl
@@ -0,0 +1,6 @@
+{{$tabs}}
+
{{$title}}

+
+
+
+

diff --git a/view/smarty3/events.tpl b/view/smarty3/events.tpl
new file mode 100644
index 000000000..50a8cf3a8
--- /dev/null
+++ b/view/smarty3/events.tpl
@@ -0,0 +1,24 @@
+{{$tabs}}
+
{{$title}}

+
+
+
+

+	
+	{{$calendar}}
+	
+

+

+
+
+{{foreach $events as $event}}
+	

+	{{if $event.is_first}}
{{$event.d}}
{{/if}}
+	{{if $event.item.author_name}}{{$event.item.author_name}}{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}{{/if}}
+	{{if $event.edit}}{{/if}}
+	

+	

+
+{{/foreach}}
diff --git a/view/smarty3/events_reminder.tpl b/view/smarty3/events_reminder.tpl
new file mode 100644
index 000000000..bd070575f
--- /dev/null
+++ b/view/smarty3/events_reminder.tpl
@@ -0,0 +1,10 @@
+{{if $count}}
+
+
+{{/if}}
+
diff --git a/view/smarty3/failed_updates.tpl b/view/smarty3/failed_updates.tpl
new file mode 100644
index 000000000..68c0bcdf2
--- /dev/null
+++ b/view/smarty3/failed_updates.tpl
@@ -0,0 +1,17 @@
+
{{$banner}}

+
+
{{$desc}}

+
+{{if $failed}}
+{{foreach $failed as $f}}
+
+
{{$f}}

+
+
+

+{{/foreach}}
+{{/if}}
+
diff --git a/view/smarty3/fake_feed.tpl b/view/smarty3/fake_feed.tpl
new file mode 100644
index 000000000..c37071cf4
--- /dev/null
+++ b/view/smarty3/fake_feed.tpl
@@ -0,0 +1,13 @@
+
+
+
+  fake feed
+  fake title
+
+  1970-01-01T00:00:00Z
+
+  
+    Fake Name
+    http://example.com
+  
+
diff --git a/view/smarty3/field.tpl b/view/smarty3/field.tpl
new file mode 100644
index 000000000..b7111ce5c
--- /dev/null
+++ b/view/smarty3/field.tpl
@@ -0,0 +1,4 @@
+
+ {{if $field.0==select}}
+ {{include file="field_select.tpl"}}
+ {{/if}}
diff --git a/view/smarty3/field_checkbox.tpl b/view/smarty3/field_checkbox.tpl
new file mode 100644
index 000000000..3771fc4a7
--- /dev/null
+++ b/view/smarty3/field_checkbox.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_combobox.tpl b/view/smarty3/field_combobox.tpl
new file mode 100644
index 000000000..3d69e2d27
--- /dev/null
+++ b/view/smarty3/field_combobox.tpl
@@ -0,0 +1,18 @@
+	
+	

+		
+		{{* html5 don't work on Chrome, Safari and IE9
+		
+		
+		   {{foreach $field.4 as $opt=>$val}} *}}
+		
+		
+		
+		
+		{{$field.3}}
+	

+
diff --git a/view/smarty3/field_custom.tpl b/view/smarty3/field_custom.tpl
new file mode 100644
index 000000000..e1bf318da
--- /dev/null
+++ b/view/smarty3/field_custom.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		{{$field.2}}
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_input.tpl b/view/smarty3/field_input.tpl
new file mode 100644
index 000000000..9f0103f84
--- /dev/null
+++ b/view/smarty3/field_input.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_intcheckbox.tpl b/view/smarty3/field_intcheckbox.tpl
new file mode 100644
index 000000000..a6ef7cc8f
--- /dev/null
+++ b/view/smarty3/field_intcheckbox.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.4}}
+	

diff --git a/view/smarty3/field_openid.tpl b/view/smarty3/field_openid.tpl
new file mode 100644
index 000000000..53dbfdde0
--- /dev/null
+++ b/view/smarty3/field_openid.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_password.tpl b/view/smarty3/field_password.tpl
new file mode 100644
index 000000000..e840a312d
--- /dev/null
+++ b/view/smarty3/field_password.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_radio.tpl b/view/smarty3/field_radio.tpl
new file mode 100644
index 000000000..cff8881f5
--- /dev/null
+++ b/view/smarty3/field_radio.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_richtext.tpl b/view/smarty3/field_richtext.tpl
new file mode 100644
index 000000000..641493989
--- /dev/null
+++ b/view/smarty3/field_richtext.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_select.tpl b/view/smarty3/field_select.tpl
new file mode 100644
index 000000000..18192e1d8
--- /dev/null
+++ b/view/smarty3/field_select.tpl
@@ -0,0 +1,8 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_select_raw.tpl b/view/smarty3/field_select_raw.tpl
new file mode 100644
index 000000000..4e495dcf8
--- /dev/null
+++ b/view/smarty3/field_select_raw.tpl
@@ -0,0 +1,8 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_textarea.tpl b/view/smarty3/field_textarea.tpl
new file mode 100644
index 000000000..8c311563f
--- /dev/null
+++ b/view/smarty3/field_textarea.tpl
@@ -0,0 +1,6 @@
+	
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/field_themeselect.tpl b/view/smarty3/field_themeselect.tpl
new file mode 100644
index 000000000..9b6ef23a5
--- /dev/null
+++ b/view/smarty3/field_themeselect.tpl
@@ -0,0 +1,9 @@
+	
+	

+		
+		
+		{{$field.3}}
+		

+	

diff --git a/view/smarty3/field_yesno.tpl b/view/smarty3/field_yesno.tpl
new file mode 100644
index 000000000..e36e775c7
--- /dev/null
+++ b/view/smarty3/field_yesno.tpl
@@ -0,0 +1,13 @@
+	

+		
+		
+		{{$field.3}}
+	

diff --git a/view/smarty3/fileas_widget.tpl b/view/smarty3/fileas_widget.tpl
new file mode 100644
index 000000000..70d68c56e
--- /dev/null
+++ b/view/smarty3/fileas_widget.tpl
@@ -0,0 +1,12 @@
+

+	
{{$title}}

+	
{{$desc}}

+	
+	
+	
+

diff --git a/view/smarty3/filebrowser.tpl b/view/smarty3/filebrowser.tpl
new file mode 100644
index 000000000..787f7c0cd
--- /dev/null
+++ b/view/smarty3/filebrowser.tpl
@@ -0,0 +1,84 @@
+
+
+	
+	
+	
+	
+	
+	
+	
+	

+		
    
+			
  • FileBrowser
    • 
+		

+	

+	

+
+		

+			

+				{{foreach $path as $p}}{{$p.1}}{{/foreach}}
+			

+			

+				
    
+					{{foreach $folders as $f}}
  • {{$f.1}}
    • {{/foreach}}
+				

+			

+			

+				
    
+				{{foreach $files as $f}}
+					
  • {{$f.1}}
    • 
+				{{/foreach}}
+				

+			

+		

+	

+	

+		
+	
	
+	
+	
+
diff --git a/view/smarty3/filer_dialog.tpl b/view/smarty3/filer_dialog.tpl
new file mode 100644
index 000000000..ae59ab713
--- /dev/null
+++ b/view/smarty3/filer_dialog.tpl
@@ -0,0 +1,4 @@
+{{include file="field_combobox.tpl"}}
+

+	
+

diff --git a/view/smarty3/follow.tpl b/view/smarty3/follow.tpl
new file mode 100644
index 000000000..e0326c51a
--- /dev/null
+++ b/view/smarty3/follow.tpl
@@ -0,0 +1,8 @@
+

+	
{{$connect}}

+	
{{$desc}}

+	

+		
+	

+

+
diff --git a/view/smarty3/follow_slap.tpl b/view/smarty3/follow_slap.tpl
new file mode 100644
index 000000000..faa5f4be2
--- /dev/null
+++ b/view/smarty3/follow_slap.tpl
@@ -0,0 +1,25 @@
+	
+		
+			{{$name}}
+			{{$profile_page}}
+			
+			
+		
+
+		{{$item_id}}
+		{{$title}}
+		{{$published}}
+		{{$content}}
+
+		
+		http://activitystrea.ms/schema/1.0/person
+		{{$profile_page}}
+		
+ 		
+		
+		{{$nick}}
+		{{$name}}
+		
+ 		{{$verb}}
+		{{$ostat_follow}}
+	
diff --git a/view/smarty3/generic_links_widget.tpl b/view/smarty3/generic_links_widget.tpl
new file mode 100644
index 000000000..8b4c67b6f
--- /dev/null
+++ b/view/smarty3/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+

+	{{if $title}}
{{$title}}
{{/if}}
+	{{if $desc}}
{{$desc}}
{{/if}}
+	
+	
+	
+

diff --git a/view/smarty3/group_drop.tpl b/view/smarty3/group_drop.tpl
new file mode 100644
index 000000000..670136db7
--- /dev/null
+++ b/view/smarty3/group_drop.tpl
@@ -0,0 +1,9 @@
+

+	
+

+

diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl
new file mode 100644
index 000000000..424d1c125
--- /dev/null
+++ b/view/smarty3/group_edit.tpl
@@ -0,0 +1,23 @@
+
{{$title}}

+
+
+

+	

+		
+		
+		{{include file="field_input.tpl" field=$gname}}
+		{{if $drop}}{{$drop}}{{/if}}
+		

+			
+		

+		

+	

+

+
+
+{{if $groupedit_info}}
+	

+		{{include file="groupeditor.tpl" groupeditor=$groupedit_info}}
+	

+{{/if}}
+{{if $desc}}
{{$desc}}
{{/if}}
diff --git a/view/smarty3/group_selection.tpl b/view/smarty3/group_selection.tpl
new file mode 100644
index 000000000..2223125ea
--- /dev/null
+++ b/view/smarty3/group_selection.tpl
@@ -0,0 +1,8 @@
+

+
+
+

diff --git a/view/smarty3/group_side.tpl b/view/smarty3/group_side.tpl
new file mode 100644
index 000000000..ebc820530
--- /dev/null
+++ b/view/smarty3/group_side.tpl
@@ -0,0 +1,33 @@
+

+
{{$title}}

+
+
+  
+  {{if $ungrouped}}
+  
+  {{/if}}
+

+
+
diff --git a/view/smarty3/groupeditor.tpl b/view/smarty3/groupeditor.tpl
new file mode 100644
index 000000000..c79bb0a2a
--- /dev/null
+++ b/view/smarty3/groupeditor.tpl
@@ -0,0 +1,16 @@
+

+
{{$groupeditor.label_members}}

+

+{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+

+

+

+

+
+

+
{{$groupeditor.label_contacts}}

+

+{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+

+

+

diff --git a/view/smarty3/head.tpl b/view/smarty3/head.tpl
new file mode 100644
index 000000000..9b7bc915b
--- /dev/null
+++ b/view/smarty3/head.tpl
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/smarty3/hide_comments.tpl b/view/smarty3/hide_comments.tpl
new file mode 100644
index 000000000..f4ed9c552
--- /dev/null
+++ b/view/smarty3/hide_comments.tpl
@@ -0,0 +1,4 @@
+

+{{$num_comments}} {{$hide_text}}
+

+

diff --git a/view/smarty3/install.tpl b/view/smarty3/install.tpl
new file mode 100644
index 000000000..81475f587
--- /dev/null
+++ b/view/smarty3/install.tpl
@@ -0,0 +1,10 @@
+
+
{{$title}}

+
{{$pass}}

+
+
+{{if $status}}
+
{{$status}}

+{{/if}}
+
+{{$text}}
diff --git a/view/smarty3/install_checks.tpl b/view/smarty3/install_checks.tpl
new file mode 100644
index 000000000..2a47a6e0b
--- /dev/null
+++ b/view/smarty3/install_checks.tpl
@@ -0,0 +1,24 @@
+
{{$title}}

+
{{$pass}}

+

+
+{{foreach $checks as $check}}
+	
+	{{if $check.help}}
+	
+	{{/if}}
+{{/foreach}}
+
{{$check.title}} {{if $check.required}}(required){{/if}}
{{$check.help}}

+
+{{if $phpath}}
+	
+{{/if}}
+
+{{if $passed}}
+	
+	
+{{else}}
+	
+	
+{{/if}}
+

diff --git a/view/smarty3/install_db.tpl b/view/smarty3/install_db.tpl
new file mode 100644
index 000000000..ef8510ae3
--- /dev/null
+++ b/view/smarty3/install_db.tpl
@@ -0,0 +1,30 @@
+
+
{{$title}}

+
{{$pass}}

+
+
+

+{{$info_01}}

+{{$info_02}}

+{{$info_03}}
+

+
+{{if $status}}
+
{{$status}}

+{{/if}}
+
+

+
+
+
+
+{{include file="field_input.tpl" field=$dbhost}}
+{{include file="field_input.tpl" field=$dbuser}}
+{{include file="field_password.tpl" field=$dbpass}}
+{{include file="field_input.tpl" field=$dbdata}}
+
+
+ 
+
+

+
diff --git a/view/smarty3/install_settings.tpl b/view/smarty3/install_settings.tpl
new file mode 100644
index 000000000..dcb2f2242
--- /dev/null
+++ b/view/smarty3/install_settings.tpl
@@ -0,0 +1,25 @@
+
+
{{$title}}

+
{{$pass}}

+
+
+{{if $status}}
+
{{$status}}

+{{/if}}
+
+

+
+
+
+
+
+
+
+
+{{include file="field_input.tpl" field=$adminmail}}
+{{$timezone}}
+
+ 
+
+

+
diff --git a/view/smarty3/intros.tpl b/view/smarty3/intros.tpl
new file mode 100644
index 000000000..6132bfc75
--- /dev/null
+++ b/view/smarty3/intros.tpl
@@ -0,0 +1,28 @@
+
+

+
+
{{$str_notifytype}} {{$notify_type}}

+
{{$fullname}}

+{{$fullname}}
+
{{$knowyou}}

+
{{$note}}

+

+

+
+
+

+

+
+

+{{include file="field_checkbox.tpl" field=$hidden}}
+{{include file="field_checkbox.tpl" field=$activity}}
+
+
+
+
+{{$dfrn_text}}
+
+
+

+

+

diff --git a/view/smarty3/invite.tpl b/view/smarty3/invite.tpl
new file mode 100644
index 000000000..117ee7cd6
--- /dev/null
+++ b/view/smarty3/invite.tpl
@@ -0,0 +1,27 @@
+

+

+
+
{{$invite}}

+
+

+{{$addr_text}}
+

+
+

+
+

+
+

+{{$msg_text}}
+

+
+

+
+

+
+

+
+

+
+

+

diff --git a/view/smarty3/jot-end.tpl b/view/smarty3/jot-end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/jot-header.tpl b/view/smarty3/jot-header.tpl
new file mode 100644
index 000000000..493752c7f
--- /dev/null
+++ b/view/smarty3/jot-header.tpl
@@ -0,0 +1,322 @@
+
+
+
+
+
diff --git a/view/smarty3/jot.tpl b/view/smarty3/jot.tpl
new file mode 100644
index 000000000..a25295884
--- /dev/null
+++ b/view/smarty3/jot.tpl
@@ -0,0 +1,88 @@
+
+

+	

+		
 

+		

+	

+	

+
+	

+		
+		
+		
+		
+		
+		
+		
+		
+		

+		{{if $placeholdercategory}}
+		

+		{{/if}}
+		

+		
+		
+		

+
+

+	
+
+	

+		

+	
 
+	

+		

+	
 
+
+	 
+	

+		
+	
 
+	

+		
+	
 
+	

+		
+	
 
+	 
+
+	

+		{{$bang}}
+	

+
+	{{$preview}}
+
+	

+
+
+	

+  	{{$jotplugins}}
+	

+
+	

+		
+	
 
+	
+	
+
+	

+		

+			{{$acl}}
+			

+			
{{$emailcc}}

+			

+			{{$jotnets}}
+		

+	

+
+
+

+
+

+

+

+		{{if $content}}{{/if}}
diff --git a/view/smarty3/jot_geotag.tpl b/view/smarty3/jot_geotag.tpl
new file mode 100644
index 000000000..b0f71e73b
--- /dev/null
+++ b/view/smarty3/jot_geotag.tpl
@@ -0,0 +1,8 @@
+
+	if(navigator.geolocation) {
+		navigator.geolocation.getCurrentPosition(function(position) {
+			$('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude);
+			$('#profile-nolocation-wrapper').show();
+		});
+	}
+
diff --git a/view/smarty3/lang_selector.tpl b/view/smarty3/lang_selector.tpl
new file mode 100644
index 000000000..2d0e9cb74
--- /dev/null
+++ b/view/smarty3/lang_selector.tpl
@@ -0,0 +1,10 @@
+
lang

+
diff --git a/view/smarty3/like_noshare.tpl b/view/smarty3/like_noshare.tpl
new file mode 100644
index 000000000..b01064add
--- /dev/null
+++ b/view/smarty3/like_noshare.tpl
@@ -0,0 +1,5 @@
+
diff --git a/view/smarty3/login.tpl b/view/smarty3/login.tpl
new file mode 100644
index 000000000..331caeb24
--- /dev/null
+++ b/view/smarty3/login.tpl
@@ -0,0 +1,35 @@
+
+

+	
+
+	

+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	

+	
+	{{if $openid}}
+			

+			{{include file="field_openid.tpl" field=$lopenid}}
+			

+	{{/if}}
+
+	{{include file="field_checkbox.tpl" field=$lremember}}
+
+	
+	
+	

+		
+	

+	
+	{{foreach $hiddens as $k=>$v}}
+		
+	{{/foreach}}
+	
+	
+

+
+
+
diff --git a/view/smarty3/login_head.tpl b/view/smarty3/login_head.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/logout.tpl b/view/smarty3/logout.tpl
new file mode 100644
index 000000000..7548ed196
--- /dev/null
+++ b/view/smarty3/logout.tpl
@@ -0,0 +1,6 @@
+

+

+
+
+

+

diff --git a/view/smarty3/lostpass.tpl b/view/smarty3/lostpass.tpl
new file mode 100644
index 000000000..f6fdb28d7
--- /dev/null
+++ b/view/smarty3/lostpass.tpl
@@ -0,0 +1,18 @@
+
{{$title}}

+
+

+{{$desc}}
+

+
+

+

+        
+        
+

+

+

+        
+

+

+

+
diff --git a/view/smarty3/magicsig.tpl b/view/smarty3/magicsig.tpl
new file mode 100644
index 000000000..78d8bbbd3
--- /dev/null
+++ b/view/smarty3/magicsig.tpl
@@ -0,0 +1,9 @@
+
+
+
+{{$data}}
+
+{{$encoding}}
+{{$algorithm}}
+{{$signature}}
+
diff --git a/view/smarty3/mail_conv.tpl b/view/smarty3/mail_conv.tpl
new file mode 100644
index 000000000..1bff55108
--- /dev/null
+++ b/view/smarty3/mail_conv.tpl
@@ -0,0 +1,14 @@
+

+	

+		{{$mail.from_name}}
+	

+	

+		
{{$mail.from_name}}

+		
{{$mail.date}}

+		
{{$mail.subject}}

+		
{{$mail.body}}

+	

+	

+

+

+

diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
new file mode 100644
index 000000000..49f5ed961
--- /dev/null
+++ b/view/smarty3/mail_display.tpl
@@ -0,0 +1,10 @@
+
+{{foreach $mails as $mail_item}}
+	{{include file="mail_conv.tpl" mail=$mail_item}}
+{{/foreach}}
+
+{{if $canreply}}
+{{include file="prv_message.tpl"}}
+{{else}}
+{{$unknown_text}}
+{{/if}}
diff --git a/view/smarty3/mail_head.tpl b/view/smarty3/mail_head.tpl
new file mode 100644
index 000000000..1cd7145e7
--- /dev/null
+++ b/view/smarty3/mail_head.tpl
@@ -0,0 +1,3 @@
+
{{$messages}}

+
+{{$tab_content}}
diff --git a/view/smarty3/mail_list.tpl b/view/smarty3/mail_list.tpl
new file mode 100644
index 000000000..b08c2ca7a
--- /dev/null
+++ b/view/smarty3/mail_list.tpl
@@ -0,0 +1,16 @@
+

+	

+		{{$from_name}}
+	

+	

+		
{{$from_name}}

+		
{{$date}}

+		
{{$subject}}

+	

+		
+	

+

+

+

+
+

diff --git a/view/smarty3/match.tpl b/view/smarty3/match.tpl
new file mode 100644
index 000000000..0688ca26b
--- /dev/null
+++ b/view/smarty3/match.tpl
@@ -0,0 +1,16 @@
+

+	

+		
+			{{$name}}
+		
+	

+	

+	

+		{{$name}}
+	

+	

+	{{if $connlnk}}
+	
{{$conntxt}}

+	{{/if}}
+
+

diff --git a/view/smarty3/message-end.tpl b/view/smarty3/message-end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/message-head.tpl b/view/smarty3/message-head.tpl
new file mode 100644
index 000000000..84296c3f1
--- /dev/null
+++ b/view/smarty3/message-head.tpl
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/view/smarty3/message_side.tpl b/view/smarty3/message_side.tpl
new file mode 100644
index 000000000..ba7e28272
--- /dev/null
+++ b/view/smarty3/message_side.tpl
@@ -0,0 +1,10 @@
+

+	
+	
+	
+	
+

diff --git a/view/smarty3/moderated_comment.tpl b/view/smarty3/moderated_comment.tpl
new file mode 100644
index 000000000..79ce8f99b
--- /dev/null
+++ b/view/smarty3/moderated_comment.tpl
@@ -0,0 +1,34 @@
+		

+			

+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+				
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/smarty3/mood_content.tpl b/view/smarty3/mood_content.tpl
new file mode 100644
index 000000000..63eaa2d8d
--- /dev/null
+++ b/view/smarty3/mood_content.tpl
@@ -0,0 +1,20 @@
+
{{$title}}

+
+
{{$desc}}

+
+

+

+

+
+
+
+
+

+

+
+

+
diff --git a/view/smarty3/msg-end.tpl b/view/smarty3/msg-end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/msg-header.tpl b/view/smarty3/msg-header.tpl
new file mode 100644
index 000000000..0d2ca72be
--- /dev/null
+++ b/view/smarty3/msg-header.tpl
@@ -0,0 +1,97 @@
+
+
+
+
+
+
diff --git a/view/smarty3/nav.tpl b/view/smarty3/nav.tpl
new file mode 100644
index 000000000..7f7bb6290
--- /dev/null
+++ b/view/smarty3/nav.tpl
@@ -0,0 +1,68 @@
+
+
+
diff --git a/view/smarty3/netfriend.tpl b/view/smarty3/netfriend.tpl
new file mode 100644
index 000000000..ec6b3b6cc
--- /dev/null
+++ b/view/smarty3/netfriend.tpl
@@ -0,0 +1,14 @@
+
{{$approve_as}}

+
+

+	
+	
+	
	
+

+

+

+	
+	
+	

+

+

diff --git a/view/smarty3/nets.tpl b/view/smarty3/nets.tpl
new file mode 100644
index 000000000..f514626ac
--- /dev/null
+++ b/view/smarty3/nets.tpl
@@ -0,0 +1,10 @@
+

+	
{{$title}}

+	
{{$desc}}

+	{{$all}}
+	
+

diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl
new file mode 100644
index 000000000..16600b9ce
--- /dev/null
+++ b/view/smarty3/nogroup-template.tpl
@@ -0,0 +1,12 @@
+
{{$header}}

+
+{{foreach $contacts as $c}}
+	{{include file="contact_template.tpl" contact=$c}}
+{{/foreach}}
+

+
+{{$paginate}}
+
+
+
+
diff --git a/view/smarty3/notifications.tpl b/view/smarty3/notifications.tpl
new file mode 100644
index 000000000..0289c41d4
--- /dev/null
+++ b/view/smarty3/notifications.tpl
@@ -0,0 +1,8 @@
+
+
{{$notif_header}}

+
+{{include file="common_tabs.tpl"}}
+
+

+	{{$notif_content}}
+

diff --git a/view/smarty3/notifications_comments_item.tpl b/view/smarty3/notifications_comments_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/smarty3/notifications_comments_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/smarty3/notifications_dislikes_item.tpl b/view/smarty3/notifications_dislikes_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/smarty3/notifications_dislikes_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/smarty3/notifications_friends_item.tpl b/view/smarty3/notifications_friends_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/smarty3/notifications_friends_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/smarty3/notifications_likes_item.tpl b/view/smarty3/notifications_likes_item.tpl
new file mode 100644
index 000000000..ed020a245
--- /dev/null
+++ b/view/smarty3/notifications_likes_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/smarty3/notifications_network_item.tpl b/view/smarty3/notifications_network_item.tpl
new file mode 100644
index 000000000..856955424
--- /dev/null
+++ b/view/smarty3/notifications_network_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

diff --git a/view/smarty3/notifications_posts_item.tpl b/view/smarty3/notifications_posts_item.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/smarty3/notifications_posts_item.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/smarty3/notify.tpl b/view/smarty3/notify.tpl
new file mode 100644
index 000000000..9c454a3ed
--- /dev/null
+++ b/view/smarty3/notify.tpl
@@ -0,0 +1,3 @@
+

+	{{$item_text}} {{$item_when}}
+

\ No newline at end of file
diff --git a/view/smarty3/oauth_authorize.tpl b/view/smarty3/oauth_authorize.tpl
new file mode 100644
index 000000000..2b7afa80e
--- /dev/null
+++ b/view/smarty3/oauth_authorize.tpl
@@ -0,0 +1,10 @@
+
{{$title}}

+
+

+	
+	
{{$app.name}}

+

+
{{$authorize}}

+

+

+

diff --git a/view/smarty3/oauth_authorize_done.tpl b/view/smarty3/oauth_authorize_done.tpl
new file mode 100644
index 000000000..2e91e0125
--- /dev/null
+++ b/view/smarty3/oauth_authorize_done.tpl
@@ -0,0 +1,4 @@
+
{{$title}}

+
+
{{$info}}

+{{$code}}
diff --git a/view/smarty3/oembed_video.tpl b/view/smarty3/oembed_video.tpl
new file mode 100644
index 000000000..4ad75a82e
--- /dev/null
+++ b/view/smarty3/oembed_video.tpl
@@ -0,0 +1,4 @@
+
+	
+	

+
diff --git a/view/smarty3/oexchange_xrd.tpl b/view/smarty3/oexchange_xrd.tpl
new file mode 100644
index 000000000..d6bdde7f4
--- /dev/null
+++ b/view/smarty3/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+
+
+        
+    {{$base}}
+
+    Friendica
+    Friendica Social Network
+    Friendica
+    Send to Friendica
+
+    
+
+    
+
+    
+
+
diff --git a/view/smarty3/opensearch.tpl b/view/smarty3/opensearch.tpl
new file mode 100644
index 000000000..ad45cc9f8
--- /dev/null
+++ b/view/smarty3/opensearch.tpl
@@ -0,0 +1,13 @@
+
+
+	Friendica@{{$nodename}}
+	Search in Friendica@{{$nodename}}
+	http://bugs.friendica.com/
+	{{$baseurl}}/images/friendica-16.png
+	{{$baseurl}}/images/friendica-64.png
+	
+	        
+
\ No newline at end of file
diff --git a/view/smarty3/pagetypes.tpl b/view/smarty3/pagetypes.tpl
new file mode 100644
index 000000000..d5fcd9968
--- /dev/null
+++ b/view/smarty3/pagetypes.tpl
@@ -0,0 +1,5 @@
+	{{include file="field_radio.tpl" field=$page_normal}}
+	{{include file="field_radio.tpl" field=$page_community}}
+	{{include file="field_radio.tpl" field=$page_prvgroup}}
+	{{include file="field_radio.tpl" field=$page_soapbox}}
+	{{include file="field_radio.tpl" field=$page_freelove}}
diff --git a/view/smarty3/peoplefind.tpl b/view/smarty3/peoplefind.tpl
new file mode 100644
index 000000000..1492db120
--- /dev/null
+++ b/view/smarty3/peoplefind.tpl
@@ -0,0 +1,14 @@
+

+	
{{$findpeople}}

+	
{{$desc}}

+	

+		
+	

+	
+	
+	
+	{{if $inv}} 
+	
+	{{/if}}
+

+
diff --git a/view/smarty3/photo_album.tpl b/view/smarty3/photo_album.tpl
new file mode 100644
index 000000000..3308bf500
--- /dev/null
+++ b/view/smarty3/photo_album.tpl
@@ -0,0 +1,7 @@
+
+

diff --git a/view/smarty3/photo_drop.tpl b/view/smarty3/photo_drop.tpl
new file mode 100644
index 000000000..94ef5a3ee
--- /dev/null
+++ b/view/smarty3/photo_drop.tpl
@@ -0,0 +1,4 @@
+

+	
+

+

diff --git a/view/smarty3/photo_edit.tpl b/view/smarty3/photo_edit.tpl
new file mode 100644
index 000000000..4c7eed833
--- /dev/null
+++ b/view/smarty3/photo_edit.tpl
@@ -0,0 +1,50 @@
+
+

+
+	
+
+	
+	
+
+	

+
+	
+	
+
+	

+
+	
+	
+
+	

+	

+		

+			{{$rotatecw}}

+			{{$rotateccw}}
+		

+		

+		
+	

+	

+
+	

+		
+			{{$permissions}}
+		
+		

+		
+		

+			

+				{{$aclselect}}
+			

+		

+	

+	

+
+	
+	
+
+	

+

+
+
diff --git a/view/smarty3/photo_edit_head.tpl b/view/smarty3/photo_edit_head.tpl
new file mode 100644
index 000000000..f72dd2ed0
--- /dev/null
+++ b/view/smarty3/photo_edit_head.tpl
@@ -0,0 +1,11 @@
+
+
diff --git a/view/smarty3/photo_item.tpl b/view/smarty3/photo_item.tpl
new file mode 100644
index 000000000..e7d25fd55
--- /dev/null
+++ b/view/smarty3/photo_item.tpl
@@ -0,0 +1,22 @@
+

+	

+		
+		{{$name}}
+	

+
+	

+		{{$name}}
+		
{{$ago}}

+	

+	

+		
{{$title}}

+		
{{$body}}

+	

+	{{$drop}}
+	

+	

+	{{$comment}}
+
+

+

+
diff --git a/view/smarty3/photo_top.tpl b/view/smarty3/photo_top.tpl
new file mode 100644
index 000000000..826266aff
--- /dev/null
+++ b/view/smarty3/photo_top.tpl
@@ -0,0 +1,8 @@
+
+
+
diff --git a/view/smarty3/photo_view.tpl b/view/smarty3/photo_view.tpl
new file mode 100644
index 000000000..543130113
--- /dev/null
+++ b/view/smarty3/photo_view.tpl
@@ -0,0 +1,37 @@
+

+
{{$album.1}}

+
+
+
+{{if $prevlink}}{{/if}}
+

+{{if $nextlink}}{{/if}}
+

+
{{$desc}}

+{{if $tags}}
+
{{$tags.0}}

+
{{$tags.1}}

+{{/if}}
+{{if $tags.2}}{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+

+	{{$likebuttons}}
+	{{$like}}
+	{{$dislike}}	
+

+{{/if}}
+
+{{$comments}}
+
+{{$paginate}}
+
diff --git a/view/smarty3/photos_head.tpl b/view/smarty3/photos_head.tpl
new file mode 100644
index 000000000..eb04a0791
--- /dev/null
+++ b/view/smarty3/photos_head.tpl
@@ -0,0 +1,26 @@
+
+
+
diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl
new file mode 100644
index 000000000..329562515
--- /dev/null
+++ b/view/smarty3/photos_recent.tpl
@@ -0,0 +1,11 @@
+
{{$title}}

+{{if $can_post}}
+{{$upload.0}}
+{{/if}}
+
+

+{{foreach $photos as $ph}}
+	{{include file="photo_top.tpl" photo=$ph}}
+{{/foreach}}
+

+

diff --git a/view/smarty3/photos_upload.tpl b/view/smarty3/photos_upload.tpl
new file mode 100644
index 000000000..5045a9589
--- /dev/null
+++ b/view/smarty3/photos_upload.tpl
@@ -0,0 +1,48 @@
+
{{$pagename}}

+
+
{{$usage}}

+
+

+	

+		

+			
+		

+		
+	

+	

+	

+		
{{$existalbumtext}}

+		
+	

+	

+
+	

+		
+		
+	

+
+
+	
+	

+
+	

+		

+			{{$aclselect}}
+		

+	

+
+	

+
+	{{$uploader}}
+
+	{{$default}}
+
+	

+

+
diff --git a/view/smarty3/poco_entry_xml.tpl b/view/smarty3/poco_entry_xml.tpl
new file mode 100644
index 000000000..869894852
--- /dev/null
+++ b/view/smarty3/poco_entry_xml.tpl
@@ -0,0 +1,7 @@
+
+{{if $entry.id}}{{$entry.id}}{{/if}}
+{{if $entry.displayName}}{{$entry.displayName}}{{/if}}
+{{if $entry.preferredUsername}}{{$entry.preferredUsername}}{{/if}}
+{{if $entry.urls}}{{foreach $entry.urls as $url}}{{$url.value}}{{$url.type}}{{/foreach}}{{/if}}
+{{if $entry.photos}}{{foreach $entry.photos as $photo}}{{$photo.value}}{{$photo.type}}{{/foreach}}{{/if}}
+
diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl
new file mode 100644
index 000000000..cd54b5446
--- /dev/null
+++ b/view/smarty3/poco_xml.tpl
@@ -0,0 +1,18 @@
+
+
+{{if $response.sorted}}{{$response.sorted}}{{/if}}
+{{if $response.filtered}}{{$response.filtered}}{{/if}}
+{{if $response.updatedSince}}{{$response.updatedSince}}{{/if}}
+{{$response.startIndex}}
+{{$response.itemsPerPage}}
+{{$response.totalResults}}
+
+
+{{if $response.totalResults}}
+{{foreach $response.entry as $ent}}
+{{include file="poco_entry_xml.tpl" entry=$ent}}
+{{/foreach}}
+{{else}}
+
+{{/if}}
+
diff --git a/view/smarty3/poke_content.tpl b/view/smarty3/poke_content.tpl
new file mode 100644
index 000000000..22a0b291f
--- /dev/null
+++ b/view/smarty3/poke_content.tpl
@@ -0,0 +1,32 @@
+
{{$title}}

+
+
{{$desc}}

+
+

+

+

+
+
{{$clabel}}

+

+
+
+
+

+

+
{{$choice}}

+

+

+
+

+

+
{{$prv_desc}}

+
+

+

+
+

+
diff --git a/view/smarty3/posted_date_widget.tpl b/view/smarty3/posted_date_widget.tpl
new file mode 100644
index 000000000..009fa60a6
--- /dev/null
+++ b/view/smarty3/posted_date_widget.tpl
@@ -0,0 +1,9 @@
+

+	
{{$title}}

+
+
+

diff --git a/view/smarty3/profed_end.tpl b/view/smarty3/profed_end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/profed_head.tpl b/view/smarty3/profed_head.tpl
new file mode 100644
index 000000000..d2101c324
--- /dev/null
+++ b/view/smarty3/profed_head.tpl
@@ -0,0 +1,38 @@
+
+
+
+          
+
diff --git a/view/smarty3/profile-hide-friends.tpl b/view/smarty3/profile-hide-friends.tpl
new file mode 100644
index 000000000..590730a7c
--- /dev/null
+++ b/view/smarty3/profile-hide-friends.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/smarty3/profile-hide-wall.tpl b/view/smarty3/profile-hide-wall.tpl
new file mode 100644
index 000000000..6a118982e
--- /dev/null
+++ b/view/smarty3/profile-hide-wall.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/smarty3/profile-in-directory.tpl b/view/smarty3/profile-in-directory.tpl
new file mode 100644
index 000000000..b36739514
--- /dev/null
+++ b/view/smarty3/profile-in-directory.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/smarty3/profile-in-netdir.tpl b/view/smarty3/profile-in-netdir.tpl
new file mode 100644
index 000000000..23d4642ac
--- /dev/null
+++ b/view/smarty3/profile-in-netdir.tpl
@@ -0,0 +1,16 @@
+

+{{$desc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/smarty3/profile_advanced.tpl b/view/smarty3/profile_advanced.tpl
new file mode 100644
index 000000000..812132f0c
--- /dev/null
+++ b/view/smarty3/profile_advanced.tpl
@@ -0,0 +1,170 @@
+
{{$title}}

+
+

+ 
{{$profile.fullname.0}}

+ 
{{$profile.fullname.1}}

+

+
+{{if $profile.gender}}
+

+ 
{{$profile.gender.0}}

+ 
{{$profile.gender.1}}

+

+{{/if}}
+
+{{if $profile.birthday}}
+

+ 
{{$profile.birthday.0}}

+ 
{{$profile.birthday.1}}

+

+{{/if}}
+
+{{if $profile.age}}
+

+ 
{{$profile.age.0}}

+ 
{{$profile.age.1}}

+

+{{/if}}
+
+{{if $profile.marital}}
+

+ 
♥  {{$profile.marital.0}}

+ 
{{$profile.marital.1}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}

+

+{{/if}}
+
+{{if $profile.sexual}}
+

+ 
{{$profile.sexual.0}}

+ 
{{$profile.sexual.1}}

+

+{{/if}}
+
+{{if $profile.pub_keywords}}
+

+ 
{{$profile.pub_keywords.0}}

+ 
{{$profile.pub_keywords.1}}

+

+{{/if}}
+
+{{if $profile.homepage}}
+

+ 
{{$profile.homepage.0}}

+ 
{{$profile.homepage.1}}

+

+{{/if}}
+
+{{if $profile.hometown}}
+

+ 
{{$profile.hometown.0}}

+ 
{{$profile.hometown.1}}

+

+{{/if}}
+
+{{if $profile.politic}}
+

+ 
{{$profile.politic.0}}

+ 
{{$profile.politic.1}}

+

+{{/if}}
+
+{{if $profile.religion}}
+

+ 
{{$profile.religion.0}}

+ 
{{$profile.religion.1}}

+

+{{/if}}
+
+{{if $profile.about}}
+

+ 
{{$profile.about.0}}

+ 
{{$profile.about.1}}

+

+{{/if}}
+
+{{if $profile.interest}}
+

+ 
{{$profile.interest.0}}

+ 
{{$profile.interest.1}}

+

+{{/if}}
+
+{{if $profile.likes}}
+

+ 
{{$profile.likes.0}}

+ 
{{$profile.likes.1}}

+

+{{/if}}
+
+{{if $profile.dislikes}}
+

+ 
{{$profile.dislikes.0}}

+ 
{{$profile.dislikes.1}}

+

+{{/if}}
+
+{{if $profile.contact}}
+

+ 
{{$profile.contact.0}}

+ 
{{$profile.contact.1}}

+

+{{/if}}
+
+
+{{if $profile.music}}
+

+ 
{{$profile.music.0}}

+ 
{{$profile.music.1}}

+

+{{/if}}
+
+
+{{if $profile.book}}
+

+ 
{{$profile.book.0}}

+ 
{{$profile.book.1}}

+

+{{/if}}
+
+
+{{if $profile.tv}}
+

+ 
{{$profile.tv.0}}

+ 
{{$profile.tv.1}}

+

+{{/if}}
+
+
+{{if $profile.film}}
+

+ 
{{$profile.film.0}}

+ 
{{$profile.film.1}}

+

+{{/if}}
+
+
+{{if $profile.romance}}
+

+ 
{{$profile.romance.0}}

+ 
{{$profile.romance.1}}

+

+{{/if}}
+
+
+{{if $profile.work}}
+

+ 
{{$profile.work.0}}

+ 
{{$profile.work.1}}

+

+{{/if}}
+
+{{if $profile.education}}
+

+ 
{{$profile.education.0}}

+ 
{{$profile.education.1}}

+

+{{/if}}
+
+
+
+
diff --git a/view/smarty3/profile_edit.tpl b/view/smarty3/profile_edit.tpl
new file mode 100644
index 000000000..c595e8854
--- /dev/null
+++ b/view/smarty3/profile_edit.tpl
@@ -0,0 +1,323 @@
+{{$default}}
+
+
{{$banner}}

+
+
+
+
+
+
+

+

+
+
+

+
+
*

+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+
+

+
+{{$gender}}
+

+

+
+

+
+

+{{$dob}} {{$age}}
+

+

+

+
+{{$hide_friends}}
+
+

+
+

+

+
+
+

+
+
+

+

+
+

+
+
+

+

+
+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+

+

+
+

+
+{{$marital}}
+

+
+
+
+
+
+

+
+

+
+{{$sexual}}
+

+

+
+
+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+

+

+
+

+
+
+
{{$lbl_pubdsc}}

+

+
+

+
+
+
{{$lbl_prvdsc}}

+

+
+
+

+
+

+

+
+

+

+{{$lbl_about}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_hobbies}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_likes}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_dislikes}}
+

+
+
+
+

+

+
+
+

+

+{{$lbl_social}}
+

+
+
+
+

+

+
+
+

+
+

+

+
+
+

+

+{{$lbl_music}}
+

+
+
+
+

+

+
+

+

+{{$lbl_book}}
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_tv}} 
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_film}}
+

+
+
+
+

+

+
+
+

+
+

+

+
+
+

+

+{{$lbl_love}}
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_work}}
+

+
+
+
+

+

+
+
+
+

+

+{{$lbl_school}} 
+

+
+
+
+

+

+
+
+
+

+
+

+

+
+
+

+

+
diff --git a/view/smarty3/profile_edlink.tpl b/view/smarty3/profile_edlink.tpl
new file mode 100644
index 000000000..2f4600a87
--- /dev/null
+++ b/view/smarty3/profile_edlink.tpl
@@ -0,0 +1,2 @@
+

+

\ No newline at end of file
diff --git a/view/smarty3/profile_entry.tpl b/view/smarty3/profile_entry.tpl
new file mode 100644
index 000000000..e06307c8b
--- /dev/null
+++ b/view/smarty3/profile_entry.tpl
@@ -0,0 +1,11 @@
+
+

+

+{{$alt}}
+

+

+
+
{{$visible}}

+

+

+
diff --git a/view/smarty3/profile_listing_header.tpl b/view/smarty3/profile_listing_header.tpl
new file mode 100644
index 000000000..b771a1ea2
--- /dev/null
+++ b/view/smarty3/profile_listing_header.tpl
@@ -0,0 +1,8 @@
+
{{$header}}

+

+{{$chg_photo}}
+

+
+
diff --git a/view/smarty3/profile_photo.tpl b/view/smarty3/profile_photo.tpl
new file mode 100644
index 000000000..d73779e20
--- /dev/null
+++ b/view/smarty3/profile_photo.tpl
@@ -0,0 +1,26 @@
+
{{$title}}

+
+

+
+
+

+
+
+

+
+
+
+
+

+
+

+
+

+
+
\ No newline at end of file
diff --git a/view/smarty3/profile_publish.tpl b/view/smarty3/profile_publish.tpl
new file mode 100644
index 000000000..265c0c63c
--- /dev/null
+++ b/view/smarty3/profile_publish.tpl
@@ -0,0 +1,16 @@
+

+{{$pubdesc}}
+

+
+		

+		
+		
+
+		
	
+		

+		

+		
+		
+
+		

+		

diff --git a/view/smarty3/profile_vcard.tpl b/view/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..4e3b1f366
--- /dev/null
+++ b/view/smarty3/profile_vcard.tpl
@@ -0,0 +1,50 @@
+

+
+	
{{$profile.name}}

+	
+				
+	
+	{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+	
{{$profile.name}}

+
+
+
+	{{if $location}}
+		
{{$location}}
 
+		

+			{{if $profile.address}}
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal_code}}
+			
+			{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+	
+	{{if $profile.pubkey}}{{/if}}
+
+	{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+	{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	
+

+
+{{$contact_block}}
+
+
diff --git a/view/smarty3/prv_message.tpl b/view/smarty3/prv_message.tpl
new file mode 100644
index 000000000..66007f803
--- /dev/null
+++ b/view/smarty3/prv_message.tpl
@@ -0,0 +1,33 @@
+
+
{{$header}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+{{$select}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	

+		

+	
 
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/smarty3/pwdreset.tpl b/view/smarty3/pwdreset.tpl
new file mode 100644
index 000000000..3993dec64
--- /dev/null
+++ b/view/smarty3/pwdreset.tpl
@@ -0,0 +1,17 @@
+
{{$lbl1}}

+
+

+{{$lbl2}}
+

+

+{{$lbl3}}
+

+

+{{$newpass}}
+

+

+{{$lbl4}} {{$lbl5}}
+

+

+{{$lbl6}}
+

diff --git a/view/smarty3/register.tpl b/view/smarty3/register.tpl
new file mode 100644
index 000000000..bdec2ffb4
--- /dev/null
+++ b/view/smarty3/register.tpl
@@ -0,0 +1,63 @@
+
{{$regtitle}}

+
+

+
+	
+
+	{{$registertext}}
+
+	
{{$realpeople}}

+
+	
{{$fillwith}}

+	
{{$fillext}}

+
+	

+			{{$oidhtml}}
+	

+	

+
+{{if $invitations}}
+
+	
{{$invite_desc}}

+	

+		
+		
+	

+	

+
+{{/if}}
+
+
+	

+		
+		
+	

+	

+
+
+	

+		
+		
+	

+	

+
+	
{{$nickdesc}}

+
+	

+		
+		
@{{$sitename}}

+	

+	

+
+	{{$publish}}
+
+	

+		
+	

+	

+    
+

+
+{{$license}}
+
+
diff --git a/view/smarty3/remote_friends_common.tpl b/view/smarty3/remote_friends_common.tpl
new file mode 100644
index 000000000..b68e1c347
--- /dev/null
+++ b/view/smarty3/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+

+	
{{$desc}}      {{if $linkmore}}{{$more}}{{/if}}

+	{{if $items}}
+	{{foreach $items as $item}}
+	

+		

+			
+				{{$item.name}}
+			
+		

+		

+		

+			{{$item.name}}
+		

+		

+	

+	{{/foreach}}
+	{{/if}}
+	

+

+
diff --git a/view/smarty3/removeme.tpl b/view/smarty3/removeme.tpl
new file mode 100644
index 000000000..496f91ff5
--- /dev/null
+++ b/view/smarty3/removeme.tpl
@@ -0,0 +1,20 @@
+
{{$title}}

+
+

+
+
{{$desc}}

+
+

+
+
+

+
+
+

+

+
+
+
+

+

+
diff --git a/view/smarty3/saved_searches_aside.tpl b/view/smarty3/saved_searches_aside.tpl
new file mode 100644
index 000000000..023b974f6
--- /dev/null
+++ b/view/smarty3/saved_searches_aside.tpl
@@ -0,0 +1,14 @@
+

+	
+	{{$searchbox}}
+	
+	
+	

+

diff --git a/view/smarty3/search_item.tpl b/view/smarty3/search_item.tpl
new file mode 100644
index 000000000..8b19b1149
--- /dev/null
+++ b/view/smarty3/search_item.tpl
@@ -0,0 +1,64 @@
+
+

+	

+		

+			

+				
+				{{$item.name}}
+				menu
+				

+					
    
+						{{$item.item_photo_menu}}
+					

+				

+			

+			
	
+			

+				{{if $item.lock}}
{{$item.lock}}

+				{{else}}
{{/if}}	
+				
{{$item.location}}

+			

+		

+		

+				{{$item.name}}
+				
{{$item.ago}}

+				
+		
			
+		

+			
{{$item.title}}

+			

+			
{{$item.body}}

+			{{if $item.has_cats}}
+			
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			

+			{{/if}}
+
+			{{if $item.has_folders}}
+			
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			

+			{{/if}}
+		

+		

+			

+				{{if $item.drop.dropping}}{{/if}}
+			

+				{{if $item.drop.pagedrop}}{{/if}}
+			

+		

+	

+	

+
+
+	

+	{{if $item.conv}}
+			{{$item.conv.title}}
+	{{/if}}
+	

+
+

+
+

+
+
diff --git a/view/smarty3/settings-end.tpl b/view/smarty3/settings-end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/settings-head.tpl b/view/smarty3/settings-head.tpl
new file mode 100644
index 000000000..b40e36a1f
--- /dev/null
+++ b/view/smarty3/settings-head.tpl
@@ -0,0 +1,25 @@
+
+
+
diff --git a/view/smarty3/settings.tpl b/view/smarty3/settings.tpl
new file mode 100644
index 000000000..9fdd5437b
--- /dev/null
+++ b/view/smarty3/settings.tpl
@@ -0,0 +1,145 @@
+
{{$ptitle}}

+
+{{$nickname_block}}
+
+

+
+
+
{{$h_pass}}

+
+{{include file="field_password.tpl" field=$password1}}
+{{include file="field_password.tpl" field=$password2}}
+
+{{if $oid_enable}}
+{{include file="field_input.tpl" field=$openid}}
+{{/if}}
+
+

+
+

+
+
+
{{$h_basic}}

+
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_custom.tpl" field=$timezone}}
+{{include file="field_input.tpl" field=$defloc}}
+{{include file="field_checkbox.tpl" field=$allowloc}}
+
+
+

+
+

+
+
+
{{$h_prv}}

+
+
+
+
+{{include file="field_input.tpl" field=$maxreq}}
+
+{{$profile_in_dir}}
+
+{{$profile_in_net_dir}}
+
+{{$hide_friends}}
+
+{{$hide_wall}}
+
+{{$blockwall}}
+
+{{$blocktags}}
+
+{{$suggestme}}
+
+{{$unkmail}}
+
+
+{{include file="field_input.tpl" field=$cntunkmail}}
+
+{{include file="field_input.tpl" field=$expire.days}}
+
+
+

+	{{$expire.label}}
+	

+		

+			
{{$expire.advanced}}

+			{{include file="field_yesno.tpl" field=$expire.items}}
+			{{include file="field_yesno.tpl" field=$expire.notes}}
+			{{include file="field_yesno.tpl" field=$expire.starred}}
+			{{include file="field_yesno.tpl" field=$expire.network_only}}
+		

+	

+
+

+
+
+

+	{{$permissions}} {{$permdesc}}
+	

+
+	
+

+

+

+
+{{$group_select}}
+
+
+

+
+

+
+
+
+
{{$h_not}}

+

+
+
{{$activity_options}}

+
+{{include file="field_checkbox.tpl" field=$post_newfriend}}
+{{include file="field_checkbox.tpl" field=$post_joingroup}}
+{{include file="field_checkbox.tpl" field=$post_profilechange}}
+
+
+
{{$lbl_not}}

+
+

+{{include file="field_intcheckbox.tpl" field=$notify1}}
+{{include file="field_intcheckbox.tpl" field=$notify2}}
+{{include file="field_intcheckbox.tpl" field=$notify3}}
+{{include file="field_intcheckbox.tpl" field=$notify4}}
+{{include file="field_intcheckbox.tpl" field=$notify5}}
+{{include file="field_intcheckbox.tpl" field=$notify6}}
+{{include file="field_intcheckbox.tpl" field=$notify7}}
+{{include file="field_intcheckbox.tpl" field=$notify8}}
+

+
+

+
+

+
+

+
+
+
{{$h_advn}}

+
{{$h_descadvn}}

+
+{{$pagetype}}
+
+

+
+

+
+
diff --git a/view/smarty3/settings_addons.tpl b/view/smarty3/settings_addons.tpl
new file mode 100644
index 000000000..afddafb36
--- /dev/null
+++ b/view/smarty3/settings_addons.tpl
@@ -0,0 +1,10 @@
+
{{$title}}

+
+
+
+
+
+{{$settings_addons}}
+
+

+
diff --git a/view/smarty3/settings_connectors.tpl b/view/smarty3/settings_connectors.tpl
new file mode 100644
index 000000000..4d33393b1
--- /dev/null
+++ b/view/smarty3/settings_connectors.tpl
@@ -0,0 +1,35 @@
+
{{$title}}

+
+
{{$diasp_enabled}}

+
{{$ostat_enabled}}

+
+

+
+
+{{$settings_connectors}}
+
+{{if $mail_disabled}}
+
+{{else}}
+	

+	
{{$h_imap}}

+	
{{$imap_desc}}

+	{{include file="field_custom.tpl" field=$imap_lastcheck}}
+	{{include file="field_input.tpl" field=$mail_server}}
+	{{include file="field_input.tpl" field=$mail_port}}
+	{{include file="field_select.tpl" field=$mail_ssl}}
+	{{include file="field_input.tpl" field=$mail_user}}
+	{{include file="field_password.tpl" field=$mail_pass}}
+	{{include file="field_input.tpl" field=$mail_replyto}}
+	{{include file="field_checkbox.tpl" field=$mail_pubmail}}
+	{{include file="field_select.tpl" field=$mail_action}}
+	{{include file="field_input.tpl" field=$mail_movetofolder}}
+
+	

+		
+	

+	

+{{/if}}
+
+

+
diff --git a/view/smarty3/settings_display.tpl b/view/smarty3/settings_display.tpl
new file mode 100644
index 000000000..f8b4c5130
--- /dev/null
+++ b/view/smarty3/settings_display.tpl
@@ -0,0 +1,22 @@
+
{{$ptitle}}

+
+

+
+
+{{include file="field_themeselect.tpl" field=$theme}}
+{{include file="field_themeselect.tpl" field=$mobile_theme}}
+{{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_input.tpl" field=$itemspage_network}}
+{{include file="field_checkbox.tpl" field=$nosmile}}
+
+
+

+
+

+
+{{if $theme_config}}
+
Theme settings

+{{$theme_config}}
+{{/if}}
+
+

diff --git a/view/smarty3/settings_display_end.tpl b/view/smarty3/settings_display_end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/settings_features.tpl b/view/smarty3/settings_features.tpl
new file mode 100644
index 000000000..5c0333df2
--- /dev/null
+++ b/view/smarty3/settings_features.tpl
@@ -0,0 +1,20 @@
+
{{$title}}

+
+
+

+
+
+{{foreach $features as $f}}
+
{{$f.0}}

+
+{{foreach $f.1 as $fcat}}
+	{{include file="field_yesno.tpl" field=$fcat}}
+{{/foreach}}
+{{/foreach}}
+
+

+
+

+
+

+
diff --git a/view/smarty3/settings_nick_set.tpl b/view/smarty3/settings_nick_set.tpl
new file mode 100644
index 000000000..85956d97c
--- /dev/null
+++ b/view/smarty3/settings_nick_set.tpl
@@ -0,0 +1,5 @@
+
+

+
{{$desc}} '{{$nickname}}@{{$basepath}}'{{$subdir}}

+

+

diff --git a/view/smarty3/settings_nick_subdir.tpl b/view/smarty3/settings_nick_subdir.tpl
new file mode 100644
index 000000000..a271e0f05
--- /dev/null
+++ b/view/smarty3/settings_nick_subdir.tpl
@@ -0,0 +1,6 @@
+

+It appears that your website is located in a subdirectory of the

+{{$hostname}} website, so this setting may not work reliably.

+

+
If you have any issues, you may have better results using the profile
 address '{{$baseurl}}/profile/{{$nickname}}'.
+

\ No newline at end of file
diff --git a/view/smarty3/settings_oauth.tpl b/view/smarty3/settings_oauth.tpl
new file mode 100644
index 000000000..11c61a43e
--- /dev/null
+++ b/view/smarty3/settings_oauth.tpl
@@ -0,0 +1,31 @@
+
{{$title}}

+
+
+

+
+
+	
+
+	{{foreach $apps as $app}}
+	

+		
+		{{if $app.name}}
{{$app.name}}
{{else}}
{{$noname}}
{{/if}}
+		{{if $app.my}}
+			{{if $app.oauth_token}}
+			

+			{{/if}}
+		{{/if}}
+		{{if $app.my}}
+		 
+		 
+		{{/if}}		
+	

+	{{/foreach}}
+
+

diff --git a/view/smarty3/settings_oauth_edit.tpl b/view/smarty3/settings_oauth_edit.tpl
new file mode 100644
index 000000000..bf805363c
--- /dev/null
+++ b/view/smarty3/settings_oauth_edit.tpl
@@ -0,0 +1,17 @@
+
{{$title}}

+
+

+
+
+{{include file="field_input.tpl" field=$name}}
+{{include file="field_input.tpl" field=$key}}
+{{include file="field_input.tpl" field=$secret}}
+{{include file="field_input.tpl" field=$redirect}}
+{{include file="field_input.tpl" field=$icon}}
+
+

+
+
+

+
+

diff --git a/view/smarty3/suggest_friends.tpl b/view/smarty3/suggest_friends.tpl
new file mode 100644
index 000000000..c8b9dd28d
--- /dev/null
+++ b/view/smarty3/suggest_friends.tpl
@@ -0,0 +1,16 @@
+

+	
+	

+		
+			{{$name}}
+		
+	

+	

+	

+		{{$name}}
+	

+	

+	{{if $connlnk}}
+	
{{$conntxt}}

+	{{/if}}
+

\ No newline at end of file
diff --git a/view/smarty3/suggestions.tpl b/view/smarty3/suggestions.tpl
new file mode 100644
index 000000000..02460b6ad
--- /dev/null
+++ b/view/smarty3/suggestions.tpl
@@ -0,0 +1,21 @@
+
+

+
+
{{$str_notifytype}} {{$notify_type}}

+
{{$madeby}}

+
{{$fullname}}

+{{$fullname}}
+
{{$note}}

+

+

+
+
+

+

+
+

+{{include file="field_checkbox.tpl" field=$hidden}}
+
+

+

+

diff --git a/view/smarty3/tag_slap.tpl b/view/smarty3/tag_slap.tpl
new file mode 100644
index 000000000..bb991e6b1
--- /dev/null
+++ b/view/smarty3/tag_slap.tpl
@@ -0,0 +1,30 @@
+	
+		
+			{{$name}}
+			{{$profile_page}}
+			
+			
+		
+
+		{{$item_id}}
+		{{$title}}
+		{{$published}}
+		{{$content}}
+		
+		
+		http://activitystrea.ms/schema/1.0/person
+		{{$profile_page}}
+		
+ 		
+		
+		{{$nick}}
+		{{$name}}
+		
+ 		{{$verb}}
+		
+		
+		
+		
+		
+		
+	
diff --git a/view/smarty3/threaded_conversation.tpl b/view/smarty3/threaded_conversation.tpl
new file mode 100644
index 000000000..0830063c6
--- /dev/null
+++ b/view/smarty3/threaded_conversation.tpl
@@ -0,0 +1,16 @@
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="file:{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+

+
+{{if $dropping}}
+
+
+

+{{/if}}
diff --git a/view/smarty3/toggle_mobile_footer.tpl b/view/smarty3/toggle_mobile_footer.tpl
new file mode 100644
index 000000000..82c0197ba
--- /dev/null
+++ b/view/smarty3/toggle_mobile_footer.tpl
@@ -0,0 +1,2 @@
+{{$toggle_text}}
+
diff --git a/view/smarty3/uexport.tpl b/view/smarty3/uexport.tpl
new file mode 100644
index 000000000..efdcd6d1c
--- /dev/null
+++ b/view/smarty3/uexport.tpl
@@ -0,0 +1,9 @@
+
{{$title}}

+
+
+{{foreach $options as $o}}
+

+    
{{$o.1}}

+    
{{$o.2}}

+

+{{/foreach}}
\ No newline at end of file
diff --git a/view/smarty3/uimport.tpl b/view/smarty3/uimport.tpl
new file mode 100644
index 000000000..cb0290ed4
--- /dev/null
+++ b/view/smarty3/uimport.tpl
@@ -0,0 +1,13 @@
+

+
{{$import.title}}

+    
{{$import.intro}}

+    
{{$import.instruct}}

+    
{{$import.warn}}

+     {{include file="field_custom.tpl" field=$import.field}}
+     
+     
+	

+		
+	

+	
    
+

diff --git a/view/smarty3/vcard-widget.tpl b/view/smarty3/vcard-widget.tpl
new file mode 100644
index 000000000..1a4f90c4e
--- /dev/null
+++ b/view/smarty3/vcard-widget.tpl
@@ -0,0 +1,5 @@
+	

+		
{{$name}}

+		
{{$name}}

+	

+
diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl
new file mode 100644
index 000000000..19a4eec80
--- /dev/null
+++ b/view/smarty3/viewcontact_template.tpl
@@ -0,0 +1,9 @@
+
{{$title}}

+
+{{foreach $contacts as $c}}
+	{{include file="contact_template.tpl" contact=$c}}
+{{/foreach}}
+
+

+
+{{$paginate}}
diff --git a/view/smarty3/voting_fakelink.tpl b/view/smarty3/voting_fakelink.tpl
new file mode 100644
index 000000000..ddba96b26
--- /dev/null
+++ b/view/smarty3/voting_fakelink.tpl
@@ -0,0 +1,2 @@
+		{{$count}} {{$people}} {{$vote_mood}}

+
diff --git a/view/smarty3/wall_thread.tpl b/view/smarty3/wall_thread.tpl
new file mode 100644
index 000000000..c1fed91ba
--- /dev/null
+++ b/view/smarty3/wall_thread.tpl
@@ -0,0 +1,120 @@
+{{if $item.comment_firstcollapsed}}
+	

+	{{$item.num_comments}} {{$item.hide_text}}
+	

+	{{/if}}
diff --git a/view/smarty3/wallmessage.tpl b/view/smarty3/wallmessage.tpl
new file mode 100644
index 000000000..bea386b95
--- /dev/null
+++ b/view/smarty3/wallmessage.tpl
@@ -0,0 +1,32 @@
+
+
{{$header}}

+
+
{{$subheader}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+{{$recipname}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/smarty3/wallmsg-end.tpl b/view/smarty3/wallmsg-end.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/smarty3/wallmsg-header.tpl b/view/smarty3/wallmsg-header.tpl
new file mode 100644
index 000000000..09f5b30a7
--- /dev/null
+++ b/view/smarty3/wallmsg-header.tpl
@@ -0,0 +1,82 @@
+
+
+
+
+
diff --git a/view/smarty3/xrd_diaspora.tpl b/view/smarty3/xrd_diaspora.tpl
new file mode 100644
index 000000000..aa0d8c740
--- /dev/null
+++ b/view/smarty3/xrd_diaspora.tpl
@@ -0,0 +1,3 @@
+	
+	
+	
diff --git a/view/smarty3/xrd_host.tpl b/view/smarty3/xrd_host.tpl
new file mode 100644
index 000000000..4bcc5bbdb
--- /dev/null
+++ b/view/smarty3/xrd_host.tpl
@@ -0,0 +1,18 @@
+
+
+ 
+    {{$zhost}}
+ 
+    
+    
+    
+	
+
+    {{$bigkey}}
+
+
+
diff --git a/view/smarty3/xrd_person.tpl b/view/smarty3/xrd_person.tpl
new file mode 100644
index 000000000..a9d075a51
--- /dev/null
+++ b/view/smarty3/xrd_person.tpl
@@ -0,0 +1,38 @@
+
+
+ 
+    {{$accturi}}
+	{{$accturi}}
+    {{$profile_url}}
+ 
+    
+    
+    
+    
+    
+    
+	{{$dspr}}
+    
+    
+    
+    
+ 
+	{{$bigkey}}
+
+
diff --git a/view/sv/smarty3/cmnt_received_eml.tpl b/view/sv/smarty3/cmnt_received_eml.tpl
new file mode 100644
index 000000000..937a7d413
--- /dev/null
+++ b/view/sv/smarty3/cmnt_received_eml.tpl
@@ -0,0 +1,17 @@
+
+{{$username}},
+
+'{{$from}}' har kommenterat något som du följer.
+
+-----
+{{$body}}
+-----
+
+Logga in på {{$siteurl}} för att se hela konversationen:
+
+{{$display}}
+
+Hälsningar,
+{{$sitename}} admin
+
+ 
diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl
new file mode 100644
index 000000000..1ef533447
--- /dev/null
+++ b/view/sv/smarty3/follow_notify_eml.tpl
@@ -0,0 +1,12 @@
+{{$myname}},
+
+'{{$requestor}}' på {{$sitename}} vill följa dina uppdateringar här på Friendica.
+
+Besök dennes profil på {{$url}}.
+
+Logga in för att godkänna eller avslå förfrågan.
+
+{{$siteurl}}
+
+Hälsningar,
+{{$sitename}} admin
diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl
new file mode 100644
index 000000000..cc20902a4
--- /dev/null
+++ b/view/sv/smarty3/friend_complete_eml.tpl
@@ -0,0 +1,17 @@
+{{$username}},
+
+Goda nyheter... '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'.
+
+Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden
+utan begränsningar.
+
+Gå in på din sida 'Kontakter' på {{$sitename}} om du vill göra några 
+ändringar när det gäller denna kontakt. 
+
+{{$siteurl}}
+
+[Du kan exempelvis skapa en separat profil med information som inte
+är tillgänglig för vem som helst, och ge visningsrättigheter till '{{$fn}}'].
+
+Hälsningar,
+{{$sitename}} admin
diff --git a/view/sv/smarty3/htconfig.tpl b/view/sv/smarty3/htconfig.tpl
new file mode 100644
index 000000000..75d6a77e8
--- /dev/null
+++ b/view/sv/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/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl
new file mode 100644
index 000000000..b9dac4fc0
--- /dev/null
+++ b/view/sv/smarty3/intro_complete_eml.tpl
@@ -0,0 +1,19 @@
+{{$username}},
+
+'{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'.
+
+'{{$fn}}' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar 
+i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion
+mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts
+per automatik.
+
+'{{$fn}}' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer 
+tillåtande kommunikationsform i framtiden. 
+
+Du kommer hädanefter att få statusuppdateringar från '{{$fn}}', 
+vilka kommer att synas på din Nätverk-sida på 
+
+{{$siteurl}}
+
+Hälsningar,
+{{$sitename}} admin
diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl
new file mode 100644
index 000000000..11f1bb294
--- /dev/null
+++ b/view/sv/smarty3/lostpass_eml.tpl
@@ -0,0 +1,29 @@
+{{$username}},
+
+En begäran om återställning av lösenord på {{$sitename}} har mottagits. 
+Gå till adressen nedan för att bekräfta denna begäran. Du kan också 
+klistra in länken i adressfältet i din webbläsare. 
+
+Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. 
+Då kan du ignorera det här meddelandet. 
+
+Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du 
+initierat detta.
+
+Med den här länken kan du bekräfta din identitet:
+
+{{$reset_link}}
+
+Sedan kommer du att få ett meddelande med ett nytt lösenord.
+
+Lösenordet kan sedan ändras i dina inställningar efter att du loggat in.
+
+Detaljerna ser ut så här:
+
+Webbplats:		{{$siteurl}}
+Inloggningsnamn:	{{$email}}
+
+Hälsningar,
+{{$sitename}} admin
+
+ 
\ No newline at end of file
diff --git a/view/sv/smarty3/mail_received_html_body_eml.tpl b/view/sv/smarty3/mail_received_html_body_eml.tpl
new file mode 100644
index 000000000..8914073c2
--- /dev/null
+++ b/view/sv/smarty3/mail_received_html_body_eml.tpl
@@ -0,0 +1,25 @@
+
+
+
+	Meddelande på Friendica
+	
+
+
+
+	
+	
+
+	
+
+
+	
+		
+	
+	
+	
+	
+	
+	
+
Friendica
{{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Logga in på {{$siteurl}} för att läsa och svara på personliga meddelanden.
Hälsningar,
{{$siteName}} admin

+
+
\ No newline at end of file
diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl
new file mode 100644
index 000000000..b829e8021
--- /dev/null
+++ b/view/sv/smarty3/mail_received_text_body_eml.tpl
@@ -0,0 +1,10 @@
+{{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}.
+	
+{{$title}}
+
+{{$textversion}}
+				
+Logga in på {{$siteurl}} för att läsa och svara på personliga meddelanden.
+
+Hälsningar,
+{{$siteName}} admin
diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl
new file mode 100644
index 000000000..821344f2b
--- /dev/null
+++ b/view/sv/smarty3/passchanged_eml.tpl
@@ -0,0 +1,18 @@
+
+{{$username}},
+
+Lösenordet har ändrats enligt din begäran. Behåll den här 
+informationen om den skulle behövas i framtiden. (eller ändra lösenord 
+på en gång till något som du kommer ihåg).
+
+
+Här är dina inloggningsuppgifter:
+
+Webbplats:	{{$siteurl}}
+Användarnamn:	{{$email}}
+Lösenord:	{{$new_password}}
+
+När du loggat in kan du byta lösenord bland inställningarna.
+
+Hälsningar,
+{{$sitename}} admin
diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl
new file mode 100644
index 000000000..101fe6273
--- /dev/null
+++ b/view/sv/smarty3/register_open_eml.tpl
@@ -0,0 +1,17 @@
+{{$username}},
+Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. 
+Här är dina inloggningsuppgifter:
+
+Webbplats:	{{$siteurl}}
+Användarnamn:	{{$email}}
+Lösenord:	{{$password}}
+
+Lösenordet kan ändras på sidan Inställningar efter att du loggat in.
+
+Ägna en liten stund åt att gå igenom alla kontoinställningar där. 
+
+Välkommen till {{$sitename}}.
+
+Hälsningar,
+{{$sitename}} admin
+
diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl
new file mode 100644
index 000000000..051c3887c
--- /dev/null
+++ b/view/sv/smarty3/register_verify_eml.tpl
@@ -0,0 +1,17 @@
+En registreringsförfrågan som kräver svar har mottagits 
+på {{$sitename}} 
+
+
+Här är inloggningsuppgifterna:
+
+Fullständigt namn:	{{$username}}
+Webbplats:		{{$siteurl}}
+Användarnamn:		{{$email}}
+
+
+Gå till denna adress om du vill godkänna:
+{{$siteurl}}/regmod/allow/{{$hash}} 
+
+Gå till denna adress om du vill avslå förfrågan och ta bort kontot:
+{{$siteurl}}/regmod/deny/{{$hash}}
+
diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl
new file mode 100644
index 000000000..3caa62064
--- /dev/null
+++ b/view/sv/smarty3/request_notify_eml.tpl
@@ -0,0 +1,13 @@
+{{$myname}},
+
+Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}'
+
+Profilen finns på {{$url}}.
+
+Logga in för att se hela förfrågan och godkänna eller 
+avslå den.
+
+{{$siteurl}}
+
+Hälsningar,
+{{$sitename}} admin
diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl
new file mode 100644
index 000000000..d184b6b89
--- /dev/null
+++ b/view/sv/smarty3/wall_received_eml.tpl
@@ -0,0 +1,16 @@
+{{$username}},
+
+'{{$from}}' har skrivit på din profilsida.
+
+-----
+{{$body}}
+-----
+
+Logga in på {{$siteurl}} för att kolla eller ta bort:
+
+{{$display}}
+
+Hälsningar,
+{{$sitename}} admin
+
+ 
diff --git a/view/theme/cleanzero/config.php b/view/theme/cleanzero/config.php
index 312e9d3dd..88a41be3a 100644
--- a/view/theme/cleanzero/config.php
+++ b/view/theme/cleanzero/config.php
@@ -75,7 +75,7 @@ function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
 		"wide"=>"wide",
 		);
 
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$t = get_markup_template("theme_settings.tpl" );
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
diff --git a/view/theme/cleanzero/nav.tpl b/view/theme/cleanzero/nav.tpl
index 981f975c9..17a2f7259 100644
--- a/view/theme/cleanzero/nav.tpl
+++ b/view/theme/cleanzero/nav.tpl
@@ -69,7 +69,7 @@
 
 
 
 
diff --git a/view/theme/cleanzero/smarty3/theme_settings.tpl b/view/theme/cleanzero/smarty3/theme_settings.tpl
new file mode 100644
index 000000000..dabda90fd
--- /dev/null
+++ b/view/theme/cleanzero/smarty3/theme_settings.tpl
@@ -0,0 +1,10 @@
+{{include file="field_select.tpl" field=$color}}
+{{include file="field_select.tpl" field=$font_size}}
+{{include file="field_select.tpl" field=$resize}}
+{{include file="field_select.tpl" field=$theme_width}}
+
+
+

+	
+

+
diff --git a/view/theme/cleanzero/theme.php b/view/theme/cleanzero/theme.php
index f65890f3f..356a1b71c 100644
--- a/view/theme/cleanzero/theme.php
+++ b/view/theme/cleanzero/theme.php
@@ -8,6 +8,8 @@
 $a->theme_info = array(
   'extends' => 'duepuntozero',
 );
+set_template_engine($a, 'smarty3');
+
 function cleanzero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 
+

+	
{{$title}} - {{$page}}

+	
+	

+		        
+		
{{$h_pending}}

+		{{if $pending}}
+			
+				
+				
+					{{foreach $th_pending as $th}}{{/foreach}}
+					
+					
+				
+				
+				
+			{{foreach $pending as $u}}
+				
+					
+					
+					
+					
+					
+				
+			{{/foreach}}
+				
+			
{{$th}}
{{$u.created}}{{$u.name}}
+						
+						
+					

+			
{{$select_all}}

+			
 
			
+		{{else}}
+			
{{$no_pending}}

+		{{/if}}
+	
+	
+		
+	
+		
{{$h_users}}

+		{{if $users}}
+			
+				
+				
+					
+					{{foreach $th_users as $th}}{{/foreach}}
+					
+					
+				
+				
+				
+				{{foreach $users as $u}}
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+				{{/foreach}}
+				
+			
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
+							
+							
+						

+			
{{$select_all}}

+			
 
						
+		{{else}}
+			NO USERS?!?
+		{{/if}}
+	

+

diff --git a/view/theme/diabook/smarty3/bottom.tpl b/view/theme/diabook/smarty3/bottom.tpl
new file mode 100644
index 000000000..65de108e8
--- /dev/null
+++ b/view/theme/diabook/smarty3/bottom.tpl
@@ -0,0 +1,155 @@
+
+
+
diff --git a/view/theme/diabook/smarty3/ch_directory_item.tpl b/view/theme/diabook/smarty3/ch_directory_item.tpl
new file mode 100644
index 000000000..5fb119861
--- /dev/null
+++ b/view/theme/diabook/smarty3/ch_directory_item.tpl
@@ -0,0 +1,10 @@
+
+

+	
 
+		

+			
+				{{$alt}}-text
+			
+		

+	

+

diff --git a/view/theme/diabook/smarty3/comment_item.tpl b/view/theme/diabook/smarty3/comment_item.tpl
new file mode 100644
index 000000000..1dde07dc0
--- /dev/null
+++ b/view/theme/diabook/smarty3/comment_item.tpl
@@ -0,0 +1,43 @@
+		

+			

+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+								
+				{{if $qcomment}}
+					
+				{{/if}}
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/theme/diabook/smarty3/communityhome.tpl b/view/theme/diabook/smarty3/communityhome.tpl
new file mode 100644
index 000000000..7895fd731
--- /dev/null
+++ b/view/theme/diabook/smarty3/communityhome.tpl
@@ -0,0 +1,172 @@
+
+
+
+
+
+
+
+

+

+
+

+
+

+{{if $page}}
+
{{$page}}

+{{/if}}
+

+
+

+{{if $comunity_profiles_title}}
+
{{$comunity_profiles_title}}

+

+{{foreach $comunity_profiles_items as $i}}
+	{{$i}}
+{{/foreach}}
+

+{{/if}}
+

+
+

+{{if $helpers}}
+
{{$helpers.title.1}}

+How-To Guides

+NewHere

+Friendica Support

+Let's talk

+Local Friendica
+{{/if}}
+

+
+

+{{if $con_services}}
+
{{$con_services.title.1}}

+

+Facebook
+StatusNet
+LiveJournal
+Posterous
+Tumblr
+Twitter
+WordPress
+E-Mail
+

+{{/if}}
+

+
+

+{{if $nv}}
+
{{$nv.title.1}}

+{{$nv.directory.1}}

+{{$nv.global_directory.1}}

+{{$nv.match.1}}

+{{$nv.suggest.1}}

+{{$nv.invite.1}}
+{{$nv.search}}
+{{/if}}
+

+
+

+{{if $lastusers_title}}
+
{{$lastusers_title}}

+

+{{foreach $lastusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+

+{{/if}}
+

+
+{{if $activeusers_title}}
+
{{$activeusers_title}}

+

+{{foreach $activeusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+

+{{/if}}
+
+

+{{if $photos_title}}
+
{{$photos_title}}

+

+{{foreach $photos_items as $i}}
+	{{$i}}
+{{/foreach}}
+

+{{/if}}
+

+
+

+{{if $like_title}}
+
{{$like_title}}

+
    
+{{foreach $like_items as $i}}
+	
  • {{$i}}
    • 
+{{/foreach}}
+

+{{/if}}
+

+
+

+
{{$twitter.title.1}}

+

+

+

+
+

+{{if $mapquery}}
+
{{$mapquery.title.1}}

+

+

+
Data CC-By-SA by OpenStreetMap

+{{/if}}
+

+

diff --git a/view/theme/diabook/smarty3/contact_template.tpl b/view/theme/diabook/smarty3/contact_template.tpl
new file mode 100644
index 000000000..790431a9f
--- /dev/null
+++ b/view/theme/diabook/smarty3/contact_template.tpl
@@ -0,0 +1,25 @@
+
+

+	

+		

+
+			{{$contact.name}}
+
+			{{if $contact.photo_menu}}
+			menu
+                

+                    
    
+                        {{$contact.photo_menu}}
+                    

+                

+			{{/if}}
+		

+			
+	

+	

+		
{{$contact.name}}

+
+	

+

diff --git a/view/theme/diabook/smarty3/directory_item.tpl b/view/theme/diabook/smarty3/directory_item.tpl
new file mode 100644
index 000000000..84b4ada0f
--- /dev/null
+++ b/view/theme/diabook/smarty3/directory_item.tpl
@@ -0,0 +1,42 @@
+
+

+	
 
+		

+			
+				{{$alt_text}}
+			
+		

+	

+	

+		
{{$name}}

+		
{{$page_type}}

+		{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+    	

+        	
	
+			{{if $location}}
+			    
{{$location}}

+				

+					{{if $profile.address}}
{{$profile.address}}
{{/if}}
+					
+						{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+						{{$profile.region}}
+						{{$profile.postal_code}}
+					
+					{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+				

+				

+			{{/if}}
+
+			{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+			
	
+			
	
+				{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+				{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+			

+		

+	  	

+			{{if $about}}
{{$about}}
{{$profile.about}}
{{/if}}
+  		

+	

+

diff --git a/view/theme/diabook/smarty3/footer.tpl b/view/theme/diabook/smarty3/footer.tpl
new file mode 100644
index 000000000..25058a7ff
--- /dev/null
+++ b/view/theme/diabook/smarty3/footer.tpl
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/view/theme/diabook/smarty3/generic_links_widget.tpl b/view/theme/diabook/smarty3/generic_links_widget.tpl
new file mode 100644
index 000000000..b90c8fc8c
--- /dev/null
+++ b/view/theme/diabook/smarty3/generic_links_widget.tpl
@@ -0,0 +1,11 @@
+

+	{{if $title}}
{{$title}}
{{/if}}
+	{{if $desc}}
{{$desc}}
{{/if}}
+	
+	
+	
+

diff --git a/view/theme/diabook/smarty3/group_side.tpl b/view/theme/diabook/smarty3/group_side.tpl
new file mode 100644
index 000000000..f7ceb0641
--- /dev/null
+++ b/view/theme/diabook/smarty3/group_side.tpl
@@ -0,0 +1,34 @@
+

+	

+		
{{$title}}

+	

+
+	
+  {{if $ungrouped}}
+  
+  {{/if}}
+
	
+
diff --git a/view/theme/diabook/smarty3/jot.tpl b/view/theme/diabook/smarty3/jot.tpl
new file mode 100644
index 000000000..87290d5e5
--- /dev/null
+++ b/view/theme/diabook/smarty3/jot.tpl
@@ -0,0 +1,87 @@
+
+

+	

+		
 

+	

+	

+
+	

+		
+		
+		
+		
+		
+		
+		
+		
+		{{if $placeholdercategory}}
+		

+		{{/if}}
+		
		
+		
+		
+
+
+

+	
+	

+		

+	
 
+	

+		

+	
 
+
+	 
+	

+		
+	
 
+	

+		
+	
 
+	

+		
+	
 
+	

+		
+	
 
+
+	
+  
+   {{$preview}}
+   
+	

+		{{$bang}}
+	

+
+
+	

+  	{{$jotplugins}}
+	

+	
+	

+		
+	
 
+	
+	

+   

+	
+	
+
+	

+		

+			{{$acl}}
+			

+			
{{$emailcc}}

+			

+			{{$jotnets}}
+		

+	

+
+
+
+
+

+

+		{{if $content}}{{/if}}
diff --git a/view/theme/diabook/smarty3/login.tpl b/view/theme/diabook/smarty3/login.tpl
new file mode 100644
index 000000000..a6e8e9dec
--- /dev/null
+++ b/view/theme/diabook/smarty3/login.tpl
@@ -0,0 +1,33 @@
+
+

+	
+
+	

+	{{include file="field_input.tpl" field=$lname}}
+	{{include file="field_password.tpl" field=$lpassword}}
+	

+	
+	{{if $openid}}
+			

+			{{include file="field_openid.tpl" field=$lopenid}}
+			

+	{{/if}}
+	
+	

+		
+	

+	
+   	
+	
+	{{foreach $hiddens as $k=>$v}}
+		
+	{{/foreach}}
+	
+	
+

+
+
+
diff --git a/view/theme/diabook/smarty3/mail_conv.tpl b/view/theme/diabook/smarty3/mail_conv.tpl
new file mode 100644
index 000000000..e7a313ed8
--- /dev/null
+++ b/view/theme/diabook/smarty3/mail_conv.tpl
@@ -0,0 +1,60 @@
+

+	

+		

+			
+		

+		

+			{{$mail.body}}
+		

+	

+	

+		

+		

+		

+		

+	

+	

+		

+		

+		

+			

+				{{$mail.from_name}} {{$mail.date}}
+			

+			
+			

+			

+			
+			

+				{{$mail.delete}}
+			

+			
+		

+	

+	

+	

+

+
+
+{{*
+
+
+

+	

+		{{$mail.from_name}}
+	

+	

+		
{{$mail.from_name}}

+		
{{$mail.date}}

+		
{{$mail.subject}}

+		
{{$mail.body}}

+	

+	

+

+

+

+
+*}}
diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
new file mode 100644
index 000000000..7a96cbf36
--- /dev/null
+++ b/view/theme/diabook/smarty3/mail_display.tpl
@@ -0,0 +1,12 @@
+

+	{{$thread_subject}}
+	
+

+
+{{foreach $mails as $mail_item}}
+	

+		{{include file="mail_conv.tpl" mail=$mail_item}}
+	

+{{/foreach}}
+
+{{include file="prv_message.tpl"}}
diff --git a/view/theme/diabook/smarty3/mail_list.tpl b/view/theme/diabook/smarty3/mail_list.tpl
new file mode 100644
index 000000000..334255918
--- /dev/null
+++ b/view/theme/diabook/smarty3/mail_list.tpl
@@ -0,0 +1,8 @@
+

+	{{$subject}}
+	{{$from_name}}
+	{{$date}}
+	{{$count}}
+	
+	
+

diff --git a/view/theme/diabook/smarty3/message_side.tpl b/view/theme/diabook/smarty3/message_side.tpl
new file mode 100644
index 000000000..c8a372c74
--- /dev/null
+++ b/view/theme/diabook/smarty3/message_side.tpl
@@ -0,0 +1,10 @@
+

+	
+	
+	
+	
+

diff --git a/view/theme/diabook/smarty3/nav.tpl b/view/theme/diabook/smarty3/nav.tpl
new file mode 100644
index 000000000..034514108
--- /dev/null
+++ b/view/theme/diabook/smarty3/nav.tpl
@@ -0,0 +1,188 @@
+

+	
{{$sitelocation}}

+	
+

+
+
+
+
+
{{$langselector}}

+

+
+
+
+
+
+
+
+
+{{*
+
+{{if $nav.logout}}{{$nav.logout.1}} {{/if}}
+{{if $nav.login}} {{/if}}
+
+
+
+{{if $nav.register}}{{$nav.register.1}}{{/if}}
+	
+{{$nav.help.1}}
+	
+{{if $nav.apps}}{{$nav.apps.1}}{{/if}}
+
+{{$nav.search.1}}
+{{$nav.directory.1}}
+
+{{if $nav.admin}}{{$nav.admin.1}}{{/if}}
+
+{{if $nav.notifications}}
+{{$nav.notifications.1}}
+
+{{/if}}
+{{if $nav.messages}}
+{{$nav.messages.1}}
+
+{{/if}}
+
+{{if $nav.manage}}{{$nav.manage.1}}{{/if}}
+
+{{if $nav.settings}}{{$nav.settings.1}}{{/if}}
+{{if $nav.profiles}}{{$nav.profiles.1}}{{/if}}
+
+
+
+
+
+*}}
diff --git a/view/theme/diabook/smarty3/nets.tpl b/view/theme/diabook/smarty3/nets.tpl
new file mode 100644
index 000000000..26e6b0106
--- /dev/null
+++ b/view/theme/diabook/smarty3/nets.tpl
@@ -0,0 +1,17 @@
+

+	
{{$title}}

+	
{{$desc}}

+   
+	
+

diff --git a/view/theme/diabook/smarty3/oembed_video.tpl b/view/theme/diabook/smarty3/oembed_video.tpl
new file mode 100644
index 000000000..2d73f8d50
--- /dev/null
+++ b/view/theme/diabook/smarty3/oembed_video.tpl
@@ -0,0 +1,4 @@
+
+	
+	

+
diff --git a/view/theme/diabook/smarty3/photo_item.tpl b/view/theme/diabook/smarty3/photo_item.tpl
new file mode 100644
index 000000000..3eeb6bcd2
--- /dev/null
+++ b/view/theme/diabook/smarty3/photo_item.tpl
@@ -0,0 +1,65 @@
+{{if $indent}}{{else}}
+

+	
+

+{{/if}}
+
+

+	

+		

+			

+				
+					{{$name}}
+				
+				menu
+				
+				
+			

+		

+			

+				{{$name}} 
+			-
+			{{if $plink}}{{$ago}}{{else}} {{$ago}} {{/if}}
+			{{if $lock}} - {{$lock}} {{/if}}
+			
+			

+		

+			{{if $title}}
{{$title}}
{{/if}}
+			{{$body}}
+		

+	

+	

+		

+		

+		

+			{{foreach $tags as $tag}}
+				{{$tag}}
+			{{/foreach}}
+		

+	

+	
+	

+		

+	   

+		

+			
+			

+
+				{{if $drop.dropping}}
+					
+					{{$drop.delete}}
+				{{/if}}
+				{{if $edpost}}
+					
+				{{/if}}
+			

+
+		

+	

+	

+			
+	

+

+
diff --git a/view/theme/diabook/smarty3/photo_view.tpl b/view/theme/diabook/smarty3/photo_view.tpl
new file mode 100644
index 000000000..f4c713afe
--- /dev/null
+++ b/view/theme/diabook/smarty3/photo_view.tpl
@@ -0,0 +1,33 @@
+

+
{{$album.1}}

+
+
+
+{{if $prevlink}}{{/if}}
+

+{{if $nextlink}}{{/if}}
+

+
{{$desc}}

+{{if $tags}}
+
{{$tags.0}}

+
{{$tags.1}}

+{{/if}}
+{{if $tags.2}}{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+

+

+

+{{$comments}}
+

+
+{{$paginate}}
+
diff --git a/view/theme/diabook/smarty3/profile_side.tpl b/view/theme/diabook/smarty3/profile_side.tpl
new file mode 100644
index 000000000..8d1ff976b
--- /dev/null
+++ b/view/theme/diabook/smarty3/profile_side.tpl
@@ -0,0 +1,21 @@
+
+
+				
diff --git a/view/theme/diabook/smarty3/profile_vcard.tpl b/view/theme/diabook/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..ee3e5a2a4
--- /dev/null
+++ b/view/theme/diabook/smarty3/profile_vcard.tpl
@@ -0,0 +1,64 @@
+

+
+	

+		
{{$profile.name}}

+		{{if $profile.edit}}
+			

+			{{$profile.edit.1}}
+			
+			

+		{{/if}}
+	

+				
+	
+
+	
{{$profile.name}}

+	{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+
+
+	{{if $location}}
+		
{{$location}}

 
+		

+			{{if $profile.address}}
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal_code}}
+			
+			{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+	
+	{{if $profile.pubkey}}{{/if}}
+
+	{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+	{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	
+

+
+{{$contact_block}}
+
+
diff --git a/view/theme/diabook/smarty3/prv_message.tpl b/view/theme/diabook/smarty3/prv_message.tpl
new file mode 100644
index 000000000..594411eb6
--- /dev/null
+++ b/view/theme/diabook/smarty3/prv_message.tpl
@@ -0,0 +1,40 @@
+
+
{{$header}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+
+{{if $showinputs}}
+
+
+{{else}}
+{{$select}}
+{{/if}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	

+		

+	
 
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/theme/diabook/smarty3/right_aside.tpl b/view/theme/diabook/smarty3/right_aside.tpl
new file mode 100644
index 000000000..8b11356e8
--- /dev/null
+++ b/view/theme/diabook/smarty3/right_aside.tpl
@@ -0,0 +1,20 @@
+
+
+				
\ No newline at end of file
diff --git a/view/theme/diabook/smarty3/search_item.tpl b/view/theme/diabook/smarty3/search_item.tpl
new file mode 100644
index 000000000..0544e5e08
--- /dev/null
+++ b/view/theme/diabook/smarty3/search_item.tpl
@@ -0,0 +1,111 @@
+{{if $item.indent}}{{else}}
+

+	
+

+{{/if}}
+

+	

+		

+			

+				
+					{{$item.name}}
+				
+				menu
+				
+				
+			

+		

+			

+				{{$item.name}} 
+			-
+			{{if $item.plink}}{{$item.ago}}{{else}} {{$item.ago}} {{/if}}
+			{{if $item.lock}} - {{$item.lock}} {{/if}}
+			
+			

+		

+			{{if $item.title}}
{{$item.title}}
{{/if}}
+			{{$item.body}}
+			{{if $item.has_cats}}
+			
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			

+			{{/if}}
+
+			{{if $item.has_folders}}
+			
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			

+			{{/if}}
+		

+	

+	

+		

+		

+		

+			{{foreach $item.tags as $tag}}
+				{{$tag}}
+			{{/foreach}}
+		

+	

+	

+		

+
+		

+		

+
+			

+			
+			
+			{{if $item.vote}}
+				
+				
+			{{/if}}
+						
+			{{if $item.vote.share}}
+				
+			{{/if}}	
+
+
+			{{if $item.star}}
+				
+				{{$item.star.do}} 
+									  
+			{{/if}}	
+			
+			{{if $item.filer}}
+			
+			{{/if}}				
+			
+			{{if $item.plink}}{{$item.plink.title}}{{/if}}
+			
+					
+					
+			

+			
+			

+
+				{{if $item.drop.pagedrop}}
+					
+				{{/if}}
+				{{if $item.drop.dropping}}
+					{{$item.drop.delete}}
+				{{/if}}
+				{{if $item.edpost}}
+					
+				{{/if}}
+			

+			
{{$item.location}} 

+		

+	

+	

+		

+		
+		
{{$item.dislike}}
	
+	

+

+
+

+	{{$item.comment}}
+

diff --git a/view/theme/diabook/smarty3/theme_settings.tpl b/view/theme/diabook/smarty3/theme_settings.tpl
new file mode 100644
index 000000000..fe4340a29
--- /dev/null
+++ b/view/theme/diabook/smarty3/theme_settings.tpl
@@ -0,0 +1,41 @@
+{{include file="field_select.tpl" field=$color}}
+
+{{include file="field_select.tpl" field=$font_size}}
+
+{{include file="field_select.tpl" field=$line_height}}
+
+{{include file="field_select.tpl" field=$resolution}}
+
+

+	
+

+

+
Show/hide boxes at right-hand column

+{{include file="field_select.tpl" field=$close_pages}}
+{{include file="field_select.tpl" field=$close_profiles}}
+{{include file="field_select.tpl" field=$close_helpers}}
+{{include file="field_select.tpl" field=$close_services}}
+{{include file="field_select.tpl" field=$close_friends}}
+{{include file="field_select.tpl" field=$close_lastusers}}
+{{include file="field_select.tpl" field=$close_lastphotos}}
+{{include file="field_select.tpl" field=$close_lastlikes}}
+{{include file="field_select.tpl" field=$close_twitter}}
+{{include file="field_input.tpl" field=$TSearchTerm}}
+{{include file="field_select.tpl" field=$close_mapquery}}
+
+{{include file="field_input.tpl" field=$ELPosX}}
+
+{{include file="field_input.tpl" field=$ELPosY}}
+
+{{include file="field_input.tpl" field=$ELZoom}}
+
+

+	
+

+
+

+
+

+Restore boxorder at right-hand column
+

+
diff --git a/view/theme/diabook/smarty3/wall_thread.tpl b/view/theme/diabook/smarty3/wall_thread.tpl
new file mode 100644
index 000000000..e72122657
--- /dev/null
+++ b/view/theme/diabook/smarty3/wall_thread.tpl
@@ -0,0 +1,141 @@
+{{if $item.comment_firstcollapsed}}
+	

+	{{$item.num_comments}} {{$item.hide_text}}
+	

+	{{/if}}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index cf4544175..6a1109118 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -8,6 +8,7 @@
  */
 
 $a = get_app();
+set_template_engine($a, 'smarty3');
 
 function get_diabook_config($key, $default = false) {
 	if (local_user()) {
@@ -385,7 +386,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$aside['$comunity_profiles_items'] = array();
 	$r = q("select gcontact.* from gcontact left join glink on glink.gcid = gcontact.id
 			  where glink.cid = 0 and glink.uid = 0 order by rand() limit 9");
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
+	$tpl = get_markup_template('ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'photo';
 		foreach($r as $rr) {
@@ -414,7 +415,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
+	$tpl = get_markup_template('ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -493,7 +494,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
+		$tpl = get_markup_template('ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@@ -655,13 +656,15 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 		set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']);
 		}
 	}
-   $close = t('Settings');
-   $aside['$close'] = $close;
-   //get_baseurl
-   $url = $a->get_baseurl($ssl_state);
-   $aside['$url'] = $url;
+	$close = t('Settings');
+	$aside['$close'] = $close;
+
+	//get_baseurl
+	$url = $a->get_baseurl($ssl_state);
+	$aside['$url'] = $url;
+
 	//print right_aside
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$tpl = get_markup_template('communityhome.tpl');
 	$a->page['right_aside'] = replace_macros($tpl, $aside);
 
  }
@@ -672,7 +675,7 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$a = get_app();
 	$baseurl = $a->get_baseurl($ssl_state);
 	$bottom['$baseurl'] = $baseurl;
-	$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+	$tpl = get_markup_template('bottom.tpl');
 	$a->page['footer'] = $a->page['footer'].replace_macros($tpl, $bottom);
  }
 
diff --git a/view/theme/diabook/wall_thread.tpl b/view/theme/diabook/wall_thread.tpl
index 95d30602d..c4c0ac35f 100644
--- a/view/theme/diabook/wall_thread.tpl
+++ b/view/theme/diabook/wall_thread.tpl
@@ -67,7 +67,9 @@
 			
 			{{ if $item.vote }}
 				
+				{{ if $item.vote.dislike }}
 				
+				{{ endif }}
 			{{ endif }}
 						
 			{{ if $item.vote.share }}
@@ -78,7 +80,10 @@
 			{{ if $item.star }}
 				
 				$item.star.do 
-									  
+			{{ endif }}
+
+			{{ if $item.tagger }}
+									  
 			{{ endif }}	
 			
 			{{ if $item.filer }}
@@ -128,8 +133,8 @@
 {{ endif }}
 
 
-{{ for $item.children as $item }}
-	{{ inc $item.template }}{{ endinc }}
+{{ for $item.children as $child_item }}
+	{{ inc $child_item.template with $item=$child_item }}{{ endinc }}
 {{ endfor }}
 
 

diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php
index 25663c10b..628d5eefa 100644
--- a/view/theme/dispy/config.php
+++ b/view/theme/dispy/config.php
@@ -65,7 +65,7 @@ function dispy_form(&$a, $font_size, $line_height, $colour) {
 		'dark' => 'dark',						
 	);
 
-	$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
+	$t = get_markup_template("theme_settings.tpl" );
 	$o .= replace_macros($t, array(
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
index f73a12765..21d27f75e 100644
--- a/view/theme/dispy/dark/theme.php
+++ b/view/theme/dispy/dark/theme.php
@@ -13,6 +13,7 @@ $a->theme_info = array(
     'family' => 'dispy',
     'name' => 'dark',
 );
+set_template_engine($a, 'smarty3');
 
 function dispy_dark_init(&$a) {
     /** @purpose set some theme defaults
diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
index 94a699b70..f8753ec1a 100644
--- a/view/theme/dispy/light/theme.php
+++ b/view/theme/dispy/light/theme.php
@@ -13,6 +13,7 @@ $a->theme_info = array(
     'family' => 'dispy',
 	'name' => 'light',
 );
+set_template_engine($a, 'smarty3');
 
 function dispy_light_init(&$a) {
 
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 6af86f51c..d0307b60d 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -139,7 +139,7 @@ $langselector
 
 
 
diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl
index cf0054a67..b7c99edd9 100644
--- a/view/theme/dispy/profile_vcard.tpl
+++ b/view/theme/dispy/profile_vcard.tpl
@@ -34,9 +34,9 @@
 			
 				$profile.locality{{ if $profile.locality }}, {{ endif }}
 				$profile.region
-				$profile.postal-code
+				$profile.postal_code
 			
-			{{ if $profile.country-name }}$profile.country-name{{ endif }}
+			{{ if $profile.country_name }}$profile.country_name{{ endif }}
 		

 		
 	{{ endif }}
diff --git a/view/theme/dispy/smarty3/bottom.tpl b/view/theme/dispy/smarty3/bottom.tpl
new file mode 100644
index 000000000..984ffd03e
--- /dev/null
+++ b/view/theme/dispy/smarty3/bottom.tpl
@@ -0,0 +1,71 @@
+
+
diff --git a/view/theme/dispy/smarty3/comment_item.tpl b/view/theme/dispy/smarty3/comment_item.tpl
new file mode 100644
index 000000000..e506ebb53
--- /dev/null
+++ b/view/theme/dispy/smarty3/comment_item.tpl
@@ -0,0 +1,70 @@
+		

+			

+				
+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
    
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+				

+				

+				
+				{{if $qcomment}}
+                

+					
+				

+				{{/if}}
+
+				

+				
+				

+			

+		

diff --git a/view/theme/dispy/smarty3/communityhome.tpl b/view/theme/dispy/smarty3/communityhome.tpl
new file mode 100644
index 000000000..abc2d0ec7
--- /dev/null
+++ b/view/theme/dispy/smarty3/communityhome.tpl
@@ -0,0 +1,35 @@
+{{if $page}}
+
{{$page}}

+{{/if}}
+
+
Help or '@NewHere'?

+
+
+
Connectable Services

+
    
+
  • Facebook
    • 
+
  • StatusNet
    • 
+
  • LiveJournal
    • 
+
  • Posterous
    • 
+
  • Tumblr
    • 
+
  • Twitter
    • 
+
  • WordPress
    • 
+
  • E-Mail
    • 
+

+
diff --git a/view/theme/dispy/smarty3/contact_template.tpl b/view/theme/dispy/smarty3/contact_template.tpl
new file mode 100644
index 000000000..a25f21086
--- /dev/null
+++ b/view/theme/dispy/smarty3/contact_template.tpl
@@ -0,0 +1,30 @@
+
+

+	

+		

+
+			{{$contact.name}}
+
+			{{if $contact.photo_menu}}
+			menu
+                

+                    
    
+                        {{$contact.photo_menu}}
+                    

+                

+			{{/if}}
+		

+			
+	

+	

+		
{{$contact.name}}

+{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}}
+	

+		Profile URL

+	
{{$contact.network}}

+
+	

+

+
diff --git a/view/theme/dispy/smarty3/conversation.tpl b/view/theme/dispy/smarty3/conversation.tpl
new file mode 100644
index 000000000..302f7172b
--- /dev/null
+++ b/view/theme/dispy/smarty3/conversation.tpl
@@ -0,0 +1,29 @@
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+

+	{{foreach $thread.items as $item}}
+		{{if $item.comment_firstcollapsed}}
+			

+			{{$thread.num_comments}} {{$thread.hide_text}}
+			

+			{{/if}}
+		
+		{{include file="file:{{$item.template}}"}}
+		
+		
+	{{/foreach}}
+

+{{/foreach}}
+
+

+
+{{if $dropping}}
+
+

+{{/if}}
diff --git a/view/theme/dispy/smarty3/group_side.tpl b/view/theme/dispy/smarty3/group_side.tpl
new file mode 100644
index 000000000..14c11febf
--- /dev/null
+++ b/view/theme/dispy/smarty3/group_side.tpl
@@ -0,0 +1,29 @@
+

+
{{$title}}

+
+
+  
+

+
+
diff --git a/view/theme/dispy/smarty3/head.tpl b/view/theme/dispy/smarty3/head.tpl
new file mode 100644
index 000000000..4f5cdef15
--- /dev/null
+++ b/view/theme/dispy/smarty3/head.tpl
@@ -0,0 +1,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/view/theme/dispy/smarty3/header.tpl b/view/theme/dispy/smarty3/header.tpl
new file mode 100644
index 000000000..e69de29bb
diff --git a/view/theme/dispy/smarty3/jot-header.tpl b/view/theme/dispy/smarty3/jot-header.tpl
new file mode 100644
index 000000000..a66332780
--- /dev/null
+++ b/view/theme/dispy/smarty3/jot-header.tpl
@@ -0,0 +1,345 @@
+
+
+
diff --git a/view/theme/dispy/smarty3/jot.tpl b/view/theme/dispy/smarty3/jot.tpl
new file mode 100644
index 000000000..b57f94cf0
--- /dev/null
+++ b/view/theme/dispy/smarty3/jot.tpl
@@ -0,0 +1,79 @@
+

+	

+		
 

+
+		
+		
+		
+		
+		
+		
+		
+		
+		

+		

+		{{if $placeholdercategory}}
+		

+		{{/if}}
+		
+
+

+ 
+
 
+	
+	
+
+	

+		

+			{{$acl}}
+			

+			
{{$emailcc}}

+			

+			{{$jotnets}}
+		

+	

+

+
+

+

+
+		{{if $content}}{{/if}}
diff --git a/view/theme/dispy/smarty3/lang_selector.tpl b/view/theme/dispy/smarty3/lang_selector.tpl
new file mode 100644
index 000000000..945cbf51e
--- /dev/null
+++ b/view/theme/dispy/smarty3/lang_selector.tpl
@@ -0,0 +1,10 @@
+

+
diff --git a/view/theme/dispy/smarty3/mail_head.tpl b/view/theme/dispy/smarty3/mail_head.tpl
new file mode 100644
index 000000000..c362eb6ed
--- /dev/null
+++ b/view/theme/dispy/smarty3/mail_head.tpl
@@ -0,0 +1,5 @@
+
{{$messages}}

+
+

+{{$tab_content}}
+

diff --git a/view/theme/dispy/smarty3/nav.tpl b/view/theme/dispy/smarty3/nav.tpl
new file mode 100644
index 000000000..401c2d30b
--- /dev/null
+++ b/view/theme/dispy/smarty3/nav.tpl
@@ -0,0 +1,145 @@
+
+
+

+{{$langselector}}
+

+
+
+
+

+    

+        
+    

+

+
+
+
diff --git a/view/theme/dispy/smarty3/photo_edit.tpl b/view/theme/dispy/smarty3/photo_edit.tpl
new file mode 100644
index 000000000..16c9577eb
--- /dev/null
+++ b/view/theme/dispy/smarty3/photo_edit.tpl
@@ -0,0 +1,53 @@
+
+

+
+	
+
+	
+	
+
+	

+
+	
+	
+
+	

+
+	
+	
+
+	

+	

+		
{{$rotate}}

+		
+	

+	

+
+	

+		{{$permissions}}
+		

+
+		

+			

+				{{$aclselect}}
+			

+		

+	

+	

+
+	
+	
+
+	

+

+
+
diff --git a/view/theme/dispy/smarty3/photo_view.tpl b/view/theme/dispy/smarty3/photo_view.tpl
new file mode 100644
index 000000000..913cbb732
--- /dev/null
+++ b/view/theme/dispy/smarty3/photo_view.tpl
@@ -0,0 +1,36 @@
+

+
{{$album.1}}

+
+
+
+{{if $prevlink}}{{/if}}
+

+{{if $nextlink}}{{/if}}
+

+
{{$desc}}

+{{if $tags}}
+
{{$tags.0}}

+
{{$tags.1}}

+{{/if}}
+{{if $tags.2}}{{/if}}
+
+{{if $edit}}{{$edit}}{{/if}}
+
+{{if $likebuttons}}
+

+	{{$likebuttons}} {{$like}} {{$dislike}}
+

+{{/if}}
+

+{{$comments}}
+

+
+{{$paginate}}
+
diff --git a/view/theme/dispy/smarty3/profile_vcard.tpl b/view/theme/dispy/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..55c78e9c5
--- /dev/null
+++ b/view/theme/dispy/smarty3/profile_vcard.tpl
@@ -0,0 +1,82 @@
+

+
+	{{if $profile.edit}}
+	

+	
+	{{$profile.edit.1}}
+	
+	

+	{{/if}}
+
+	
{{$profile.name}}

+
+	{{if $pdesc}}
+    
{{$profile.pdesc}}

+    {{/if}}
+	

+		{{$profile.name}}
+    

+
+	{{if $location}}
+		

+        {{$location}}
+		

+			{{if $profile.address}}
+            
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal_code}}
+			
+			{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
+    

+        {{$gender}}
+        {{$profile.gender}}
+    

+    {{/if}}
+	
+	{{if $profile.pubkey}}
+    
+    {{/if}}
+
+	{{if $marital}}
+    

+    
+    ♥{{$marital}}
+    {{$profile.marital}}
+    

+    {{/if}}
+
+	{{if $homepage}}
+    

+    {{$homepage}}
+    {{$profile.homepage}}
+    
{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	
+

+
+{{$contact_block}}
+
diff --git a/view/theme/dispy/smarty3/saved_searches_aside.tpl b/view/theme/dispy/smarty3/saved_searches_aside.tpl
new file mode 100644
index 000000000..5771d7925
--- /dev/null
+++ b/view/theme/dispy/smarty3/saved_searches_aside.tpl
@@ -0,0 +1,14 @@
+

+	
+	{{$searchbox}}
+	
+	
+	

+

diff --git a/view/theme/dispy/smarty3/search_item.tpl b/view/theme/dispy/smarty3/search_item.tpl
new file mode 100644
index 000000000..a78bbcf0d
--- /dev/null
+++ b/view/theme/dispy/smarty3/search_item.tpl
@@ -0,0 +1,64 @@
+

+	

+		

+			

+				
+				{{$item.name}}
+				menu
+				

+					
    
+						{{$item.item_photo_menu}}
+					

+				

+			

+			
	
+			

+				{{if $item.lock}}
{{$item.lock}}

+				{{else}}
{{/if}}	
+				
{{$item.location}}

+			

+		

+		

+				{{$item.name}}
+				
{{$item.ago}}

+				
+		
			
+		

+			
{{$item.title}}

+			

+			
{{$item.body}}

+			{{if $item.has_cats}}
+			
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			

+			{{/if}}
+
+			{{if $item.has_folders}}
+			
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}} [{{$remove}}] {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+			

+			{{/if}}
+
+		

+		

+			

+				{{if $item.drop.dropping}}{{/if}}
+			

+				{{if $item.drop.pagedrop}}{{/if}}
+			

+		

+	

+	

+
+
+	

+	{{if $item.conv}}
+			{{$item.conv.title}}
+	{{/if}}
+	

+
+

+
+

+
+
diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl
new file mode 100644
index 000000000..9fcf76b88
--- /dev/null
+++ b/view/theme/dispy/smarty3/theme_settings.tpl
@@ -0,0 +1,10 @@
+{{include file="field_select.tpl" field=$colour}}
+
+{{include file="field_select.tpl" field=$font_size}}
+
+{{include file="field_select.tpl" field=$line_height}}
+
+

+	
+

+
diff --git a/view/theme/dispy/smarty3/threaded_conversation.tpl b/view/theme/dispy/smarty3/threaded_conversation.tpl
new file mode 100644
index 000000000..367698bee
--- /dev/null
+++ b/view/theme/dispy/smarty3/threaded_conversation.tpl
@@ -0,0 +1,15 @@
+{{$live_update}}
+
+{{foreach $threads as $thread}}
+{{include file="file:{{$thread.template}}" item=$thread}}
+{{/foreach}}
+
+

+
+{{if $dropping}}
+
+

+{{/if}}
diff --git a/view/theme/dispy/smarty3/wall_thread.tpl b/view/theme/dispy/smarty3/wall_thread.tpl
new file mode 100644
index 000000000..b0de88e34
--- /dev/null
+++ b/view/theme/dispy/smarty3/wall_thread.tpl
@@ -0,0 +1,139 @@
+{{if $item.comment_firstcollapsed}}
+	

+	{{$item.num_comments}} {{$item.hide_text}}
+	

+	{{/if}}
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 2d423a928..a1de5498e 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -22,6 +22,7 @@ $a->theme_info = array(
     'family' => 'dispy',
 	'version' => '1.2.2'
 );
+set_template_engine($a, 'smarty3');
 
 function dispy_init(&$a) {
 
@@ -183,7 +184,7 @@ function dispy_community_info() {
 	$url = $a->get_baseurl($ssl_state);
 	$aside['$url'] = $url;
 
-	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	$tpl = get_markup_template('communityhome.tpl');
 	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
@@ -194,7 +195,7 @@ if(! function_exists('_js_in_foot')) {
 		$a = get_app();
 		$baseurl = $a->get_baseurl($ssl_state);
 		$bottom['$baseurl'] = $baseurl;
-		$tpl = file_get_contents(dirname(__file__) . '/bottom.tpl');
+		$tpl = get_markup_template('bottom.tpl');
 
 		return $a->page['bottom'] = replace_macros($tpl, $bottom);
 	}
diff --git a/view/theme/dispy/threaded_conversation.tpl b/view/theme/dispy/threaded_conversation.tpl
index 3afb02c6a..3deb7b947 100644
--- a/view/theme/dispy/threaded_conversation.tpl
+++ b/view/theme/dispy/threaded_conversation.tpl
@@ -1,7 +1,7 @@
 $live_update
 
-{{ for $threads as $item }}
-{{ inc $item.template }}{{ endinc }}
+{{ for $threads as $thread }}
+{{ inc $thread.template with $item=$thread }}{{ endinc }}
 {{ endfor }}
 
 

diff --git a/view/theme/dispy/wall_thread.tpl b/view/theme/dispy/wall_thread.tpl
index 3524c9568..ae70b8c82 100644
--- a/view/theme/dispy/wall_thread.tpl
+++ b/view/theme/dispy/wall_thread.tpl
@@ -131,8 +131,8 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 
 

 
-{{ for $item.children as $item }}
-	{{ inc $item.template }}{{ endinc }}
+{{ for $item.children as $child }}
+	{{ inc $child.template with $item=$child }}{{ endinc }}
 {{ endfor }}
 
 
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
index 373fb2d36..edffcebf4 100644
--- a/view/theme/duepuntozero/nav.tpl
+++ b/view/theme/duepuntozero/nav.tpl
@@ -66,5 +66,5 @@
 
 
 
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
index bcb5baeeb..e91e6125f 100644
--- a/view/theme/duepuntozero/profile_vcard.tpl
+++ b/view/theme/duepuntozero/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			
 				$profile.locality{{ if $profile.locality }}, {{ endif }}
 				$profile.region
-				$profile.postal-code
+				$profile.postal_code
 			
-			{{ if $profile.country-name }}$profile.country-name{{ endif }}
+			{{ if $profile.country_name }}$profile.country_name{{ endif }}
 		
 		
 	{{ endif }}
diff --git a/view/theme/duepuntozero/prv_message.tpl b/view/theme/duepuntozero/prv_message.tpl
index e103497e1..3f0bd937f 100644
--- a/view/theme/duepuntozero/prv_message.tpl
+++ b/view/theme/duepuntozero/prv_message.tpl
@@ -23,7 +23,7 @@ $select
 
 
 

-	
+	
 	

 		

 	
 
diff --git a/view/theme/duepuntozero/smarty3/comment_item.tpl b/view/theme/duepuntozero/smarty3/comment_item.tpl
new file mode 100644
index 000000000..67b9fb08e
--- /dev/null
+++ b/view/theme/duepuntozero/smarty3/comment_item.tpl
@@ -0,0 +1,66 @@
+		{{if $threaded}}
+		

+		{{else}}
+		

+		{{/if}}
+			

+				
+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
    
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+				
	
+				

+							
+				{{if $qcomment}}
+					
+				{{/if}}
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/theme/duepuntozero/smarty3/lang_selector.tpl b/view/theme/duepuntozero/smarty3/lang_selector.tpl
new file mode 100644
index 000000000..945cbf51e
--- /dev/null
+++ b/view/theme/duepuntozero/smarty3/lang_selector.tpl
@@ -0,0 +1,10 @@
+

+
diff --git a/view/theme/duepuntozero/smarty3/moderated_comment.tpl b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
new file mode 100644
index 000000000..8fbdf4bc4
--- /dev/null
+++ b/view/theme/duepuntozero/smarty3/moderated_comment.tpl
@@ -0,0 +1,61 @@
+		

+			

+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+				
    
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+					
    • 
+				
	
+				

+							
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/theme/duepuntozero/smarty3/nav.tpl b/view/theme/duepuntozero/smarty3/nav.tpl
new file mode 100644
index 000000000..2baebda44
--- /dev/null
+++ b/view/theme/duepuntozero/smarty3/nav.tpl
@@ -0,0 +1,70 @@
+
+
+
diff --git a/view/theme/duepuntozero/smarty3/profile_vcard.tpl b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..91630b0ec
--- /dev/null
+++ b/view/theme/duepuntozero/smarty3/profile_vcard.tpl
@@ -0,0 +1,51 @@
+

+
+	
{{$profile.name}}

+	
+				
+	
+	{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+	
{{$profile.name}}

+
+
+
+	{{if $location}}
+		
{{$location}}
 
+		

+			{{if $profile.address}}
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal_code}}
+			
+			{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+	
+	{{if $profile.pubkey}}{{/if}}
+
+	{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+	{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+
+	
	
+	
+

+
+{{$contact_block}}
+
+
diff --git a/view/theme/duepuntozero/smarty3/prv_message.tpl b/view/theme/duepuntozero/smarty3/prv_message.tpl
new file mode 100644
index 000000000..f8cbd01cc
--- /dev/null
+++ b/view/theme/duepuntozero/smarty3/prv_message.tpl
@@ -0,0 +1,39 @@
+
+
{{$header}}

+
+

+

+
+{{$parent}}
+
+
{{$to}}

+
+{{if $showinputs}}
+
+
+{{else}}
+{{$select}}
+{{/if}}
+
+
{{$subject}}

+
+
+
{{$yourmessage}}

+
+
+
+

+	
+	

+		

+	
 
+	 
+	

+		
+	
 
+

+

+

+

diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 5b87dcd42..bf5a4111f 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,5 +1,6 @@
 theme_info = array();
+set_template_engine($a, 'smarty3');
 
 function duepuntozero_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
diff --git a/view/theme/facepark/nav.tpl b/view/theme/facepark/nav.tpl
index 8969accb7..04c4931fc 100644
--- a/view/theme/facepark/nav.tpl
+++ b/view/theme/facepark/nav.tpl
@@ -64,5 +64,5 @@
 
 
 
diff --git a/view/theme/facepark/profile_vcard.tpl b/view/theme/facepark/profile_vcard.tpl
index 154f22363..07d2df5df 100644
--- a/view/theme/facepark/profile_vcard.tpl
+++ b/view/theme/facepark/profile_vcard.tpl
@@ -16,9 +16,9 @@
 			
 				$profile.locality{{ if $profile.locality }}, {{ endif }}
 				$profile.region
-				$profile.postal-code
+				$profile.postal_code
 			
-			{{ if $profile.country-name }}$profile.country-name{{ endif }}
+			{{ if $profile.country_name }}$profile.country_name{{ endif }}
 		
 		
 	{{ endif }}
diff --git a/view/theme/facepark/smarty3/comment_item.tpl b/view/theme/facepark/smarty3/comment_item.tpl
new file mode 100644
index 000000000..4118355fc
--- /dev/null
+++ b/view/theme/facepark/smarty3/comment_item.tpl
@@ -0,0 +1,33 @@
+		

+			

+				
+				
+				
+				
+				
+				
+				
+
+				

+					{{$mytitle}}
+				

+				

+				
+				{{if $qcomment}}
+				{{foreach $qcomment as $qc}}				
+					{{$qc}}
+					 
+				{{/foreach}}
+				{{/if}}
+
+				

+				
+
+				

+			

+
+		

diff --git a/view/theme/facepark/smarty3/group_side.tpl b/view/theme/facepark/smarty3/group_side.tpl
new file mode 100644
index 000000000..d2d8a77e2
--- /dev/null
+++ b/view/theme/facepark/smarty3/group_side.tpl
@@ -0,0 +1,28 @@
+

+
{{$title}}

+
+
+  
+

+
+
diff --git a/view/theme/facepark/smarty3/jot.tpl b/view/theme/facepark/smarty3/jot.tpl
new file mode 100644
index 000000000..56b1b6540
--- /dev/null
+++ b/view/theme/facepark/smarty3/jot.tpl
@@ -0,0 +1,85 @@
+
+

+	

+		
 

+		

+	

+	

+
+	

+		
+		
+		
+		
+		
+		
+		
+		
+		

+		

+		
+		
+		

+
+

+	
+
+	

+		

+	
 
+	

+		

+	
 
+
+	 
+	

+		
+	
 
+	

+		
+	
 
+	

+		
+	
 
+	 
+
+	

+		{{$bang}}
+	

+
+	{{$preview}}
+
+	

+
+
+	

+  	{{$jotplugins}}
+	

+
+	

+		
+	
 
+	
+	
+
+	

+		

+			{{$acl}}
+			

+			
{{$emailcc}}

+			

+			{{$jotnets}}
+		

+	

+
+
+

+
+

+

+

+		{{if $content}}{{/if}}
diff --git a/view/theme/facepark/smarty3/nav.tpl b/view/theme/facepark/smarty3/nav.tpl
new file mode 100644
index 000000000..7f7bb6290
--- /dev/null
+++ b/view/theme/facepark/smarty3/nav.tpl
@@ -0,0 +1,68 @@
+
+
+
diff --git a/view/theme/facepark/smarty3/profile_vcard.tpl b/view/theme/facepark/smarty3/profile_vcard.tpl
new file mode 100644
index 000000000..f7622bbb3
--- /dev/null
+++ b/view/theme/facepark/smarty3/profile_vcard.tpl
@@ -0,0 +1,47 @@
+

+
+	
{{$profile.name}}

+	
+				
+	
+	{{if $pdesc}}
{{$profile.pdesc}}
{{/if}}
+	
{{$profile.name}}

+
+
+
+	{{if $location}}
+		
{{$location}}
 
+		

+			{{if $profile.address}}
{{$profile.address}}
{{/if}}
+			
+				{{$profile.locality}}{{if $profile.locality}}, {{/if}}
+				{{$profile.region}}
+				{{$profile.postal_code}}
+			
+			{{if $profile.country_name}}{{$profile.country_name}}{{/if}}
+		

+		

+	{{/if}}
+
+	{{if $gender}}
{{$gender}}
 
{{$profile.gender}}
{{/if}}
+	
+	{{if $profile.pubkey}}{{/if}}
+
+	{{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}}
+
+	{{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}}
+
+	{{include file="diaspora_vcard.tpl"}}
+	
+	
+

+
+{{$contact_block}}
+
+
diff --git a/view/theme/facepark/smarty3/search_item.tpl b/view/theme/facepark/smarty3/search_item.tpl
new file mode 100644
index 000000000..ac650f465
--- /dev/null
+++ b/view/theme/facepark/smarty3/search_item.tpl
@@ -0,0 +1,54 @@
+

+	

+		

+			

+				
+				{{$item.name}}
+				menu
+				

+					
    
+						{{$item.item_photo_menu}}
+					

+				

+			

+			
	
+			

+				{{if $item.lock}}
{{$item.lock}}

+				{{else}}
{{/if}}	
+				
{{$item.location}}

+			

+		

+		

+				{{$item.name}}
+				
{{$item.ago}}

+				
+		
			
+		

+			
{{$item.title}}

+			

+			
{{$item.body}}

+		

+		

+			

+				{{if $item.drop.dropping}}{{/if}}
+			

+				{{if $item.drop.pagedrop}}{{/if}}
+			

+		

+	

+	

+
+
+	

+	{{if $item.conv}}
+			{{$item.conv.title}}
+	{{/if}}
+	

+
+

+
+

+
+
diff --git a/view/theme/facepark/theme.php b/view/theme/facepark/theme.php
index 701fb1349..ec1ab1c67 100644
--- a/view/theme/facepark/theme.php
+++ b/view/theme/facepark/theme.php
@@ -1,5 +1,6 @@
 theme_info = array();
+set_template_engine($a, 'smarty3');
 
 $a->page['htmlhead'] .= <<< EOT
 
+

+	
$title - $page

+	
+	

+        
+		
+		
$h_pending

+		{{ if $pending }}
+			
+				
+				
+					{{ for $th_pending as $th }}{{ endfor }}
+					
+					
+				
+				
+				
+			{{ for $pending as $u }}
+				
+					
+					
+					
+					
+					
+				
+			{{ endfor }}
+				
+			
$th
$u.created$u.name
+						
+						
+					

+			
$select_all

+			
 
			
+		{{ else }}
+			
$no_pending

+		{{ endif }}
+	
+	
+		
+	
+		
$h_users

+		{{ if $users }}
+			
+				
+				
+					
+					{{ for $th_users as $th }}{{ endfor }}
+					
+					
+				
+				
+				
+				{{ for $users as $u }}
+					
+						
+						
+						
+						
+						
+						
+						
+						
+                                    {{ endif }}
+						
+					
+				{{ endfor }}
+				
+			
$th
$u.nickname$u.name$u.register_date$u.lastitem_date 
+                                    {{ if $u.is_admin }}
+                                         
+                                    {{ else }}
+                                        
+                                    {{ if $u.is_admin }}
+                                         
+                                    {{ else }}
+                                        
+                                        
+                                    {{ endif }}
+						

+			
$select_all

+			
 
						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	

+

diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl
index 76254c1ca..c7e3ca899 100644
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ b/view/theme/frost-mobile/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 

-{{ for $contacts as $contact }}
-	{{ inc contact_template.tpl }}{{ endinc }}
+{{ for $contacts as $c }}
+	{{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 

 

diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
index 0d72aebbd..7a8a0494d 100644
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -5,7 +5,7 @@
   
   
 
-
+module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
 	
 
 	module === 'home' ) { ?>
diff --git a/view/theme/frost-mobile/friendika-16.png b/view/theme/frost-mobile/friendica-16.png
similarity index 100%
rename from view/theme/frost-mobile/friendika-16.png
rename to view/theme/frost-mobile/friendica-16.png
diff --git a/view/theme/frost-mobile/jot.tpl b/view/theme/frost-mobile/jot.tpl
index d8dd44990..d28cf57e4 100644
--- a/view/theme/frost-mobile/jot.tpl
+++ b/view/theme/frost-mobile/jot.tpl
@@ -28,6 +28,10 @@
 

 	
 
+	

+		
+	
 
+	
 	

 		

 	
 
@@ -64,10 +68,6 @@
   	$jotplugins
 	

 
-	

-		
-	
 
-	
 	
 
 	

@@ -75,8 +75,8 @@
 			$acl
 			

 			
$emailcc

-			

 			$jotnets
+			

 		

 	

 
diff --git a/view/theme/frost-mobile/js/acl.js b/view/theme/frost-mobile/js/acl.js
index 65b2d3829..20f0d4618 100644
--- a/view/theme/frost-mobile/js/acl.js
+++ b/view/theme/frost-mobile/js/acl.js
@@ -253,6 +253,11 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
+	$(".acl-list-item img[data-src]").each(function(i, el){
+		// Replace data-src attribute with src attribute for every image
+		$(el).attr('src', $(el).data("src"));
+		$(el).removeAttr("data-src");
+	});
 	that.update_view();
 }
 
diff --git a/view/theme/frost-mobile/js/main.js b/view/theme/frost-mobile/js/main.js
index a56c31312..197d49664 100644
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@@ -1,20 +1,33 @@
 
-  function openClose(theID) {
-    if(document.getElementById(theID).style.display == "block") { 
-      document.getElementById(theID).style.display = "none" 
-    }
-    else { 
-      document.getElementById(theID).style.display = "block" 
-    } 
-  }
+	function openClose(listID) {
+/*		if(document.getElementById(theID).style.display == "block") { 
+			document.getElementById(theID).style.display = "none" 
+		}
+		else { 
+			document.getElementById(theID).style.display = "block" 
+		}*/
+		listID = "#" + listID.replace(/:/g, "\\:");
+		listID = listID.replace(/\./g, "\\.");
+		listID = listID.replace(/@/g, "\\@");
 
-  function openMenu(theID) {
-      document.getElementById(theID).style.display = "block" 
-  }
+		if($j(listID).is(":visible")) {
+			$j(listID).hide();
+			$j(listID+"-wrapper").show();
+			alert($j(listID+"-wrapper").attr("id"));
+		}
+		else {
+			$j(listID).show();
+			$j(listID+"-wrapper").hide();
+		}
+	}
 
-  function closeMenu(theID) {
-      document.getElementById(theID).style.display = "none" 
-  }
+	function openMenu(theID) {
+		document.getElementById(theID).style.display = "block" 
+	}
+
+	function closeMenu(theID) {
+		document.getElementById(theID).style.display = "none" 
+	}
 
 
 
@@ -174,6 +187,12 @@
 					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
 					nnm.append(html);
 				});
+
+				$("img[data-src]", nnm).each(function(i, el){
+					// Replace data-src attribute with src attribute for every image
+					$(el).attr('src', $(el).data("src"));
+					$(el).removeAttr("data-src");
+				});
 			}
 			notif = eNotif.attr('count');
 			if (notif>0){
diff --git a/view/theme/frost-mobile/js/main.min.js b/view/theme/frost-mobile/js/main.min.js
index eb91cd947..807c5327f 100644
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
@@ -1 +1 @@
-function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&(src="display",liveUpdate()),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");if($j("#"+e).length==0&&profile_page==1)$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this));else{var t=$j(".hide-comments-total",this).attr("id");if(typeof t!="undefined"){t=t.split("-")[3];var n=$j("#collapsed-comments-"+t).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("html").height($j("html").height()),$j("#"+e).replaceWith($j(this)),typeof t!="undefined"&&n&&showHideComments(t),$j("html").height("auto")}prev=e}),collapseHeight(),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(e){var t=".wall-item-body:not(.divmore)";typeof e!="undefined"&&(t=e+" "+t),$j(t).each(function(){$j(this).height()>350&&($j("html").height($j("html").height()),$j(this).divgrow({initialHeight:300,showBrackets:!1,speed:0}),$j(this).addClass("divmore"),$j("html").height("auto"))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY)t.x=e.touches[0].pageX,t.y=e.touches[0].pageY;else if(e.touches[0].clientX||e.touches[0].clientY)t.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.touches[0].x||e.touches[0].y)t.touches[0].x=e.touches[0].x,t.touches[0].y=e.touches[0].y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer),collapseHeight("#collapsed-comments-"+e))}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+"
")})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,collapseHeight(),$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),$j("img[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:(menu.css("display")=="none"?($j(this).parent().addClass("selected"),menu.show(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").hide(),last_popup_menu=menu,last_popup_button=$j(this).parent()):($j(this).parent().removeClass("selected"),menu.hide(),menu.attr("id")=="nav-notifications-menu"&&$j(".main-container").show(),last_popup_menu=null,last_popup_button=null),!1)}),$j("html").click(function(t){e(t)});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:1e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate()});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();if(last_popup_menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("img[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;if(menu.css("display")=="none"){$j(this).parent().addClass("selected");menu.show();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").hide();last_popup_menu=menu;last_popup_button=$j(this).parent()}else{$j(this).parent().removeClass("selected");menu.hide();if(menu.attr("id")=="nav-notifications-menu")$j(".main-container").show();last_popup_menu=null;last_popup_button=null}return false});$j("html").click(function(e){close_last_popup_menu(e)});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format(""+e.attr("name")+"");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:1e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate()});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});collapseHeight();$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl")})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>350){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:300,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.touches[0].pageX||e.touches[0].pageY){cursor.x=e.touches[0].pageX;cursor.y=e.touches[0].pageY}else{if(e.touches[0].clientX||e.touches[0].clientY){cursor.x=e.touches[0].clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.touches[0].clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.touches[0].x||e.touches[0].y){cursor.touches[0].x=e.touches[0].x;cursor.touches[0].y=e.touches[0].y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i'+data.desc+'
'+data.version+'
'+data.credits+"
")})}
\ No newline at end of file
diff --git a/view/theme/frost-mobile/js/theme.js b/view/theme/frost-mobile/js/theme.js
index 335a69536..14e4915cd 100644
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@@ -235,6 +235,13 @@ $j(function(){
 
 
 
+function homeRedirect() {
+	$j('html').fadeOut('slow', function(){
+		window.location = baseurl + "/login";
+	});
+}
+
+
 function insertFormatting(comment,BBcode,id) {
 	
 	var tmpStr = $j("#comment-edit-text-" + id).val();
diff --git a/view/theme/frost-mobile/js/theme.min.js b/view/theme/frost-mobile/js/theme.min.js
index f5ac3c5a9..44b842c63 100644
--- a/view/theme/frost-mobile/js/theme.min.js
+++ b/view/theme/frost-mobile/js/theme.min.js
@@ -1 +1 @@
-function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"=http://]"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"=http://]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j(".comment-edit-bb-"+e).show()}function cmtBbClose(e){$j(".comment-edit-bb-"+e).hide()}function initEditor(e){if(editor==0){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var e=$j("#profile-jot-acl-wrapper").parent();return e.css("display")=="none"?e.show():e.hide(),!1}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}}else typeof e!="undefined"&&e()}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function showEvent(e){}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){$j.get("filer/",function(t){var n=$j("#id_term_label",t).text();reply=prompt(n),reply&&reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1)})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}}$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var e=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),t=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var e=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("{1}
{2}
{3}
".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("{1}
{2}
{3}
".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var n=location.href.replace(baseurl,"").split("/");n.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",n[2],n[3]-1);var r=location.hash.split("-");r.length==2&&r[0]=="#link"&&showEvent(r[1])}(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var i=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var i=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});i.setOptions({params:{type:"a"}});break;default:}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),$j(".popupbox").click(function(){var e=$j($j(this).attr("href")).parent();return e.css("display")=="none"?e.show():e.hide(),!1})}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})});var editor=!1,textlen=0,plaintext="none",ispublic=window.isPublic;switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname+"?nomce=1",name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");$j(".popupbox").click(function(){var parent=$j($j(this).attr("href")).parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false})});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j(".comment-edit-bb-"+id).show()}function cmtBbClose(id){$j(".comment-edit-bb-"+id).hide()}var editor=false;var textlen=0;var plaintext="none";var ispublic=window.isPublic;function initEditor(cb){if(editor==false){if(plaintext=="none"){$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon, a#settings-default-perms-menu").click(function(){var parent=$j("#profile-jot-acl-wrapper").parent();if(parent.css("display")=="none"){parent.show()}else{parent.hide()}return false});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}}else{if(typeof cb!="undefined")cb()}}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){$j.get("filer/",function(data){var promptText=$j("#id_term_label",data).text();reply=prompt(promptText);if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1}})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
diff --git a/view/theme/frost-mobile/login-style.css b/view/theme/frost-mobile/login-style.css
index 4ebf7d740..bbb60ebab 100644
--- a/view/theme/frost-mobile/login-style.css
+++ b/view/theme/frost-mobile/login-style.css
@@ -36,6 +36,9 @@ div.jGrowl div.info {
 	top: 15px;
 	right: 10px;
 }
+div.jGrowl-notification {
+  border-radius: 7px;
+}
 
 .login-button {
 	margin-top: 90px;
@@ -89,6 +92,7 @@ div.section-wrapper {
 
 #div_id_remember {
 	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
 #login_openid {
diff --git a/view/theme/frost-mobile/login.tpl b/view/theme/frost-mobile/login.tpl
index 6946cc031..05ae364c0 100644
--- a/view/theme/frost-mobile/login.tpl
+++ b/view/theme/frost-mobile/login.tpl
@@ -21,12 +21,12 @@
 	
-->
 
 	

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

 		
 	

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


 	
 	

 	

-		
+		
 	
	
 	
 	
diff --git a/view/theme/frost/friendika-16.png b/view/theme/frost/friendica-16.png
similarity index 100%
rename from view/theme/frost/friendika-16.png
rename to view/theme/frost/friendica-16.png
diff --git a/view/theme/frost/jot.tpl b/view/theme/frost/jot.tpl
index 48187b443..ae3ab1d3b 100644
--- a/view/theme/frost/jot.tpl
+++ b/view/theme/frost/jot.tpl
@@ -27,6 +27,10 @@
 

 	
 
+	

+		
+	
 
+	
 	

 		

 	
 
@@ -65,10 +69,6 @@
 
 
 
-	

-		
-	
 
-	
 	
 
 	

diff --git a/view/theme/frost/js/acl.js b/view/theme/frost/js/acl.js
index 9675588af..6b443b248 100644
--- a/view/theme/frost/js/acl.js
+++ b/view/theme/frost/js/acl.js
@@ -253,6 +253,11 @@ ACL.prototype.populate = function(data){
 		//console.log(html);
 		that.list_content.append(html);
 	});
+	$(".acl-list-item img[data-src]").each(function(i, el){
+		// Replace data-src attribute with src attribute for every image
+		$(el).attr('src', $(el).data("src"));
+		$(el).removeAttr("data-src");
+	});
 	that.update_view();
 }
 
diff --git a/view/theme/frost/js/main.js b/view/theme/frost/js/main.js
index 03ffd0381..91e79ffc3 100644
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@@ -1,20 +1,32 @@
 
-  function openClose(theID) {
-    if(document.getElementById(theID).style.display == "block") { 
-      document.getElementById(theID).style.display = "none" 
-    }
-    else { 
-      document.getElementById(theID).style.display = "block" 
-    } 
-  }
+	function openClose(listID) {
+/*		if(document.getElementById(theID).style.display == "block") { 
+			document.getElementById(theID).style.display = "none" 
+		}
+		else { 
+			document.getElementById(theID).style.display = "block" 
+		}*/
+		listID = "#" + listID.replace(/:/g, "\\:");
+		listID = listID.replace(/\./g, "\\.");
+		listID = listID.replace(/@/g, "\\@");
 
-  function openMenu(theID) {
-      document.getElementById(theID).style.display = "block" 
-  }
+		if($j(listID).is(":visible")) {
+			$j(listID).hide();
+			$j(listID+"-wrapper").show();
+		}
+		else {
+			$j(listID).show();
+			$j(listID+"-wrapper").hide();
+		}
+	}
 
-  function closeMenu(theID) {
-      document.getElementById(theID).style.display = "none" 
-  }
+	function openMenu(theID) {
+		document.getElementById(theID).style.display = "block" 
+	}
+
+	function closeMenu(theID) {
+		document.getElementById(theID).style.display = "none" 
+	}
 
 
 
@@ -167,6 +179,12 @@
 					html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
 					nnm.append(html);
 				});
+
+				$("img[data-src]", nnm).each(function(i, el){
+					// Replace data-src attribute with src attribute for every image
+					$(el).attr('src', $(el).data("src"));
+					$(el).removeAttr("data-src");
+				});
 			}
 			notif = eNotif.attr('count');
 			if (notif>0){
diff --git a/view/theme/frost/js/main.min.js b/view/theme/frost/js/main.min.js
index 3d7ee0623..f021b7bef 100644
--- a/view/theme/frost/js/main.min.js
+++ b/view/theme/frost/js/main.min.js
@@ -1 +1 @@
-function openClose(e){document.getElementById(e).style.display=="block"?document.getElementById(e).style.display="none":document.getElementById(e).style.display="block"}function openMenu(e){document.getElementById(e).style.display="block"}function closeMenu(e){document.getElementById(e).style.display="none"}function NavUpdate(){if(!stopped){var e="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(e,function(e){$j(e).find("result").each(function(){$j("nav").trigger("nav-update",this),$j("#live-network").length&&(src="network",liveUpdate()),$j("#live-profile").length&&(src="profile",liveUpdate()),$j("#live-community").length&&(src="community",liveUpdate()),$j("#live-notes").length&&(src="notes",liveUpdate()),$j("#live-display").length&&(src="display",liveUpdate()),$j("#live-photos").length&&liking&&(liking=0,window.location.href=window.location.href)})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){livetime&&clearTimeout(livetime),livetime=setTimeout(liveUpdate,1e4);return}livetime!=null&&(livetime=null),prev="live-"+src,in_progress=!0;var e=netargs.length?"/"+netargs:"",t="update_"+src+e+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(t,function(e){in_progress=!1,$j(".toplevel_item",e).each(function(){var e=$j(this).attr("id");if($j("#"+e).length==0&&profile_page==1)$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("#"+prev).after($j(this));else{var t=$j(".hide-comments-total",this).attr("id");if(typeof t!="undefined"){t=t.split("-")[3];var n=$j("#collapsed-comments-"+t).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))}),$j("html").height($j("html").height()),$j("#"+e).replaceWith($j(this)),typeof t!="undefined"&&n&&showHideComments(t),$j("html").height("auto")}prev=e}),$j(".like-rotator").hide(),commentBusy&&(commentBusy=!1,$j("body").css("cursor","auto")),$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl"),collapseHeight()})}function collapseHeight(e){var t=".wall-item-body:not(.divmore)";typeof e!="undefined"&&(t=e+" "+t),$j(t).each(function(){$j(this).height()>450&&($j("html").height($j("html").height()),$j(this).divgrow({initialHeight:400,showBrackets:!1,speed:0}),$j(this).addClass("divmore"),$j("html").height("auto"))})}function imgbright(e){$j(e).removeClass("drophide").addClass("drop")}function imgdull(e){$j(e).removeClass("drop").addClass("drophide")}function dolike(e,t){unpause(),$j("#like-rotator-"+e.toString()).show(),$j.get("like/"+e.toString()+"?verb="+t,NavUpdate),liking=1}function dostar(e){e=e.toString(),$j.get("starred/"+e,function(t){t.match(/1/)?($j("#starred-"+e).addClass("starred"),$j("#starred-"+e).removeClass("unstarred"),$j("#star-"+e).addClass("hidden"),$j("#unstar-"+e).removeClass("hidden")):($j("#starred-"+e).addClass("unstarred"),$j("#starred-"+e).removeClass("starred"),$j("#star-"+e).removeClass("hidden"),$j("#unstar-"+e).addClass("hidden"))})}function getPosition(e){var t={x:0,y:0};if(e.pageX||e.pageY)t.x=e.pageX,t.y=e.pageY;else if(e.clientX||e.clientY)t.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft,t.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop;else if(e.x||e.y)t.x=e.x,t.y=e.y;return t}function lockview(e,t){e=e||window.event,cursor=getPosition(e),lockvisible?lockviewhide():(lockvisible=!0,$j.get("lockview/"+t,function(e){$j("#panel").html(e),$j("#panel").css({left:cursor.x+5,top:cursor.y+5}),$j("#panel").show()}))}function lockviewhide(){lockvisible=!1,$j("#panel").hide()}function post_comment(e){return unpause(),commentBusy=!0,$j("body").css("cursor","wait"),$j("#comment-preview-inp-"+e).val("0"),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){if(t.success){$j("#comment-edit-wrapper-"+e).hide(),$j("#comment-edit-text-"+e).val("");var n=document.getElementById("comment-edit-text-"+e);n&&commentClose(n,e),timer&&clearTimeout(timer),timer=setTimeout(NavUpdate,10)}t.reload&&(window.location.href=t.reload)},"json"),!1}function preview_comment(e){return $j("#comment-preview-inp-"+e).val("1"),$j("#comment-edit-preview-"+e).show(),$j.post("item",$j("#comment-edit-form-"+e).serialize(),function(t){t.preview&&($j("#comment-edit-preview-"+e).html(t.preview),$j("#comment-edit-preview-"+e+" a").click(function(){return!1}))},"json"),!0}function showHideComments(e){$j("#collapsed-comments-"+e).is(":visible")?($j("#collapsed-comments-"+e).hide(),$j("#hide-comments-"+e).html(window.showMore)):($j("#collapsed-comments-"+e).show(),$j("#hide-comments-"+e).html(window.showFewer),collapseHeight("#collapsed-comments-"+e))}function preview_post(){return $j("#jot-preview").val("1"),$j("#jot-preview-content").show(),tinyMCE.triggerSave(),$j.post("item",$j("#profile-jot-form").serialize(),function(e){e.preview&&($j("#jot-preview-content").html(e.preview),$j("#jot-preview-content a").click(function(){return!1}))},"json"),$j("#jot-preview").val("0"),!0}function unpause(){totStopped=!1,stopped=!1,$j("#pause").html("")}function bin2hex(e){var t,n,r=0,i=[];e+="",r=e.length;for(n=0;n'+e.desc+'
'+e.version+'
'+e.credits+'
'+theme+'')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$j(function(){function e(e){last_popup_menu&&"#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$j.ajaxSetup({cache:!1}),msie=$j.browser.msie,collapseHeight(),$j(".onoff input").each(function(){val=$j(this).val(),id=$j(this).attr("id"),$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$j(".onoff > a").click(function(e){e.preventDefault();var t=$j(this).siblings("input"),n=1-t.val(),r=t.attr("id");$j("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$j("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$j("a[rel^=#]").click(function(t){return e(t),menu=$j($j(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($j(this).parent().toggleClass("selected"),menu.slideToggle("fast"),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$j(this).parent()),!1)}),$j("html").click(function(t){e(t)}),$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var t=unescape($j("#nav-notifications-template[rel=template]").html()),n=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html()),r=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html()),i=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,s){var o=$j(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$j(s).find("net").text();u==0?(u="",$j("#net-update").removeClass("show")):$j("#net-update").addClass("show"),$j("#net-update").html(u);var a=$j(s).find("home").text();a==0?(a="",$j("#home-update").removeClass("show")):$j("#home-update").addClass("show"),$j("#home-update").html(a);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update").removeClass("show")):$j("#intro-update").addClass("show"),$j("#intro-update").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update").removeClass("show")):$j("#mail-update").addClass("show"),$j("#mail-update").html(l);var f=$j(s).find("intro").text();f==0?(f="",$j("#intro-update-li").removeClass("show")):$j("#intro-update-li").addClass("show"),$j("#intro-update-li").html(f);var l=$j(s).find("mail").text();l==0?(l="",$j("#mail-update-li").removeClass("show")):$j("#mail-update-li").addClass("show"),$j("#mail-update-li").html(l);var c=$j(s).find("notif");c.children("note").length==0?$j("#nav-notifications-menu").html(i):(nnm=$j("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$j(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$j("#nav-notifications-linkmenu").addClass("on"):$j("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$j("#notify-update").removeClass("show")):$j("#notify-update").addClass("show"),$j("#notify-update").html(notif);var h=$j(s).find("sysmsgs");h.children("notice").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"notice",life:3e3})}),h.children("info").each(function(){text=$j(this).text(),$j.jGrowl(text,{sticky:!1,theme:"info",life:1e3})})}),NavUpdate(),$j(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$j("#pause").html('pause')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t a").click(function(event){event.preventDefault();var input=$j(this).siblings("input");var val=1-input.val();var id=input.attr("id");$j("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden");$j("#"+id+"_onoff ."+(val==1?"on":"off")).removeClass("hidden");input.val(val)});setupFieldRichtext();function close_last_popup_menu(e){if(last_popup_menu){if("#"+last_popup_menu.attr("id")!==$j(e.target).attr("rel")){last_popup_menu.hide();last_popup_button.removeClass("selected");last_popup_menu=null;last_popup_button=null}}}$j("a[rel^=#]").click(function(e){close_last_popup_menu(e);menu=$j($j(this).attr("rel"));e.preventDefault();e.stopPropagation();if(menu.attr("popup")=="false")return false;$j(this).parent().toggleClass("selected");menu.slideToggle("fast");if(menu.css("display")=="none"){last_popup_menu=null;last_popup_button=null}else{last_popup_menu=menu;last_popup_button=$j(this).parent()}return false});$j("html").click(function(e){close_last_popup_menu(e)});$j("a.popupbox").fancybox({transitionIn:"none",transitionOut:"none"});var notifications_tpl=unescape($j("#nav-notifications-template[rel=template]").html());var notifications_all=unescape($j("
").append($j("#nav-notifications-see-all").clone()).html());var notifications_mark=unescape($j("
").append($j("#nav-notifications-mark-all").clone()).html());var notifications_empty=unescape($j("#nav-notifications-menu").html());$j("nav").bind("nav-update",function(e,data){var invalid=$j(data).find("invalid").text();if(invalid==1){window.location.href=window.location.href}var net=$j(data).find("net").text();if(net==0){net="";$j("#net-update").removeClass("show")}else{$j("#net-update").addClass("show")}$j("#net-update").html(net);var home=$j(data).find("home").text();if(home==0){home="";$j("#home-update").removeClass("show")}else{$j("#home-update").addClass("show")}$j("#home-update").html(home);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update").removeClass("show")}else{$j("#intro-update").addClass("show")}$j("#intro-update").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update").removeClass("show")}else{$j("#mail-update").addClass("show")}$j("#mail-update").html(mail);var intro=$j(data).find("intro").text();if(intro==0){intro="";$j("#intro-update-li").removeClass("show")}else{$j("#intro-update-li").addClass("show")}$j("#intro-update-li").html(intro);var mail=$j(data).find("mail").text();if(mail==0){mail="";$j("#mail-update-li").removeClass("show")}else{$j("#mail-update-li").addClass("show")}$j("#mail-update-li").html(mail);var eNotif=$j(data).find("notif");if(eNotif.children("note").length==0){$j("#nav-notifications-menu").html(notifications_empty)}else{nnm=$j("#nav-notifications-menu");nnm.html(notifications_all+notifications_mark);eNotif.children("note").each(function(){e=$j(this);text=e.text().format(""+e.attr("name")+"");html=notifications_tpl.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen"));nnm.append(html)})}notif=eNotif.attr("count");if(notif>0){$j("#nav-notifications-linkmenu").addClass("on")}else{$j("#nav-notifications-linkmenu").removeClass("on")}if(notif==0){notif="";$j("#notify-update").removeClass("show")}else{$j("#notify-update").addClass("show")}$j("#notify-update").html(notif);var eSysmsg=$j(data).find("sysmsgs");eSysmsg.children("notice").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"notice",life:3e3})});eSysmsg.children("info").each(function(){text=$j(this).text();$j.jGrowl(text,{sticky:false,theme:"info",life:1e3})})});NavUpdate();$j(document).keydown(function(event){if(event.keyCode=="8"){var target=event.target||event.srcElement;if(!/input|textarea/i.test(target.nodeName)){return false}}if(event.keyCode=="19"||event.ctrlKey&&event.which=="32"){event.preventDefault();if(stopped==false){stopped=true;if(event.ctrlKey){totStopped=true}$j("#pause").html('pause')}else{unpause()}}else{if(!totStopped){unpause()}}})});function NavUpdate(){if(!stopped){var pingCmd="ping"+(localUser!=0?"?f=&uid="+localUser:"");$j.get(pingCmd,function(data){$j(data).find("result").each(function(){$j("nav").trigger("nav-update",this);if($j("#live-network").length){src="network";liveUpdate()}if($j("#live-profile").length){src="profile";liveUpdate()}if($j("#live-community").length){src="community";liveUpdate()}if($j("#live-notes").length){src="notes";liveUpdate()}if($j("#live-display").length){src="display";liveUpdate()}if($j("#live-photos").length){if(liking){liking=0;window.location.href=window.location.href}}})})}timer=setTimeout(NavUpdate,updateInterval)}function liveUpdate(){if(src==null||stopped||!profile_uid){$j(".like-rotator").hide();return}if($j(".comment-edit-text-full").length||in_progress){if(livetime){clearTimeout(livetime)}livetime=setTimeout(liveUpdate,1e4);return}if(livetime!=null)livetime=null;prev="live-"+src;in_progress=true;var udargs=netargs.length?"/"+netargs:"";var update_url="update_"+src+udargs+"&p="+profile_uid+"&page="+profile_page+"&msie="+(msie?1:0);$j.get(update_url,function(data){in_progress=false;$j(".toplevel_item",data).each(function(){var ident=$j(this).attr("id");if($j("#"+ident).length==0&&profile_page==1){$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("#"+prev).after($j(this))}else{var id=$j(".hide-comments-total",this).attr("id");if(typeof id!="undefined"){id=id.split("-")[3];var commentsOpen=$j("#collapsed-comments-"+id).is(":visible")}$j("img",this).each(function(){$j(this).attr("src",$j(this).attr("dst"))});$j("html").height($j("html").height());$j("#"+ident).replaceWith($j(this));if(typeof id!="undefined"){if(commentsOpen)showHideComments(id)}$j("html").height("auto")}prev=ident});$j(".like-rotator").hide();if(commentBusy){commentBusy=false;$j("body").css("cursor","auto")}$j(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl");collapseHeight()})}function collapseHeight(elems){var elemName=".wall-item-body:not(.divmore)";if(typeof elems!="undefined"){elemName=elems+" "+elemName}$j(elemName).each(function(){if($j(this).height()>450){$j("html").height($j("html").height());$j(this).divgrow({initialHeight:400,showBrackets:false,speed:0});$j(this).addClass("divmore");$j("html").height("auto")}})}function imgbright(node){$j(node).removeClass("drophide").addClass("drop")}function imgdull(node){$j(node).removeClass("drop").addClass("drophide")}function dolike(ident,verb){unpause();$j("#like-rotator-"+ident.toString()).show();$j.get("like/"+ident.toString()+"?verb="+verb,NavUpdate);liking=1}function dostar(ident){ident=ident.toString();$j.get("starred/"+ident,function(data){if(data.match(/1/)){$j("#starred-"+ident).addClass("starred");$j("#starred-"+ident).removeClass("unstarred");$j("#star-"+ident).addClass("hidden");$j("#unstar-"+ident).removeClass("hidden")}else{$j("#starred-"+ident).addClass("unstarred");$j("#starred-"+ident).removeClass("starred");$j("#star-"+ident).removeClass("hidden");$j("#unstar-"+ident).addClass("hidden")}})}function getPosition(e){var cursor={x:0,y:0};if(e.pageX||e.pageY){cursor.x=e.pageX;cursor.y=e.pageY}else{if(e.clientX||e.clientY){cursor.x=e.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft)-document.documentElement.clientLeft;cursor.y=e.clientY+(document.documentElement.scrollTop||document.body.scrollTop)-document.documentElement.clientTop}else{if(e.x||e.y){cursor.x=e.x;cursor.y=e.y}}}return cursor}var lockvisible=false;function lockview(event,id){event=event||window.event;cursor=getPosition(event);if(lockvisible){lockviewhide()}else{lockvisible=true;$j.get("lockview/"+id,function(data){$j("#panel").html(data);$j("#panel").css({left:cursor.x+5,top:cursor.y+5});$j("#panel").show()})}}function lockviewhide(){lockvisible=false;$j("#panel").hide()}function post_comment(id){unpause();commentBusy=true;$j("body").css("cursor","wait");$j("#comment-preview-inp-"+id).val("0");$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.success){$j("#comment-edit-wrapper-"+id).hide();$j("#comment-edit-text-"+id).val("");var tarea=document.getElementById("comment-edit-text-"+id);if(tarea)commentClose(tarea,id);if(timer)clearTimeout(timer);timer=setTimeout(NavUpdate,10)}if(data.reload){window.location.href=data.reload}},"json");return false}function preview_comment(id){$j("#comment-preview-inp-"+id).val("1");$j("#comment-edit-preview-"+id).show();$j.post("item",$j("#comment-edit-form-"+id).serialize(),function(data){if(data.preview){$j("#comment-edit-preview-"+id).html(data.preview);$j("#comment-edit-preview-"+id+" a").click(function(){return false})}},"json");return true}function showHideComments(id){if($j("#collapsed-comments-"+id).is(":visible")){$j("#collapsed-comments-"+id).hide();$j("#hide-comments-"+id).html(window.showMore)}else{$j("#collapsed-comments-"+id).show();$j("#hide-comments-"+id).html(window.showFewer);collapseHeight("#collapsed-comments-"+id)}}function preview_post(){$j("#jot-preview").val("1");$j("#jot-preview-content").show();tinyMCE.triggerSave();$j.post("item",$j("#profile-jot-form").serialize(),function(data){if(data.preview){$j("#jot-preview-content").html(data.preview);$j("#jot-preview-content"+" a").click(function(){return false})}},"json");$j("#jot-preview").val("0");return true}function unpause(){totStopped=false;stopped=false;$j("#pause").html("")}function bin2hex(s){var v,i,f=0,a=[];s+="";f=s.length;for(i=0;i'+data.desc+'
'+data.version+'
'+data.credits+'
'+theme+'')})}
\ No newline at end of file
diff --git a/view/theme/frost/js/theme.js b/view/theme/frost/js/theme.js
index ec00dcfdf..342884201 100644
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@@ -29,10 +29,10 @@ $j(document).ready(function() {
 	$j("#profile-jot-text").click(enableOnUser);
 
 
-	$j('.nav-menu-link').hover(function() {
-		showNavMenu($j(this).attr('rel'));
+	$j('.nav-menu-list, .nav-menu-icon').hover(function() {
+		showNavMenu($j(this).attr('point'));
 	}, function() {
-		hideNavMenu($j(this).attr('rel'));
+		hideNavMenu($j(this).attr('point'));
 	});
 
 /*	$j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
@@ -305,6 +305,13 @@ $j(function(){
 });
 
 
+function homeRedirect() {
+	$j('html').fadeOut('slow', function(){
+		window.location = baseurl + "/login";
+	});
+}
+
+
 if(typeof window.photoEdit != 'undefined') {
 
 	$j(document).keydown(function(event) {
@@ -616,8 +623,8 @@ function initEditor(cb){
 			$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
 			editor = true;
 			$j("a#jot-perms-icon").fancybox({
-				'transitionIn' : 'elastic',
-				'transitionOut' : 'elastic'
+				'transitionIn' : 'none', //'elastic',
+				'transitionOut' : 'none' //'elastic'
 			});
 			$j(".jothidden").show();
 			if (typeof cb!="undefined") cb();
diff --git a/view/theme/frost/js/theme.min.js b/view/theme/frost/js/theme.min.js
index 4fb4aae75..49be57f29 100644
--- a/view/theme/frost/js/theme.min.js
+++ b/view/theme/frost/js/theme.min.js
@@ -1 +1 @@
-function showEvent(e){$j.get(baseurl+"/events/?id="+e,function(e){$j.fancybox(e)})}function initCrop(){function e(e,t){$("x1").value=e.x1,$("y1").value=e.y1,$("x2").value=e.x2,$("y2").value=e.y2,$("width").value=t.width,$("height").value=t.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:!0,onEndCrop:e})})}function showNavMenu(e){window.navMenuTimeout[e+"-closing"]?(window.navMenuTimeout[e+"-closing"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-opening"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideDown("fast").show(),window.navMenuTimeout[e+"-opening"]=!1},200))}function hideNavMenu(e){window.navMenuTimeout[e+"-opening"]?(window.navMenuTimeout[e+"-opening"]=!1,clearTimeout(window.navMenuTimeout[e+"-timeout"])):(window.navMenuTimeout[e+"-closing"]=!0,window.navMenuTimeout[e+"-timeout"]=setTimeout(function(){$j(e).slideUp("fast"),window.navMenuTimeout[e+"-closing"]=!1},500))}function insertFormatting(e,t,n){var r=$j("#comment-edit-text-"+n).val();r==e&&(r="",$j("#comment-edit-text-"+n).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+n).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+n),$j("#comment-edit-text-"+n).val(r)),textarea=document.getElementById("comment-edit-text-"+n);if(document.selection)textarea.focus(),selected=document.selection.createRange(),t=="url"?selected.text="["+t+"=http://]"+selected.text+"[/"+t+"]":selected.text="["+t+"]"+selected.text+"[/"+t+"]";else if(textarea.selectionStart||textarea.selectionStart=="0"){var i=textarea.selectionStart,s=textarea.selectionEnd;t=="url"?textarea.value=textarea.value.substring(0,i)+"["+t+"=http://]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length):textarea.value=textarea.value.substring(0,i)+"["+t+"]"+textarea.value.substring(i,s)+"[/"+t+"]"+textarea.value.substring(s,textarea.value.length)}return!0}function cmtBbOpen(e){$j("#comment-edit-bb-"+e).show()}function cmtBbClose(e){$j("#comment-edit-bb-"+e).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(e,t){e.value==window.commentEmptyText&&(e.value="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).show(),openMenu("comment-edit-submit-wrapper-"+t))}function commentClose(e,t){e.value==""&&(e.value=window.commentEmptyText,$j("#comment-edit-text-"+t).removeClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).addClass("comment-edit-text-empty"),$j("#mod-cmnt-wrap-"+t).hide(),closeMenu("comment-edit-submit-wrapper-"+t))}function commentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).html();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r)}function qCommentInsert(e,t){var n=$j("#comment-edit-text-"+t).val();n==window.commentEmptyText&&(n="",$j("#comment-edit-text-"+t).addClass("comment-edit-text-full"),$j("#comment-edit-text-"+t).removeClass("comment-edit-text-empty"),openMenu("comment-edit-submit-wrapper-"+t));var r=$j(e).val();r=r.replace("<","<"),r=r.replace(">",">"),r=r.replace("&","&"),r=r.replace(""",'"'),$j("#comment-edit-text-"+t).val(n+r),$j(e).val("")}function enableOnUser(){if(editor)return;$j(this).val(""),initEditor()}function initEditor(e){if(editor==0){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide(),$j("#profile-jot-text").css({height:200,color:"#000"}),$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"elastic",transitionOut:"elastic"}),$j(".jothidden").show(),typeof e!="undefined"&&e();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:!1,file_browser_callback:"fcFileBrowser",setup:function(t){cPopup=null,t.onKeyDown.add(function(e,t){cPopup!==null&&cPopup.onkey(t)}),t.onKeyUp.add(function(e,t){var n=tinyMCE.activeEditor.getContent();match=n.match(/@([^ \n]+)$/),match!==null?(cPopup===null&&(cPopup=new ACPopup(this,baseurl+"/acl")),cPopup.ready&&match[1]!==cPopup.searchText&&cPopup.search(match[1]),cPopup.ready||(cPopup=null)):cPopup!==null&&(cPopup.close(),cPopup=null),textlen=n.length,textlen!=0&&$j("#jot-perms-icon").is(".unlock")?$j("#profile-jot-desc").html(ispublic):$j("#profile-jot-desc").html(" "),textlen<=140&&($j("#character-counter").removeClass("red"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("grey")),textlen>140&&textlen<=420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("red"),$j("#character-counter").addClass("orange")),textlen>420&&($j("#character-counter").removeClass("grey"),$j("#character-counter").removeClass("orange"),$j("#character-counter").addClass("red")),$j("#character-counter").text(textlen)}),t.onInit.add(function(t){t.pasteAsPlainText=!0,$j("#profile-jot-text-loading").hide(),$j(".jothidden").show(),typeof e!="undefined"&&e()})}}),editor=!0,$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else typeof e!="undefined"&&e()}function msgInitEditor(){plaintext!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var e=window.editSelect;e!="none"?tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:!0,paste_text_sticky:!0,entity_encoding:"raw",add_unload_trigger:!1,remove_linebreaks:!1,force_p_newlines:!1,force_br_newlines:!0,forced_root_block:"",convert_urls:!1,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:!1,setup:function(e){e.onInit.add(function(e){e.pasteAsPlainText=!0;var t=e.editorId,n=$j("#"+t);typeof n.attr("tabindex")!="undefined"&&($j("#"+t+"_ifr").attr("tabindex",n.attr("tabindex")),n.attr("tabindex",null))})}}):$j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(e){if(confirm(window.delItems)){var t="";$j(e).hide(),$j(e+"-rotator").show(),$j(".item-select").each(function(){$j(this).is(":checked")&&(t.length!=0?t=t+","+$j(this).val():t=$j(this).val())}),$j.post("item",{dropitems:t},function(e){window.location.reload()})}}function jotVideoURL(){reply=prompt(window.vidURL),reply&&reply.length&&addeditortext("[video]"+reply+"[/video]")}function jotAudioURL(){reply=prompt(window.audURL),reply&&reply.length&&addeditortext("[audio]"+reply+"[/audio]")}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val()),reply&&reply.length&&$j("#jot-location").val(reply)}function jotShare(e){$j("#jot-popup").length!=0&&$j("#jot-popup").show(),$j("#like-rotator-"+e).show(),$j.get("share/"+e,function(t){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(t),$j("#like-rotator-"+e).hide(),$j(window).scrollTop(0)})})}function linkdropper(e){var t=e.dataTransfer.types.contains("text/uri-list");t&&e.preventDefault()}function itemTag(e){reply=prompt(window.term),reply&&reply.length&&(reply=reply.replace("#",""),reply.length&&(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("tagger/"+e+"?term="+reply,NavUpdate),liking=1))}function itemFiler(e){var t=$j("input").css("border-color");$j.get("filer/",function(n){$j.fancybox(n),$j("#id_term").keypress(function(){$j(this).css("border-color",t)}),$j("#select_term").change(function(){$j("#id_term").css("border-color",t)}),$j("#filer_save").click(function(t){return t.preventDefault(),reply=$j("#id_term").val(),reply&&reply.length?(commentBusy=!0,$j("body").css("cursor","wait"),$j.get("filer/"+e+"?term="+reply,NavUpdate),liking=1,$j.fancybox.close()):$j("#id_term").css("border-color","#FF0000"),!1})})}function jotClearLocation(){$j("#jot-coord").val(""),$j("#profile-nolocation-wrapper").hide()}function addeditortext(e){if(plaintext=="none"){var t=$j("#profile-jot-text").val();$j("#profile-jot-text").val(t+e)}else tinyMCE.execCommand("mceInsertRawHTML",!1,e)}$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":!1,"#contacts-menu-list-opening":!1,"#system-menu-list-opening":!1,"#network-menu-list-closing":!1,"#contacts-menu-list-closing":!1,"#system-menu-list-closing":!1},typeof window.aclInit!="undefined"&&typeof acl=="undefined"&&(acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])),$j("#profile-jot-text").focus(enableOnUser),$j("#profile-jot-text").click(enableOnUser),$j(".nav-menu-link").hover(function(){showNavMenu($j(this).attr("rel"))},function(){hideNavMenu($j(this).attr("rel"))}),$j(".group-edit-icon").hover(function(){$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id"),$j("#edit-"+id).addClass("icon"),$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#edit-"+id).removeClass("icon"),$j("#edit-"+id).addClass("iconspacer")}),$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop"),$j(this).addClass("icon"),$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop"),$j(this).removeClass("icon"),$j(this).addClass("iconspacer")}),$j(".savedsearchterm").hover(function(){id=$j(this).attr("id"),$j("#drop-"+id).addClass("icon"),$j("#drop-"+id).addClass("drophide"),$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id"),$j("#drop-"+id).removeClass("icon"),$j("#drop-"+id).removeClass("drophide"),$j("#drop-"+id).addClass("iconspacer")}),window.autoCompleteType=="display-head"&&$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl");if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(e,t,n){showEvent(e.id)},eventRender:function(e,t,n){if(e.item["author-name"]==null)return;switch(n.name){case"month":t.find(".fc-event-title").html("{1} : {2}".format(e.item["author-avatar"],e.item["author-name"],e.title));break;case"agendaWeek":t.find(".fc-event-title").html("{1}
{2}
{3}
".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location));break;case"agendaDay":t.find(".fc-event-title").html("{1}
{2}
{3}
".format(e.item["author-avatar"],e.item["author-name"],e.item.desc,e.item.location))}}});var e=location.href.replace(baseurl,"").split("/");e.length>=4&&$j("#events-calendar").fullCalendar("gotoDate",e[2],e[3]-1);var t=location.hash.split("-");t.length==2&&t[0]=="#link"&&showEvent(t[1])}$j("#event-share-checkbox").change(function(){$j("#event-share-checkbox").is(":checked")?$j("#acl-wrapper").show():$j("#acl-wrapper").hide()}).trigger("change"),(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head")&&$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var e;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){e=$j(this).text(),$j("#jot-perms-icon").removeClass("unlock").addClass("lock"),$j("#jot-public").hide()}),e==null&&($j("#jot-perms-icon").removeClass("lock").addClass("unlock"),$j("#jot-public").show())}).trigger("change");switch(window.autocompleteType){case"msg-header":var n=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(e,t){$j("#recip-complete").val(t)}});break;case"contacts-head":var n=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});n.setOptions({params:{type:"a"}});break;default:}if(typeof window.AjaxUpload!="undefined")switch(window.ajaxType){case"jot-header":var r=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}}),i=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){addeditortext(t),$j("#profile-rotator").hide()}});break;case"msg-header":var r=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(e,t){$j("#profile-rotator").show()},onComplete:function(e,t){tinyMCE.execCommand("mceInsertRawHTML",!1,t),$j("#profile-rotator").hide()}});break;default:}}),$j(function(){$j("nav").bind("nav-update",function(e,t){var n=$j("#pending-update"),r=$j(t).find("register").text();r=="0"?(r="",n.hide()):n.show(),n.html(r)})}),$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:!1,onStart:function(){var e=$j("#id_theme :selected").val(),t=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+e)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var t=$j(this).attr("action"),n={};return $j(this).find("input").each(function(){n[$j(this).attr("name")]=$j(this).val()}),$j(this).find("select").each(function(){n[$j(this).attr("name")]=$j(this).children(":selected").val()}),console.log(":)",t,n),$j.post(t,n,function(e){timer&&clearTimeout(timer),NavUpdate(),$j.fancybox.close()}),!1})}})}),typeof window.photoEdit!="undefined"&&$j(document).keydown(function(e){window.prevLink!=""&&e.ctrlKey&&e.keyCode==37&&(e.preventDefault(),window.location.href=window.prevLink),window.nextLink!=""&&e.ctrlKey&&e.keyCode==39&&(e.preventDefault(),window.location.href=window.nextLink)});switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&(reply=bin2hex(reply),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+reply,function(e){addeditortext(e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&(t=bin2hex(t),$j("#profile-rotator").show(),$j.get("parse_url?binurl="+t,function(e){editor||$j("#profile-jot-text").val(""),initEditor(function(){addeditortext(e),$j("#profile-rotator").hide()})}))}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL),reply&&reply.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+reply,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}function linkdrop(e){var t=e.dataTransfer.getData("text/uri-list");e.target.textContent=t,e.preventDefault(),t&&t.length&&($j("#profile-rotator").show(),$j.get("parse_url?url="+t,function(e){tinyMCE.execCommand("mceInsertRawHTML",!1,e),$j("#profile-rotator").hide()}))}break;default:}var editor=!1,textlen=0,plaintext=window.editSelect,ispublic=window.isPublic;typeof window.geoTag=="function"&&window.geoTag();
\ No newline at end of file
+$j(document).ready(function(){window.navMenuTimeout={"#network-menu-list-timeout":null,"#contacts-menu-list-timeout":null,"#system-menu-list-timeout":null,"#network-menu-list-opening":false,"#contacts-menu-list-opening":false,"#system-menu-list-opening":false,"#network-menu-list-closing":false,"#contacts-menu-list-closing":false,"#system-menu-list-closing":false};if(typeof window.aclInit!="undefined"&&typeof acl=="undefined"){acl=new ACL(baseurl+"/acl",[window.allowCID,window.allowGID,window.denyCID,window.denyGID])}$j("#profile-jot-text").focus(enableOnUser);$j("#profile-jot-text").click(enableOnUser);$j(".nav-menu-list, .nav-menu-icon").hover(function(){showNavMenu($j(this).attr("point"))},function(){hideNavMenu($j(this).attr("point"))});$j(".group-edit-icon").hover(function(){$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".sidebar-group-element").hover(function(){id=$j(this).attr("id");$j("#edit-"+id).addClass("icon");$j("#edit-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#edit-"+id).removeClass("icon");$j("#edit-"+id).addClass("iconspacer")});$j(".savedsearchdrop").hover(function(){$j(this).addClass("drop");$j(this).addClass("icon");$j(this).removeClass("iconspacer")},function(){$j(this).removeClass("drop");$j(this).removeClass("icon");$j(this).addClass("iconspacer")});$j(".savedsearchterm").hover(function(){id=$j(this).attr("id");$j("#drop-"+id).addClass("icon");$j("#drop-"+id).addClass("drophide");$j("#drop-"+id).removeClass("iconspacer")},function(){id=$j(this).attr("id");$j("#drop-"+id).removeClass("icon");$j("#drop-"+id).removeClass("drophide");$j("#drop-"+id).addClass("iconspacer")});if(window.autoCompleteType=="display-head"){$j(".comment-wwedit-wrapper textarea").contact_autocomplete(baseurl+"/acl")}if(window.aclType=="event_head"){$j("#events-calendar").fullCalendar({events:baseurl+"/events/json/",header:{left:"prev,next today",center:"title",right:"month,agendaWeek,agendaDay"},timeFormat:"H(:mm)",eventClick:function(calEvent,jsEvent,view){showEvent(calEvent.id)},eventRender:function(event,element,view){if(event.item["author-name"]==null)return;switch(view.name){case"month":element.find(".fc-event-title").html("{1} : {2}".format(event.item["author-avatar"],event.item["author-name"],event.title));break;case"agendaWeek":element.find(".fc-event-title").html("{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break;case"agendaDay":element.find(".fc-event-title").html("{1}
{2}
{3}
".format(event.item["author-avatar"],event.item["author-name"],event.item.desc,event.item.location));break}}});var args=location.href.replace(baseurl,"").split("/");if(args.length>=4){$j("#events-calendar").fullCalendar("gotoDate",args[2],args[3]-1)}var hash=location.hash.split("-");if(hash.length==2&&hash[0]=="#link")showEvent(hash[1])}$j("#event-share-checkbox").change(function(){if($j("#event-share-checkbox").is(":checked")){$j("#acl-wrapper").show()}else{$j("#acl-wrapper").hide()}}).trigger("change");if(window.aclType=="settings-head"||window.aclType=="photos_head"||window.aclType=="event_head"){$j("#contact_allow, #contact_deny, #group_allow, #group_deny").change(function(){var selstr;$j("#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected").each(function(){selstr=$j(this).text();$j("#jot-perms-icon").removeClass("unlock").addClass("lock");$j("#jot-public").hide()});if(selstr==null){$j("#jot-perms-icon").removeClass("lock").addClass("unlock");$j("#jot-public").show()}}).trigger("change")}switch(window.autocompleteType){case"msg-header":var a=$j("#recip").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350,onSelect:function(value,data){$j("#recip-complete").val(data)}});break;case"contacts-head":var a=$j("#contacts-search").autocomplete({serviceUrl:baseurl+"/acl",minChars:2,width:350});a.setOptions({params:{type:"a"}});break;default:break}if(typeof window.AjaxUpload!="undefined"){switch(window.ajaxType){case"jot-header":var uploader=new window.AjaxUpload("wall-image-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});var file_uploader=new window.AjaxUpload("wall-file-upload",{action:"wall_attach/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){addeditortext(response);$j("#profile-rotator").hide()}});break;case"msg-header":var uploader=new window.AjaxUpload("prvmail-upload",{action:"wall_upload/"+window.nickname,name:"userfile",onSubmit:function(file,ext){$j("#profile-rotator").show()},onComplete:function(file,response){tinyMCE.execCommand("mceInsertRawHTML",false,response);$j("#profile-rotator").hide()}});break;default:break}}});$j(function(){$j("nav").bind("nav-update",function(e,data){var elm=$j("#pending-update");var register=$j(data).find("register").text();if(register=="0"){register="";elm.hide()}else{elm.show()}elm.html(register)})});$j(function(){$j("#cnftheme").fancybox({width:800,autoDimensions:false,onStart:function(){var theme=$j("#id_theme :selected").val();var theme_mobile=$j("#id_theme_mobile :selected").val();$j("#cnftheme").attr("href",baseurl+"/admin/themes/"+theme)},onComplete:function(){$j("div#fancybox-content form").submit(function(e){var url=$j(this).attr("action");var data={};$j(this).find("input").each(function(){data[$j(this).attr("name")]=$j(this).val()});$j(this).find("select").each(function(){data[$j(this).attr("name")]=$j(this).children(":selected").val()});console.log(":)",url,data);$j.post(url,data,function(data){if(timer)clearTimeout(timer);NavUpdate();$j.fancybox.close()});return false})}})});function homeRedirect(){$j("html").fadeOut("slow",function(){window.location=baseurl+"/login"})}if(typeof window.photoEdit!="undefined"){$j(document).keydown(function(event){if(window.prevLink!=""){if(event.ctrlKey&&event.keyCode==37){event.preventDefault();window.location.href=window.prevLink}}if(window.nextLink!=""){if(event.ctrlKey&&event.keyCode==39){event.preventDefault();window.location.href=window.nextLink}}})}switch(window.ajaxType){case"jot-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){addeditortext(data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){reply=bin2hex(reply);$j("#profile-rotator").show();$j.get("parse_url?binurl="+reply,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#profile-rotator").hide()})})}}break;case"msg-header":case"wallmsg-header":function jotGetLink(){reply=prompt(window.linkURL);if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}function linkdrop(event){var reply=event.dataTransfer.getData("text/uri-list");event.target.textContent=reply;event.preventDefault();if(reply&&reply.length){$j("#profile-rotator").show();$j.get("parse_url?url="+reply,function(data){tinyMCE.execCommand("mceInsertRawHTML",false,data);$j("#profile-rotator").hide()})}}break;default:break}function showEvent(eventid){$j.get(baseurl+"/events/?id="+eventid,function(data){$j.fancybox(data)})}function initCrop(){function onEndCrop(coords,dimensions){$("x1").value=coords.x1;$("y1").value=coords.y1;$("x2").value=coords.x2;$("y2").value=coords.y2;$("width").value=dimensions.width;$("height").value=dimensions.height}Event.observe(window,"load",function(){new Cropper.ImgWithPreview("croppa",{previewWrap:"previewWrap",minWidth:175,minHeight:175,maxWidth:640,maxHeight:640,ratioDim:{x:100,y:100},displayOnInit:true,onEndCrop:onEndCrop})})}function showNavMenu(menuID){if(window.navMenuTimeout[menuID+"-closing"]){window.navMenuTimeout[menuID+"-closing"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-opening"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideDown("fast").show();window.navMenuTimeout[menuID+"-opening"]=false},200)}}function hideNavMenu(menuID){if(window.navMenuTimeout[menuID+"-opening"]){window.navMenuTimeout[menuID+"-opening"]=false;clearTimeout(window.navMenuTimeout[menuID+"-timeout"])}else{window.navMenuTimeout[menuID+"-closing"]=true;window.navMenuTimeout[menuID+"-timeout"]=setTimeout(function(){$j(menuID).slideUp("fast");window.navMenuTimeout[menuID+"-closing"]=false},500)}}function insertFormatting(comment,BBcode,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==comment){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id);$j("#comment-edit-text-"+id).val(tmpStr)}textarea=document.getElementById("comment-edit-text-"+id);if(document.selection){textarea.focus();selected=document.selection.createRange();if(BBcode=="url"){selected.text="["+BBcode+"=http://]"+selected.text+"[/"+BBcode+"]"}else selected.text="["+BBcode+"]"+selected.text+"[/"+BBcode+"]"}else if(textarea.selectionStart||textarea.selectionStart=="0"){var start=textarea.selectionStart;var end=textarea.selectionEnd;if(BBcode=="url"){textarea.value=textarea.value.substring(0,start)+"["+BBcode+"=http://]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}else textarea.value=textarea.value.substring(0,start)+"["+BBcode+"]"+textarea.value.substring(start,end)+"[/"+BBcode+"]"+textarea.value.substring(end,textarea.value.length)}return true}function cmtBbOpen(id){$j("#comment-edit-bb-"+id).show()}function cmtBbClose(id){$j("#comment-edit-bb-"+id).hide()}function confirmDelete(){return confirm(window.delItem)}function commentOpen(obj,id){if(obj.value==window.commentEmptyText){obj.value="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).show();openMenu("comment-edit-submit-wrapper-"+id)}}function commentClose(obj,id){if(obj.value==""){obj.value=window.commentEmptyText;$j("#comment-edit-text-"+id).removeClass("comment-edit-text-full");$j("#comment-edit-text-"+id).addClass("comment-edit-text-empty");$j("#mod-cmnt-wrap-"+id).hide();closeMenu("comment-edit-submit-wrapper-"+id)}}function commentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).html();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins)}function qCommentInsert(obj,id){var tmpStr=$j("#comment-edit-text-"+id).val();if(tmpStr==window.commentEmptyText){tmpStr="";$j("#comment-edit-text-"+id).addClass("comment-edit-text-full");$j("#comment-edit-text-"+id).removeClass("comment-edit-text-empty");openMenu("comment-edit-submit-wrapper-"+id)}var ins=$j(obj).val();ins=ins.replace("<","<");ins=ins.replace(">",">");ins=ins.replace("&","&");ins=ins.replace(""",'"');$j("#comment-edit-text-"+id).val(tmpStr+ins);$j(obj).val("")}function enableOnUser(){if(editor)return;$j(this).val("");initEditor()}var editor=false;var textlen=0;var plaintext=window.editSelect;var ispublic=window.isPublic;function initEditor(cb){if(editor==false){$j("#profile-jot-text-loading").show();if(plaintext=="none"){$j("#profile-jot-text-loading").hide();$j("#profile-jot-text").css({height:200,color:"#000"});$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");editor=true;$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"});$j(".jothidden").show();if(typeof cb!="undefined")cb();return}tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:window.editSelect,auto_focus:"profile-jot-text",plugins:"bbcode,paste,autoresize, inlinepopups",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:window.baseURL+"/view/custom_tinymce.css",theme_advanced_path:false,file_browser_callback:"fcFileBrowser",setup:function(ed){cPopup=null;ed.onKeyDown.add(function(ed,e){if(cPopup!==null)cPopup.onkey(e)});ed.onKeyUp.add(function(ed,e){var txt=tinyMCE.activeEditor.getContent();match=txt.match(/@([^ \n]+)$/);if(match!==null){if(cPopup===null){cPopup=new ACPopup(this,baseurl+"/acl")}if(cPopup.ready&&match[1]!==cPopup.searchText)cPopup.search(match[1]);if(!cPopup.ready)cPopup=null}else{if(cPopup!==null){cPopup.close();cPopup=null}}textlen=txt.length;if(textlen!=0&&$j("#jot-perms-icon").is(".unlock")){$j("#profile-jot-desc").html(ispublic)}else{$j("#profile-jot-desc").html(" ")}if(textlen<=140){$j("#character-counter").removeClass("red");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("grey")}if(textlen>140&&textlen<=420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("red");$j("#character-counter").addClass("orange")}if(textlen>420){$j("#character-counter").removeClass("grey");$j("#character-counter").removeClass("orange");$j("#character-counter").addClass("red")}$j("#character-counter").text(textlen)});ed.onInit.add(function(ed){ed.pasteAsPlainText=true;$j("#profile-jot-text-loading").hide();$j(".jothidden").show();if(typeof cb!="undefined")cb()})}});editor=true;$j("a#jot-perms-icon").fancybox({transitionIn:"none",transitionOut:"none"})}else{if(typeof cb!="undefined")cb()}}function msgInitEditor(){if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function profInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function eventInitEditor(){tinyMCE.init({theme:"advanced",mode:"textareas",plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true})}})}function contactInitEditor(){tinyMCE.init({theme:"advanced",mode:window.editSelect,elements:"contact-edit-info",plugins:"bbcode",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_styles:"blockquote,code",gecko_spellcheck:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",content_css:baseurl+"/view/custom_tinymce.css"})}function wallInitEditor(){var plaintext=window.editSelect;if(plaintext!="none"){tinyMCE.init({theme:"advanced",mode:"specific_textareas",editor_selector:/(profile-jot-text|prvmail-text)/,plugins:"bbcode,paste",theme_advanced_buttons1:"bold,italic,underline,undo,redo,link,unlink,image,forecolor",theme_advanced_buttons2:"",theme_advanced_buttons3:"",theme_advanced_toolbar_location:"top",theme_advanced_toolbar_align:"center",theme_advanced_blockformats:"blockquote,code",gecko_spellcheck:true,paste_text_sticky:true,entity_encoding:"raw",add_unload_trigger:false,remove_linebreaks:false,force_p_newlines:false,force_br_newlines:true,forced_root_block:"",convert_urls:false,content_css:baseurl+"/view/custom_tinymce.css",theme_advanced_path:false,setup:function(ed){ed.onInit.add(function(ed){ed.pasteAsPlainText=true;var editorId=ed.editorId;var textarea=$j("#"+editorId);if(typeof textarea.attr("tabindex")!="undefined"){$j("#"+editorId+"_ifr").attr("tabindex",textarea.attr("tabindex"));textarea.attr("tabindex",null)}})}})}else $j("#prvmail-text").contact_autocomplete(baseurl+"/acl")}function deleteCheckedItems(delID){if(confirm(window.delItems)){var checkedstr="";$j(delID).hide();$j(delID+"-rotator").show();$j(".item-select").each(function(){if($j(this).is(":checked")){if(checkedstr.length!=0){checkedstr=checkedstr+","+$j(this).val()}else{checkedstr=$j(this).val()}}});$j.post("item",{dropitems:checkedstr},function(data){window.location.reload()})}}function jotVideoURL(){reply=prompt(window.vidURL);if(reply&&reply.length){addeditortext("[video]"+reply+"[/video]")}}function jotAudioURL(){reply=prompt(window.audURL);if(reply&&reply.length){addeditortext("[audio]"+reply+"[/audio]")}}function jotGetLocation(){reply=prompt(window.whereAreU,$j("#jot-location").val());if(reply&&reply.length){$j("#jot-location").val(reply)}}function jotShare(id){if($j("#jot-popup").length!=0)$j("#jot-popup").show();$j("#like-rotator-"+id).show();$j.get("share/"+id,function(data){if(!editor)$j("#profile-jot-text").val("");initEditor(function(){addeditortext(data);$j("#like-rotator-"+id).hide();$j(window).scrollTop(0)})})}function linkdropper(event){var linkFound=event.dataTransfer.types.contains("text/uri-list");if(linkFound)event.preventDefault()}function itemTag(id){reply=prompt(window.term);if(reply&&reply.length){reply=reply.replace("#","");if(reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("tagger/"+id+"?term="+reply,NavUpdate);liking=1}}}function itemFiler(id){var bordercolor=$j("input").css("border-color");$j.get("filer/",function(data){$j.fancybox(data);$j("#id_term").keypress(function(){$j(this).css("border-color",bordercolor)});$j("#select_term").change(function(){$j("#id_term").css("border-color",bordercolor)});$j("#filer_save").click(function(e){e.preventDefault();reply=$j("#id_term").val();if(reply&&reply.length){commentBusy=true;$j("body").css("cursor","wait");$j.get("filer/"+id+"?term="+reply,NavUpdate);liking=1;$j.fancybox.close()}else{$j("#id_term").css("border-color","#FF0000")}return false})})}function jotClearLocation(){$j("#jot-coord").val("");$j("#profile-nolocation-wrapper").hide()}function addeditortext(data){if(plaintext=="none"){var currentText=$j("#profile-jot-text").val();$j("#profile-jot-text").val(currentText+data)}else tinyMCE.execCommand("mceInsertRawHTML",false,data)}if(typeof window.geoTag==="function")window.geoTag();
\ No newline at end of file
diff --git a/view/theme/frost/lock.cur b/view/theme/frost/lock.cur
index 892c5e851..011f44705 100644
Binary files a/view/theme/frost/lock.cur and b/view/theme/frost/lock.cur differ
diff --git a/view/theme/frost/login-style.css b/view/theme/frost/login-style.css
index 25d8ec5a0..840c404d8 100644
--- a/view/theme/frost/login-style.css
+++ b/view/theme/frost/login-style.css
@@ -31,6 +31,9 @@ div.jGrowl div.info {
 	top: 15px;
 	right: 15px;
 }
+div.jGrowl-notification {
+  border-radius: 7px;
+}
 
 .login-button {
 	margin-top: 110px;
@@ -89,6 +92,7 @@ div.section-wrapper {
 
 #div_id_remember {
 	margin-top: 10px;
+	margin-bottom: 10px;
 }
 
 /*.openid input {*/
diff --git a/view/theme/frost/login.tpl b/view/theme/frost/login.tpl
index bc99e6d95..af315ac5e 100644
--- a/view/theme/frost/login.tpl
+++ b/view/theme/frost/login.tpl
@@ -21,13 +21,14 @@
 	
-->
 
 	


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

 		
 	

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


 
-