Merge remote branch 'mike/master'

122 files changed, 11342 insertions, 7451 deletions

diff --git a/boot.php b/boot.php
index 858eb19a8..5fac9df5a 100644
--- a/boot.php
+++ b/boot.php
@@ -2,9 +2,9 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.941' );
-define ( 'DFRN_PROTOCOL_VERSION',  '2.2'  );
-define ( 'DB_UPDATE_VERSION',      1047   );
+define ( 'FRIENDIKA_VERSION',      '2.1.946' );
+define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
+define ( 'DB_UPDATE_VERSION',      1050      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -74,6 +74,18 @@ define ( 'PAGE_COMMUNITY',         2 );
 define ( 'PAGE_FREELOVE',          3 );
 
 /**
+ * Network and protocol family types 
+ */
+
+define ( 'NETWORK_DFRN',             'dfrn');    // Friendika, Mistpark, other DFRN implementations
+define ( 'NETWORK_OSTATUS',          'stat');    // status.net, identi.ca, GNU-social, other OStatus implementations
+define ( 'NETWORK_FEED',             'feed');    // RSS/Atom feeds with no known "post/notify" protocol
+define ( 'NETWORK_DIASPORA',         'dspr');    // Diaspora
+define ( 'NETWORK_MAIL',             'mail');    // IMAP/POP
+define ( 'NETWORK_FACEBOOK',         'face');    // Facebook API     
+
+
+/**
  * Maximum number of "people who like (or don't like) this"  that we will list by name
  */
 
@@ -189,6 +201,7 @@ class App {
 	public  $user;
 	public  $cid;
 	public  $contact;
+	public  $page_contact;
 	public  $content;
 	public  $data;
 	public  $error = false;
@@ -2032,18 +2045,7 @@ function contact_block() {
 	if(count($r)) {
 		$o .= '<h4 class="contact-h4">' .  sprintf( tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
 		foreach($r as $rr) {
-			$redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
-			if(local_user() && ($rr['uid'] == local_user())
-				&& ($rr['network'] === 'dfrn')) {
-				$url = $redirect_url;
-				$sparkle = ' sparkle';
-			}
-			else {
-				$url = $rr['url'];
-				$sparkle = '';
-			}
-
-			$o .= '<div class="contact-block-div"><a class="contact-block-link' . $sparkle . '" href="' . $url . '" ><img class="contact-block-img' . $sparkle . '" src="' . $rr['micro'] . '" title="' . $rr['name'] . ' [' . $rr['url'] . ']" alt="' . $rr['name'] . '" /></a></div>' . "\r\n";
+			$o .= micropro($rr,true,'mpfriend');
 		}
 		$o .= '</div><div id="contact-block-end"></div>';
 		$o .=  '<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/' . $a->profile['nickname'] . '">' . t('View Contacts') . '</a></div>';
@@ -2057,6 +2059,31 @@ function contact_block() {
 
 }}
 
+if(! function_exists('micropro')) {
+function micropro($contact, $redirect = false, $class = '') {
+
+	if($class)
+		$class = ' ' . $class;
+
+	$url = $contact['url'];
+	$sparkle = '';
+
+	if($redirect) {
+		$a = get_app();
+		$redirect_url = $a->get_baseurl() . '/redir/' . $contact['id'];
+		if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) {
+			$url = $redirect_url;
+			$sparkle = ' sparkle';
+		}
+	}
+
+	return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle 
+		. '" href="' . $url . '" ><img class="contact-block-img' . $class . $sparkle . '" src="' . $contact['micro'] 
+		. '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" /></a></div>' . "\r\n";
+}}
+
+
+
 if(! function_exists('search')) {
 function search($s) {
 	$a = get_app();
@@ -2301,9 +2328,9 @@ function profile_sidebar($profile) {
 
 	$pubkey = ((x($profile,'pubkey') == 1) ? '<div class="key" style="display:none;">' . $profile['pubkey'] . '</div>' : '');
 
-	$marital = ((x($profile,'marital') == 1) ? '<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> ' . t('Status:') . ' </span><span class="marital-text">' . $profile['marital'] . '</span></div></div><div class="profile-clear"></div>' : '');
+	$marital = ((x($profile,'marital') == 1) ? '<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> ' . t('Status:') . ' </span><span class="marital-text">' . $profile['marital'] . '</span></div><div class="profile-clear"></div>' : '');
 
-	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div></div><div class="profile-clear"></div>' : '');
+	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div><div class="profile-clear"></div>' : '');
 
 	$tpl = load_view_file('view/profile_vcard.tpl');
 
@@ -2662,14 +2689,19 @@ function extract_item_authors($arr,$uid) {
 
 	// pre-quoted, don't put quotes on %s
 	if(count($urls)) {
-		$r = q("SELECT `id`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `network` = 'dfrn' AND `self` = 0 AND `blocked` = 0 ",
+		$r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s )  AND `self` = 0 AND `blocked` = 0 ",
 			intval($uid),
 			implode(',',$urls)
 		);
 		if(count($r)) {
 			$ret = array();
-			foreach($r as $rr)
-				$ret[$rr['url']] = $rr['id'];
+			$authors = array();
+			foreach($r as $rr){
+				if ($rr['network']=='dfrn')
+					$ret[$rr['url']] = $rr['id'];
+				$authors[$r['url']]= $rr;
+			}
+			$a->authors = $authors;
 			return $ret;
 		}
 	}
@@ -2681,7 +2713,7 @@ function item_photo_menu($item){
 	$a = get_app();
 	
 	if (!isset($a->authors)){
-		$rr = q("SELECT id, network, url FROM contact WHERE uid=%d AND self!=1", intval(local_user()));
+		$rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user()));
 		$authors = array();
 		foreach($rr as $r) $authors[$r['url']]= $r;
 		$a->authors = $authors;
diff --git a/database.sql b/database.sql
index eb6eebc4a..2fd289d74 100644
--- a/database.sql
+++ b/database.sql
@@ -85,6 +85,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `priority` tinyint(3) NOT NULL,
   `blocked` tinyint(1) NOT NULL DEFAULT '1',
   `readonly` tinyint(1) NOT NULL DEFAULT '0',
+  `writable` tinyint(1) NOT NULL DEFAULT '0',
   `pending` tinyint(1) NOT NULL DEFAULT '1',
   `rating` tinyint(1) NOT NULL DEFAULT '0',
   `reason` text NOT NULL,
@@ -502,3 +503,14 @@ CREATE TABLE IF NOT EXISTS `ffinder` (
 `fid` INT UNSIGNED NOT NULL
 ) ENGINE = MYISAM DEFAULT CHARSET=utf8;
 
+
+CREATE TABLE IF NOT EXISTS `mailacct` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`uid` INT NOT NULL,
+`server` CHAR( 255 ) NOT NULL ,
+`user` CHAR( 255 ) NOT NULL ,
+`pass` CHAR( 255 ) NOT NULL ,
+`reply_to` CHAR( 255 ) NOT NULL ,
+`last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
diff --git a/include/bbcode.php b/include/bbcode.php
index 44f571450..6fadbaf7e 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,7 +3,7 @@ require_once("include/oembed.php");
 	// BBcode 2 HTML was written by WAY2WEB.net
 	// extended to work with Mistpark/Friendika - Mike Macgirvin
 
-function bbcode($Text) {
+function bbcode($Text,$preserve_nl = false) {
 
 	// Replace any html brackets with HTML Entities to prevent executing HTML or script
 	// Don't use strip_tags here because it breaks [url] search by replacing & with amp
@@ -12,7 +12,10 @@ function bbcode($Text) {
 	$Text = str_replace(">", "&gt;", $Text);
 
 	// Convert new line chars to html <br /> tags
+
 	$Text = nl2br($Text);
+	if($preserve_nl)
+		$Text = str_replace(array("\n","\r"), array('',''),$Text);
 
 	// Set up the parameters for a URL search string
 	$URLSearchString = "^\[\]";
diff --git a/include/conversation.php b/include/conversation.php
new file mode 100644
index 000000000..839afc481
--- /dev/null
+++ b/include/conversation.php
@@ -0,0 +1,420 @@
+<?php
+
+
+function conversation(&$a, $items, $mode, $update) {
+
+	require_once('bbcode.php');
+
+	$profile_owner = 0;
+	$page_writeable      = false;
+
+	if($mode === 'network') {
+		$profile_owner = local_user();
+		$page_writeable = true;
+	}
+
+	if($mode === 'profile') {
+		$profile_owner = $a->profile['profile_uid'];
+		$page_writeable = can_write_wall($a,$profile_owner);
+	}
+
+	if($mode === 'display') {
+		$profile_owner = $a->profile['uid'];
+		$page_writeable = can_write_wall($a,$profile_owner);
+	}
+
+	if($update)
+		$return_url = $_SESSION['return_url'];
+	else
+		$return_url = $_SESSION['return_url'] = $a->cmd;
+
+
+	// find all the authors involved in remote conversations
+	// We will use a local profile photo if they are one of our contacts
+	// otherwise we have to get the photo from the item owner's site
+
+	$author_contacts = extract_item_authors($items,local_user());
+
+
+	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
+	$like_tpl    = load_view_file('view/like.tpl');
+	$noshare_tpl = load_view_file('view/like_noshare.tpl');
+	$tpl         = load_view_file('view/wall_item.tpl');
+	$wallwall    = load_view_file('view/wallwall_item.tpl');
+
+	$alike = array();
+	$dlike = array();
+	
+	if(count($items)) {
+
+		if($mode === 'network-new' || $mode === 'search') {
+
+			// "New Item View" on network page or search page results 
+			// - just loop through the items and format them minimally for display
+
+			$tpl = load_view_file('view/search_item.tpl');
+			$droptpl = load_view_file('view/wall_fake_drop.tpl');
+
+			foreach($items as $item) {
+
+				$comment     = '';
+				$owner_url   = '';
+				$owner_photo = '';
+				$owner_name  = '';
+				$sparkle     = '';
+
+				if($mode === 'search') {
+					if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+						&& ($item['id'] != $item['parent']))
+						continue;
+					$nickname = $item['nickname'];
+				}
+				else
+					$nickname = $a->user['nickname'];
+			
+				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
+				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
+
+				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+				if(strlen($item['author-link'])) {
+					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+						$profile_link = $redirect_url;
+						$sparkle = ' sparkle';
+					}
+					elseif(isset($author_contacts[$item['author-link']])) {
+						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+						$sparkle = ' sparkle';
+					}
+				}
+
+				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+				if($coord) {
+					if($location)
+						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+					else
+						$location = '<span class="smalltext">' . $coord . '</span>';
+				}
+
+				$drop = '';
+				$dropping = false;
+
+				if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+					$dropping = true;
+
+	            $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+
+				$drop = replace_macros($droptpl,array('$id' => $item['id']));
+				$lock = '<div class="wall-item-lock"></div>';
+				
+				$o .= replace_macros($tpl,array(
+					'$id' => $item['item_id'],
+					'$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
+					'$profile_url' => $profile_link,
+					'$item_photo_menu' => item_photo_menu($item),
+					'$name' => $profile_name,
+					'$sparkle' => $sparkle,
+					'$lock' => $lock,
+					'$thumb' => $profile_avatar,
+					'$title' => $item['title'],
+					'$body' => smilies(bbcode($item['body'])),
+					'$ago' => relative_date($item['created']),
+					'$location' => $location,
+					'$indent' => '',
+					'$owner_url' => $owner_url,
+					'$owner_photo' => $owner_photo,
+					'$owner_name' => $owner_name,
+					'$drop' => $drop,
+					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $nickname . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+				));
+
+			}
+
+			return $o;
+		}
+
+
+
+
+		// Normal View
+
+
+		// Figure out how many comments each parent has
+		// (Comments all have gravity of 6)
+		// Store the result in the $comments array
+
+		$comments = array();
+		foreach($items as $item) {
+			if(intval($item['gravity']) == 6) {
+				if(! x($comments,$item['parent']))
+					$comments[$item['parent']] = 1;
+				else
+					$comments[$item['parent']] += 1;
+			}
+		}
+
+		// map all the like/dislike activities for each parent item 
+		// Store these in the $alike and $dlike arrays
+
+		foreach($items as $item) {
+			like_puller($a,$item,$alike,'like');
+			like_puller($a,$item,$dlike,'dislike');
+		}
+
+		$comments_collapsed = false;
+		$blowhard = 0;
+		$blowhard_count = 0;
+
+		foreach($items as $item) {
+
+			$comment = '';
+			$template = $tpl;
+			$commentww = '';
+			$sparkle = '';
+			$owner_url = $owner_photo = $owner_name = '';
+
+			// We've already parsed out like/dislike for special treatment. We can ignore them now
+
+			if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
+				|| (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+				&& ($item['id'] != $item['parent']))
+				continue;
+
+			$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+
+
+			// Take care of author collapsing and comment collapsing
+			// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+			// If there are more than two comments, squash all but the last 2.
+
+			if($toplevelpost) {
+
+				$item_writeable = (($item['writable'] || $item['self']) ? true : false);
+
+				if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile')) {
+					$blowhard_count ++;
+					if($blowhard_count == 3) {
+						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] 
+							. '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' 
+							. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' 
+							. $item['parent'] . '" style="display: none;" >';
+					}
+				}
+				else {
+					$blowhard = $item['cid'];					
+					if($blowhard_count >= 3)
+						$o .= '</div>';
+					$blowhard_count = 0;
+				}
+
+				$comments_seen = 0;
+				$comments_collapsed = false;
+			}
+			else
+				$comments_seen ++;
+
+
+			$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
+
+			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+				if(! $comments_collapsed) {
+					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] 
+						. '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' 
+						. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
+						. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+					$comments_collapsed = true;
+				}
+			}
+			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+				$o .= '</div>';
+			}
+
+			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
+				: '<div class="wall-item-lock"></div>');
+
+
+			// Top-level wall post not written by the wall owner (wall-to-wall)
+			// First figure out who owns it. 
+
+			$osparkle = '';
+
+			if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
+
+				if($item['type'] === 'wall') {
+
+					// On the network page, I am the owner. On the display page it will be the profile owner.
+					// This will have been stored in $a->page_contact by our calling page.
+					// Put this person on the left of the wall-to-wall notice.
+
+					$owner_url = $a->page_contact['url'];
+					$owner_photo = $a->page_contact['thumb'];
+					$owner_name = $a->page_contact['name'];
+					$template = $wallwall;
+					$commentww = 'ww';	
+				}
+				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+
+					// Could be anybody. 
+
+					$owner_url = $item['owner-link'];
+					$owner_photo = $item['owner-avatar'];
+					$owner_name = $item['owner-name'];
+					$template = $wallwall;
+					$commentww = 'ww';
+					// If it is our contact, use a friendly redirect link
+					if((link_compare($item['owner-link'],$item['url'])) 
+						&& ($item['network'] === 'dfrn')) {
+						$owner_url = $redirect_url;
+						$osparkle = ' sparkle';
+					}
+				}
+			}
+
+
+			$likebuttons = '';
+
+			if($page_writeable) {
+				if($toplevelpost) {
+					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+						'$id' => $item['id'],
+						'$likethis' => t("I like this \x28toggle\x29"),
+						'$nolike' => t("I don't like this \x28toggle\x29"),
+						'$share' => t('Share'),
+						'$wait' => t('Please wait') 
+					));
+				}
+
+				if(($show_comment_box) || (($show_comment_box == false) && ($item['last-child']))) {
+					$comment = replace_macros($cmnt_tpl,array(
+						'$return_path' => '', 
+						'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+						'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+						'$id' => $item['item_id'],
+						'$parent' => $item['parent'],
+						'$profile_uid' =>  $profile_owner,
+						'$mylink' => $a->contact['url'],
+						'$mytitle' => t('This is you'),
+						'$myphoto' => $a->contact['thumb'],
+						'$comment' => t('Comment'),
+						'$submit' => t('Submit'),
+						'$ww' => (($mode === 'network') ? $commentww : '')
+					));
+				}
+			}
+
+			$edpost = ((($profile_owner == local_user()) && ($toplevelpost) && (intval($item['wall']) == 1))
+					? '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] 
+						. '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>'
+					: '');
+			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+			$photo = $item['photo'];
+			$thumb = $item['thumb'];
+
+			// Post was remotely authored.
+
+			$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+
+			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
+			if($mode === 'profile') {
+				if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
+	                $profile_link = $redirect_url;
+    	            $sparkle = ' sparkle';
+        	    }
+				else {
+					$profile_link = $item['url'];
+					$sparkle = '';
+				}
+			}
+			elseif(strlen($item['author-link'])) {
+				$profile_link = $item['author-link'];
+				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+					$profile_link = $redirect_url;
+					$sparkle = ' sparkle';
+				}
+				elseif(isset($author_contacts[$item['author-link']])) {
+					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+					$sparkle = ' sparkle';
+				}
+			}
+			else 
+				$profile_link = $item['url'];
+
+			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+
+			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] 
+				. '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] 
+				. '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+			if($coord) {
+				if($location)
+					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+				else
+					$location = '<span class="smalltext">' . $coord . '</span>';
+			}
+
+			$indent = (($toplevelpost) ? '' : ' comment');
+
+			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+				$indent .= ' shiny'; 
+
+			// Build the HTML
+
+			$tmp_item = replace_macros($template,array(
+				'$id' => $item['item_id'],
+				'$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
+				'$olinktitle' => sprintf( t('View %s\'s profile'), $owner_name),
+				'$to' => t('to'),
+				'$wall' => t('Wall-to-Wall'),
+				'$vwall' => t('via Wall-To-Wall:'),
+				'$profile_url' => $profile_link,
+				'$item_photo_menu' => item_photo_menu($item),
+				'$name' => $profile_name,
+				'$thumb' => $profile_avatar,
+				'$osparkle' => $osparkle,
+				'$sparkle' => $sparkle,
+				'$title' => $item['title'],
+				'$body' => smilies(bbcode($item['body'])),
+				'$ago' => relative_date($item['created']),
+				'$lock' => $lock,
+				'$location' => $location,
+				'$indent' => $indent,
+				'$owner_url' => $owner_url,
+				'$owner_photo' => $owner_photo,
+				'$owner_name' => $owner_name,
+				'$plink' => get_plink($item),
+				'$edpost' => $edpost,
+				'$drop' => $drop,
+				'$vote' => $likebuttons,
+				'$like' => $like,
+				'$dislike' => $dislike,
+				'$comment' => $comment
+			));
+
+			$arr = array('item' => $item, 'output' => $tmp_item);
+			call_hooks('display_item', $arr);
+
+			$o .= $arr['output'];
+
+		}
+	}
+
+
+	// if author collapsing is in force but didn't get closed, close it off now.
+
+	if($blowhard_count >= 3)
+		$o .= '</div>';
+
+	return $o;
+} 
\ No newline at end of file
diff --git a/include/items.php b/include/items.php
index 596946681..86579512e 100644
--- a/include/items.php
+++ b/include/items.php
@@ -867,14 +867,14 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if($dissolve)
 		$postvars['dissolve'] = '1';
 
-	if(($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked']) && (! $contact['readonly'])) {
-		$postvars['data'] = $atom;
-	}
-	elseif($owner['page-flags'] == PAGE_COMMUNITY) {
+
+	if((($contact['rel']) && ($contact['rel'] != REL_FAN) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
 		$postvars['data'] = $atom;
+		$postvars['perm'] = 'rw';
 	}
 	else {
 		$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
+		$postvars['perm'] = 'r';
 	}
 
 	if($rino && $rino_allowed && (! $dissolve)) {
@@ -916,7 +916,6 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if((! $curl_stat) || (! strlen($xml)))
 		return(-1); // timed out
 
-
 	if(strpos($xml,'<?xml') === false) {
 		logger('dfrn_deliver: phase 2: no valid XML returned');
 		logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
@@ -925,8 +924,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
 	$res = parse_xml_string($xml);
 
-	return $res->status;
- 
+	return $res->status; 
 }
 
 
@@ -1369,8 +1367,8 @@ function new_follower($importer,$contact,$datarray,$item) {
 		// create contact record - set to readonly
 
 		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `name`, `nick`, `photo`, `network`, `rel`, 
-			`blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 1, 1 ) ",
+			`blocked`, `readonly`, `pending`, `writable` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, 0, 1, 1, 1 ) ",
 			intval($importer['uid']),
 			dbesc(datetime_convert()),
 			dbesc($url),
diff --git a/include/main.js b/include/main.js
index 18e884b31..8779f8413 100644
--- a/include/main.js
+++ b/include/main.js
@@ -255,3 +255,26 @@
          return false;  
 	}
 
+
+    function bin2hex(s){  
+        // Converts the binary representation of data to hex    
+        //   
+        // version: 812.316  
+        // discuss at: http://phpjs.org/functions/bin2hex  
+        // +   original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)  
+        // +   bugfixed by: Onno Marsman  
+        // +   bugfixed by: Linuxworld  
+        // *     example 1: bin2hex('Kev');  
+        // *     returns 1: '4b6576'  
+        // *     example 2: bin2hex(String.fromCharCode(0x00));  
+        // *     returns 2: '00'  
+        var v,i, f = 0, a = [];  
+        s += '';  
+        f = s.length;  
+          
+        for (i = 0; i<f; i++) {  
+            a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");  
+        }  
+          
+        return a.join('');  
+    }  
\ No newline at end of file
diff --git a/include/nav.php b/include/nav.php
index b8b65f84d..703d8da40 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -61,6 +61,12 @@ function nav(&$a) {
 		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
 			. t('Register') . "</a>\r\n";
 
+	$help_url = get_config('system','help_url');
+	if(! $help_url)
+		$help_url = 'http://github.com/friendika/friendika/wiki';
+
+	$a->page['nav'] .= '<a id="nav-help-link" class="nav-link" target="friendika-help" href="' . $help_url . '">' . t('Help') . "</a>\r\n";
+
 	if(strlen($a->apps)) {
 		$a->page['nav'] .= '<a id="nav-apps-link" class="nav-link" href="apps">' . t('Apps') . "</a>\r\n";
 	}
diff --git a/include/notifier.php b/include/notifier.php
index ca2304845..9d74f8b9b 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -354,6 +354,7 @@ function notifier_run($argv, $argc){
 				case 'mail':
 				case 'dspr':
 				case 'feed':
+				case 'face':
 				default:
 					break;
 			}
diff --git a/include/poller.php b/include/poller.php
index 9362c28b3..b878ef295 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -165,11 +165,15 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['dfrn-id'])
 					$idtosend = '0:' . $orig_id;
 				if(intval($contact['duplex']) && $contact['issued-id'])
-					$idtosend = '1:' . $orig_id;		
+					$idtosend = '1:' . $orig_id;
+
+				// they have permission to write to us. We already filtered this in the contact query.
+				$perm = 'rw';
 
 				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
-					. '&type=data&last_update=' . $last_update ;
+					. '&type=data&last_update=' . $last_update 
+					. '&perm=' . $perm ;
 	
 				$xml = fetch_url($url);
 
@@ -250,13 +254,14 @@ function poller_run($argv, $argc){
 					$final_dfrn_id = substr($final_dfrn_id,2);
 
 				if($final_dfrn_id != $orig_id) {
-	
+					logger('poller: ID did not decode: ' . $contact['id'] . ' orig: ' . $orig_id . ' final: ' . $final_dfrn_id);	
 					// did not decode properly - cannot trust this site 
 					continue;
 				}
 
 				$postvars['dfrn_id'] = $idtosend;
 				$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
+				$postvars['perm'] = 'rw';
 
 				$xml = post_url($contact['poll'],$postvars);
 			}
@@ -264,6 +269,11 @@ function poller_run($argv, $argc){
 
 				// $contact['network'] !== 'dfrn'
 
+				if(($contact['notify']) && (! $contact['writable'])) {
+					q("UPDATE `contact` SET `writable` = 1 WHERE `id` = %d LIMIT 1",
+						intval($contact['id'])
+					);
+				}
 				$xml = fetch_url($contact['poll']);
 			}
 
diff --git a/view/fr/profile_advanced.php b/include/profile_advanced.php
index e5e046025..c1dfad66f 100644
--- a/view/fr/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -1,46 +1,54 @@
 <?php
 
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profil</h2>
+function advanced_profile(&$a) {
 
+$o .= '';
 
-EOT;
+$o .= '<h2>' . t('Profile') . '</h2>';
 
 if($a->profile['name']) {
+	$lbl_fullname = t('Full Name:');
+	$fullname = $a->profile['name'];
+
 $o .= <<< EOT
 <div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Nom complet:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
+<div id="advanced-profile-name-text">$lbl_fullname</div>
+<div id="advanced-profile-name">$fullname</div>
 </div>
 <div id="advanced-profile-name-end"></div>
 EOT;
 }
 
 if($a->profile['gender']) {
+	$lbl_gender = t('Gender:');
+	$gender = $a->profile['gender'];
+
 $o .= <<< EOT
 <div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Genre:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
+<div id="advanced-profile-gender-text">$lbl_gender</div>
+<div id="advanced-profile-gender">$gender</div>
 </div>
 <div id="advanced-profile-gender-end"></div>
 EOT;
 }
 
 if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
+	$lbl_birthday = t('Birthday:');
+
 $o .= <<< EOT
 <div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Date de naissance/anniversaire:</div>
+<div id="advanced-profile-dob-text">$lbl_birthday</div>
 EOT;
 
 // If no year, add an arbitrary one so just we can parse the month and day.
 
+$year_bd_format = t('j F, Y');
+$short_bd_format = t('j F');
+
 $o .= '<div id="advanced-profile-dob">' 
 	. ((intval($a->profile['dob'])) 
-		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'],'j F Y'))
-		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6),'j F'))) 
+		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
+		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format))) 
 	. "</div>\r\n</div>";
 
 $o .= '<div id="advanced-profile-dob-end"></div>';
@@ -48,9 +56,10 @@ $o .= '<div id="advanced-profile-dob-end"></div>';
 }
 
 if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
+	$lbl_age = t('Age:');
 $o .= <<< EOT
 <div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
+<div id="advanced-profile-age-text">$lbl_age</div>
 <div id="advanced-profile-age">$age</div>
 </div>
 <div id="advanced-profile-age-end"></div>
@@ -58,14 +67,19 @@ EOT;
 }
 
 if($a->profile['marital']) {
+	$lbl_marital = t('<span class="heart">&hearts;</span> Status:');
+	$marital = $a->profile['marital'];
+
 $o .= <<< EOT
 <div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Statut:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
+<div id="advanced-profile-marital-text">$lbl_marital</div>
+<div id="advanced-profile-marital">$marital</div>
 EOT;
 
-if($a->profile['with'])
-	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
+if($a->profile['with']) {
+	$with = $a->profile['with'];
+	$o .= "<div id=\"advanced-profile-with\">($with)</div>";
+}
 $o .= <<< EOT
 </div>
 <div id="advanced-profile-marital-end"></div>
@@ -73,20 +87,24 @@ EOT;
 }
 
 if($a->profile['sexual']) {
+	$lbl_sexual = t('Sexual Preference:');
+	$sexual = $a->profile['sexual'];
+
 $o .= <<< EOT
 <div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Attirances sexuelles:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
+<div id="advanced-profile-sexual-text">$lbl_sexual</div>
+<div id="advanced-profile-sexual">$sexual</div>
 </div>
 <div id="advanced-profile-sexual-end"></div>
 EOT;
 }
 
 if($a->profile['homepage']) {
+	$lbl_homepage = t('Homepage:');
 	$homepage = linkify($a->profile['homepage']);
 $o .= <<< EOT
 <div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Site web:</div>
+<div id="advanced-profile-homepage-text">$lbl_homepage</div>
 <div id="advanced-profile-homepage">$homepage</div>
 </div>
 <div id="advanced-profile-homepage-end"></div>
@@ -94,29 +112,33 @@ EOT;
 }
 
 if($a->profile['politic']) {
+	$lbl_politic = t('Political Views:');
+	$politic = $a->profile['politic'];
 $o .= <<< EOT
 <div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Opinions politiques:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
+<div id="advanced-profile-politic-text">$lbl_politic</div>
+<div id="advanced-profile-politic">$politic</div>
 </div>
 <div id="advanced-profile-politic-end"></div>
 EOT;
 }
 
 if($a->profile['religion']) {
+	$lbl_religion = t('Religion:');
+	$religion = $a->profile['religion'];
 $o .= <<< EOT
 <div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
+<div id="advanced-profile-religion-text">$lbl_religion</div>
+<div id="advanced-profile-religion">$religion</div>
 </div>
 <div id="advanced-profile-religion-end"></div>
 EOT;
 }
-
 if($txt = prepare_text($a->profile['about'])) {
+	$lbl_about = t('About:');
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">À propos:</div>
+<div id="advanced-profile-about-text">$lbl_about</div>
 <br />
 <div id="advanced-profile-about">$txt</div>
 </div>
@@ -125,9 +147,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['interest'])) {
+	$lbl_interests = t('Hobbies/Interests:');
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Marottes/Centres d'intérêt:</div>
+<div id="advanced-profile-interest-text">$lbl_interests</div>
 <br />
 <div id="advanced-profile-interest">$txt</div>
 </div>
@@ -136,9 +159,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['contact'])) {
+	$lbl_contact = t('Contact information and Social Networks:');
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Coordonées et réseaux sociaux:</div>
+<div id="advanced-profile-contact-text">$lbl_contact</div>
 <br />
 <div id="advanced-profile-contact">$txt</div>
 </div>
@@ -147,9 +171,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['music'])) {
+	$lbl_music = t('Musical interests:');
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Goûts musicaux:</div>
+<div id="advanced-profile-music-text">$lbl_music</div>
 <br />
 <div id="advanced-profile-music">$txt</div>
 </div>
@@ -158,9 +183,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['book'])) {
+	$lbl_book = t('Books, literature:');
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Livres, littérature:</div>
+<div id="advanced-profile-book-text">$lbl_book</div>
 <br />
 <div id="advanced-profile-book">$txt</div>
 </div>
@@ -169,9 +195,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['tv'])) {
+	$lbl_tv = t('Television:');
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Télévision:</div>
+<div id="advanced-profile-tv-text">$lbl_tv</div>
 <br />
 <div id="advanced-profile-tv">$txt</div>
 </div>
@@ -180,9 +207,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['film'])) {
+	$lbl_film = t('Film/dance/culture/entertainment:');
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Cinéma/Danse/Culture/Divertissement:</div>
+<div id="advanced-profile-film-text">$lbl_film</div>
 <br />
 <div id="advanced-profile-film">$txt</div>
 </div>
@@ -191,9 +219,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['romance'])) {
+	$lbl_romance = t('Love/Romance:');
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Amour/Passion:</div>
+<div id="advanced-profile-romance-text">$lbl_romance</div>
 <br />
 <div id="advanced-profile-romance">$txt</div>
 </div>
@@ -202,9 +231,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['work'])) {
+	$lbl_work = t('Work/employment:');
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Travail/Activité professionnelle:</div>
+<div id="advanced-profile-work-text">$lbl_work</div>
 <br />
 <div id="advanced-profile-work">$txt</div>
 </div>
@@ -213,9 +243,10 @@ EOT;
 }
 
 if($txt = prepare_text($a->profile['education'])) {
+	$lbl_education = t('School/education:');
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">École/études:</div>
+<div id="advanced-profile-education-text">$lbl_education</div>
 <br />
 <div id="advanced-profile-education">$txt</div>
 </div>
@@ -223,4 +254,5 @@ $o .= <<< EOT
 EOT;
 }
 
-
+return $o;
+}
diff --git a/library/markdown.php b/library/markdown.php
new file mode 100644
index 000000000..d51dceeca
--- /dev/null
+++ b/library/markdown.php
@@ -0,0 +1,3042 @@
+<?php
+#
+# Markdown Extra  -  A text-to-HTML conversion tool for web writers
+#
+# PHP Markdown & Extra
+# Copyright (c) 2004-2008 Michel Fortin
+# <http://www.michelf.com/projects/php-markdown/>
+#
+# Original Markdown
+# Copyright (c) 2004-2006 John Gruber
+# <http://daringfireball.net/projects/markdown/>
+#
+
+
+define( 'MARKDOWN_VERSION',  "1.0.1m" ); # Sat 21 Jun 2008
+define( 'MARKDOWNEXTRA_VERSION',  "1.2.3" ); # Wed 31 Dec 2008
+
+
+#
+# Global default settings:
+#
+
+# Change to ">" for HTML output
+@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+
+# Define the width of a tab for code blocks.
+@define( 'MARKDOWN_TAB_WIDTH',     4 );
+
+# Optional title attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+
+# Optional class attribute for footnote links and backlinks.
+@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
+@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+
+# Enables special handling for links pointing outside of the current domain.
+@define( 'MARKDOWN_EL_ENABLE',          true);   # Use this feature at all?
+@define( 'MARKDOWN_EL_LOCAL_DOMAIN',    null);   # Leave as null to autodetect
+@define( 'MARKDOWN_EL_NEW_WINDOW',      true);   # Open link in a new browser?
+@define( 'MARKDOWN_EL_CSS_CLASS', 'external');   # Leave as null for no class
+
+# Enables header auto-self-linking.
+@define( 'MARKDOWN_HA_ENABLE',             true );   # Use this feature at all?
+@define( 'MARKDOWN_HA_CLASS', 'hidden-selflink' );   # Leave as null for no class
+@define( 'MARKDOWN_HA_TEXT',           '&larr;' );   # The text to use as the link
+
+
+#
+# WordPress settings:
+#
+
+# Change to false to remove Markdown from posts and/or comments.
+@define( 'MARKDOWN_WP_POSTS',      true );
+@define( 'MARKDOWN_WP_COMMENTS',   true );
+
+
+
+### Standard Function Interface ###
+
+@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+
+function Markdown($text) {
+#
+# Initialize the parser and return the result of its transform method.
+#
+	# Setup static parser variable.
+	static $parser;
+	if (!isset($parser)) {
+		$parser_class = MARKDOWN_PARSER_CLASS;
+		$parser = new $parser_class;
+	}
+
+	# Transform text using parser.
+	return $parser->transform($text);
+}
+
+
+### WordPress Plugin Interface ###
+
+/*
+Plugin Name: Markdown Extra
+Plugin URI: http://www.michelf.com/projects/php-markdown/
+Description: <a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>
+Version: 1.2.2
+Author: Michel Fortin
+Author URI: http://www.michelf.com/
+*/
+
+if (isset($wp_version)) {
+	# More details about how it works here:
+	# <http://www.michelf.com/weblog/2005/wordpress-text-flow-vs-markdown/>
+
+	# Post content and excerpts
+	# - Remove WordPress paragraph generator.
+	# - Run Markdown on excerpt, then remove all tags.
+	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
+	if (MARKDOWN_WP_POSTS) {
+		remove_filter('the_content',     'wpautop');
+        remove_filter('the_content_rss', 'wpautop');
+		remove_filter('the_excerpt',     'wpautop');
+		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+        add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
+		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
+		add_filter('get_the_excerpt', 'trim', 7);
+		add_filter('the_excerpt',     'mdwp_add_p');
+		add_filter('the_excerpt_rss', 'mdwp_strip_p');
+
+		remove_filter('content_save_pre',  'balanceTags', 50);
+		remove_filter('excerpt_save_pre',  'balanceTags', 50);
+		add_filter('the_content',  	  'balanceTags', 50);
+		add_filter('get_the_excerpt', 'balanceTags', 9);
+	}
+
+	# Add a footnote id prefix to posts when inside a loop.
+	function mdwp_MarkdownPost($text) {
+		static $parser;
+		if (!$parser) {
+			$parser_class = MARKDOWN_PARSER_CLASS;
+			$parser = new $parser_class;
+		}
+		if (is_single() || is_page() || is_feed()) {
+			$parser->fn_id_prefix = "";
+		} else {
+			$parser->fn_id_prefix = get_the_ID() . ".";
+		}
+		return $parser->transform($text);
+	}
+
+	# Comments
+	# - Remove WordPress paragraph generator.
+	# - Remove WordPress auto-link generator.
+	# - Scramble important tags before passing them to the kses filter.
+	# - Run Markdown on excerpt then remove paragraph tags.
+	if (MARKDOWN_WP_COMMENTS) {
+		remove_filter('comment_text', 'wpautop', 30);
+		remove_filter('comment_text', 'make_clickable');
+		add_filter('pre_comment_content', 'Markdown', 6);
+		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
+		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
+		add_filter('get_comment_text',    'Markdown', 6);
+		add_filter('get_comment_excerpt', 'Markdown', 6);
+		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
+
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		$mdwp_hidden_tags = explode(' ',
+			'<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>');
+		$mdwp_placeholders = explode(' ', str_rot13(
+			'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
+			'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
+	}
+
+	function mdwp_add_p($text) {
+		if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
+			$text = '<p>'.$text.'</p>';
+			$text = preg_replace('{\n{2,}}', "</p>\n\n<p>", $text);
+		}
+		return $text;
+	}
+
+	function mdwp_strip_p($t) { return preg_replace('{</?p>}i', '', $t); }
+
+	function mdwp_hide_tags($text) {
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		return str_replace($mdwp_hidden_tags, $mdwp_placeholders, $text);
+	}
+	function mdwp_show_tags($text) {
+		global $mdwp_hidden_tags, $mdwp_placeholders;
+		return str_replace($mdwp_placeholders, $mdwp_hidden_tags, $text);
+	}
+}
+
+
+### bBlog Plugin Info ###
+
+function identify_modifier_markdown() {
+	return array(
+		'name' => 'markdown',
+		'type' => 'modifier',
+		'nicename' => 'PHP Markdown Extra',
+		'description' => 'A text-to-HTML conversion tool for web writers',
+		'authors' => 'Michel Fortin and John Gruber',
+		'licence' => 'GPL',
+		'version' => MARKDOWNEXTRA_VERSION,
+		'help' => '<a href="http://daringfireball.net/projects/markdown/syntax">Markdown syntax</a> allows you to write using an easy-to-read, easy-to-write plain text format. Based on the original Perl version by <a href="http://daringfireball.net/">John Gruber</a>. <a href="http://www.michelf.com/projects/php-markdown/">More...</a>',
+		);
+}
+
+
+### Smarty Modifier Interface ###
+
+function smarty_modifier_markdown($text) {
+	return Markdown($text);
+}
+
+
+### Textile Compatibility Mode ###
+
+# Rename this file to "classTextile.php" and it can replace Textile everywhere.
+
+if (strcasecmp(substr(__FILE__, -16), "classTextile.php") == 0) {
+	# Try to include PHP SmartyPants. Should be in the same directory.
+	@include_once 'smartypants.php';
+	# Fake Textile class. It calls Markdown instead.
+	class Textile {
+		function TextileThis($text, $lite='', $encode='') {
+			if ($lite == '' && $encode == '')    $text = Markdown($text);
+			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+			return $text;
+		}
+		# Fake restricted version: restrictions are not supported for now.
+		function TextileRestricted($text, $lite='', $noimage='') {
+			return $this->TextileThis($text, $lite);
+		}
+		# Workaround to ensure compatibility with TextPattern 4.0.3.
+		function blockLite($text) { return $text; }
+	}
+}
+
+
+
+#
+# Markdown Parser Class
+#
+
+class Markdown_Parser {
+
+	# Regex to match balanced [brackets].
+	# Needed to insert a maximum bracked depth while converting to PHP.
+	var $nested_brackets_depth = 6;
+	var $nested_brackets_re;
+
+	var $nested_url_parenthesis_depth = 4;
+	var $nested_url_parenthesis_re;
+
+	# Table of hash values for escaped characters:
+	var $escape_chars = '\`*_{}[]()>#+-.!';
+	var $escape_chars_re;
+
+	# Change to ">" for HTML output.
+	var $empty_element_suffix = MARKDOWN_EMPTY_ELEMENT_SUFFIX;
+	var $tab_width = MARKDOWN_TAB_WIDTH;
+
+	# Change to `true` to disallow markup or entities.
+	var $no_markup = false;
+	var $no_entities = false;
+
+	# Predefined urls and titles for reference links and images.
+	var $predef_urls = array();
+	var $predef_titles = array();
+
+
+	function Markdown_Parser() {
+	#
+	# Constructor function. Initialize appropriate member variables.
+	#
+		$this->_initDetab();
+		$this->prepareItalicsAndBold();
+
+		$this->nested_brackets_re =
+			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+			str_repeat('\])*', $this->nested_brackets_depth);
+
+		$this->nested_url_parenthesis_re =
+			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
+
+		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+
+		# Sort document, block, and span gamut in ascendent priority order.
+		asort($this->document_gamut);
+		asort($this->block_gamut);
+		asort($this->span_gamut);
+	}
+
+
+	# Internal hashes used during transformation.
+	var $urls = array();
+	var $titles = array();
+	var $html_hashes = array();
+
+	# Status flag to avoid invalid nesting.
+	var $in_anchor = false;
+
+
+	function setup() {
+	#
+	# Called before the transformation process starts to setup parser
+	# states.
+	#
+		# Clear global hashes.
+		$this->urls = $this->predef_urls;
+		$this->titles = $this->predef_titles;
+		$this->html_hashes = array();
+
+		$in_anchor = false;
+	}
+
+	function teardown() {
+	#
+	# Called after the transformation process to clear any variable
+	# which may be taking up memory unnecessarly.
+	#
+		$this->urls = array();
+		$this->titles = array();
+		$this->html_hashes = array();
+	}
+
+
+	function transform($text) {
+	#
+	# Main function. Performs some preprocessing on the input text
+	# and pass it through the document gamut.
+	#
+		$this->setup();
+
+		# Remove UTF-8 BOM and marker character in input, if present.
+		$text = preg_replace('{^\xEF\xBB\xBF|\x1A}', '', $text);
+
+		# Standardize line endings:
+		#   DOS to Unix and Mac to Unix
+		$text = preg_replace('{\r\n?}', "\n", $text);
+
+		# Make sure $text ends with a couple of newlines:
+		$text .= "\n\n";
+
+		# Convert all tabs to spaces.
+		$text = $this->detab($text);
+
+		# Turn block-level HTML blocks into hash entries
+		$text = $this->hashHTMLBlocks($text);
+
+		# Strip any lines consisting only of spaces and tabs.
+		# This makes subsequent regexen easier to write, because we can
+		# match consecutive blank lines with /\n+/ instead of something
+		# contorted like /[ ]*\n+/ .
+		$text = preg_replace('/^[ ]+$/m', '', $text);
+
+		# Run document gamut methods.
+		foreach ($this->document_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+
+		$this->teardown();
+
+		return $text . "\n";
+	}
+
+	var $document_gamut = array(
+		# Strip link definitions, store in hashes.
+		"stripLinkDefinitions" => 20,
+
+		"runBasicBlockGamut"   => 30,
+		);
+
+
+	function stripLinkDefinitions($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: ^[id]: url "optional title"
+		$text = preg_replace_callback('{
+							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							  [ ]*
+							  \n?				# maybe *one* newline
+							  [ ]*
+							<?(\S+?)>?			# url = $2
+							  [ ]*
+							  \n?				# maybe one newline
+							  [ ]*
+							(?:
+								(?<=\s)			# lookbehind for whitespace
+								["(]
+								(.*?)			# title = $3
+								[")]
+								[ ]*
+							)?	# title is optional
+							(?:\n+|\Z)
+			}xm',
+			array(&$this, '_stripLinkDefinitions_callback'),
+			$text);
+		return $text;
+	}
+	function _stripLinkDefinitions_callback($matches) {
+		$link_id = strtolower($matches[1]);
+		$this->urls[$link_id] = $matches[2];
+		$this->titles[$link_id] =& $matches[3];
+		return ''; # String that will replace the block
+	}
+
+
+	function hashHTMLBlocks($text) {
+		if ($this->no_markup)  return $text;
+
+		$less_than_tab = $this->tab_width - 1;
+
+		# Hashify HTML blocks:
+		# We only want to do this for block-level HTML tags, such as headers,
+		# lists, and tables. That's because we still want to wrap <p>s around
+		# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+		# phrase emphasis, and spans. The list of tags we're looking for is
+		# hard-coded:
+		#
+		# *  List "a" is made of tags which can be both inline or block-level.
+		#    These will be treated block-level when the start tag is alone on
+		#    its line, otherwise they're not matched here and will be taken as
+		#    inline later.
+		# *  List "b" is made of tags which are always block-level;
+		#
+		$block_tags_a_re = 'ins|del';
+		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
+						   'script|noscript|form|fieldset|iframe|math|textarea';
+
+		# Regular expression for the content of a block tag.
+		$nested_tags_level = 4;
+		$attr = '
+			(?>				# optional tag attributes
+			  \s			# starts with whitespace
+			  (?>
+				[^>"/]+		# text outside quotes
+			  |
+				/+(?!>)		# slash not followed by ">"
+			  |
+				"[^"]*"		# text inside double quotes (tolerate ">")
+			  |
+				\'[^\']*\'	# text inside single quotes (tolerate ">")
+			  )*
+			)?
+			';
+		$content =
+			str_repeat('
+				(?>
+				  [^<]+			# content without tag
+				|
+				  <\2			# nested opening tag
+					'.$attr.'	# attributes
+					(?>
+					  />
+					|
+					  >', $nested_tags_level).	# end of opening tag
+					  '.*?'.					# last level nested tag content
+			str_repeat('
+					  </\2\s*>	# closing nested tag
+					)
+				  |
+					<(?!/\2\s*>	# other tags with a different name
+				  )
+				)*',
+				$nested_tags_level);
+		$content2 = str_replace('\2', '\3', $content);
+
+		# First, look for nested blocks, e.g.:
+		# 	<div>
+		# 		<div>
+		# 		tags for inner block must be indented.
+		# 		</div>
+		# 	</div>
+		#
+		# The outermost tags must start at the left margin for this to match, and
+		# the inner nested divs must be indented.
+		# We need to do this before the next, more liberal match, because the next
+		# match will start at the first `<div>` and stop at the first `</div>`.
+		$text = preg_replace_callback('{(?>
+			(?>
+				(?<=\n\n)		# Starting after a blank line
+				|				# or
+				\A\n?			# the beginning of the doc
+			)
+			(						# save in $1
+
+			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags
+			  # in between.
+
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_b_re.')# start tag = $2
+						'.$attr.'>			# attributes followed by > and \n
+						'.$content.'		# content, support nesting
+						</\2>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+
+			| # Special version for tags of group a.
+
+						[ ]{0,'.$less_than_tab.'}
+						<('.$block_tags_a_re.')# start tag = $3
+						'.$attr.'>[ ]*\n	# attributes followed by >
+						'.$content2.'		# content, support nesting
+						</\3>				# the matching end tag
+						[ ]*				# trailing spaces/tabs
+						(?=\n+|\Z)	# followed by a newline or end of document
+
+			| # Special case just for <hr />. It was easier to make a special
+			  # case than to make the other regex more complicated.
+
+						[ ]{0,'.$less_than_tab.'}
+						<(hr)				# start tag = $2
+						'.$attr.'			# attributes
+						/?>					# the matching end tag
+						[ ]*
+						(?=\n{2,}|\Z)		# followed by a blank line or end of document
+
+			| # Special case for standalone HTML comments:
+
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<!-- .*? -->
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+
+			| # PHP and ASP-style processor instructions (<? and <%)
+
+					[ ]{0,'.$less_than_tab.'}
+					(?s:
+						<([?%])			# $2
+						.*?
+						\2>
+					)
+					[ ]*
+					(?=\n{2,}|\Z)		# followed by a blank line or end of document
+
+			)
+			)}Sxmi',
+			array(&$this, '_hashHTMLBlocks_callback'),
+			$text);
+
+		return $text;
+	}
+	function _hashHTMLBlocks_callback($matches) {
+		$text = $matches[1];
+		$key  = $this->hashBlock($text);
+		return "\n\n$key\n\n";
+	}
+
+
+	function hashPart($text, $boundary = 'X') {
+	#
+	# Called whenever a tag must be hashed when a function insert an atomic
+	# element in the text stream. Passing $text to through this function gives
+	# a unique text-token which will be reverted back when calling unhash.
+	#
+	# The $boundary argument specify what character should be used to surround
+	# the token. By convension, "B" is used for block elements that needs not
+	# to be wrapped into paragraph tags at the end, ":" is used for elements
+	# that are word separators and "X" is used in the general case.
+	#
+		# Swap back any tag hash found in $text so we do not have to `unhash`
+		# multiple times at the end.
+		$text = $this->unhash($text);
+
+		# Then hash the block.
+		static $i = 0;
+		$key = "$boundary\x1A" . ++$i . $boundary;
+		$this->html_hashes[$key] = $text;
+		return $key; # String that will replace the tag.
+	}
+
+
+	function hashBlock($text) {
+	#
+	# Shortcut function for hashPart with block-level boundaries.
+	#
+		return $this->hashPart($text, 'B');
+	}
+
+
+	var $block_gamut = array(
+	#
+	# These are all the transformations that form block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		"doHeaders"         => 10,
+		"doHorizontalRules" => 20,
+
+		"doLists"           => 40,
+		"doCodeBlocks"      => 50,
+		"doBlockQuotes"     => 60,
+		);
+
+	function runBlockGamut($text) {
+	#
+	# Run block gamut tranformations.
+	#
+		# We need to escape raw HTML in Markdown source before doing anything
+		# else. This need to be done for each block, and not only at the
+		# begining in the Markdown function since hashed blocks can be part of
+		# list items and could have been indented. Indented blocks would have
+		# been seen as a code block in a previous pass of hashHTMLBlocks.
+		$text = $this->hashHTMLBlocks($text);
+
+		return $this->runBasicBlockGamut($text);
+	}
+
+	function runBasicBlockGamut($text) {
+	#
+	# Run block gamut tranformations, without hashing HTML blocks. This is
+	# useful when HTML blocks are known to be already hashed, like in the first
+	# whole-document pass.
+	#
+		foreach ($this->block_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+
+		# Finally form paragraph and restore hashed blocks.
+		$text = $this->formParagraphs($text);
+
+		return $text;
+	}
+
+
+	function doHorizontalRules($text) {
+		# Do Horizontal Rules:
+		return preg_replace(
+			'{
+				^[ ]{0,3}	# Leading space
+				([-*_])		# $1: First marker
+				(?>			# Repeated marker group
+					[ ]{0,2}	# Zero, one, or two spaces.
+					\1			# Marker character
+				){2,}		# Group repeated at least twice
+				[ ]*		# Tailing spaces
+				$			# End of line.
+			}mx',
+			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n",
+			$text);
+	}
+
+
+	var $span_gamut = array(
+	#
+	# These are all the transformations that occur *within* block-level
+	# tags like paragraphs, headers, and list items.
+	#
+		# Process character escapes, code spans, and inline HTML
+		# in one shot.
+		"parseSpan"           => -30,
+
+		# Process anchor and image tags. Images must come first,
+		# because ![foo][f] looks like an anchor.
+		"doImages"            =>  10,
+		"doAnchors"           =>  20,
+
+		# Make links out of things like `<http://example.com/>`
+		# Must come after doAnchors, because you can use < and >
+		# delimiters in inline links like [this](<url>).
+		"doAutoLinks"         =>  30,
+		"encodeAmpsAndAngles" =>  40,
+
+		"doItalicsAndBold"    =>  50,
+		"doHardBreaks"        =>  60,
+		);
+
+	function runSpanGamut($text) {
+	#
+	# Run span gamut tranformations.
+	#
+		foreach ($this->span_gamut as $method => $priority) {
+			$text = $this->$method($text);
+		}
+
+		return $text;
+	}
+
+
+	function doHardBreaks($text) {
+		# Do hard breaks:
+		return preg_replace_callback('/ {2,}\n/',
+			array(&$this, '_doHardBreaks_callback'), $text);
+	}
+	function _doHardBreaks_callback($matches) {
+		return $this->hashPart("<br$this->empty_element_suffix\n");
+	}
+
+
+	function doAnchors($text) {
+	#
+	# Turn Markdown link shortcuts into XHTML <a> tags.
+	#
+		if ($this->in_anchor) return $text;
+		$this->in_anchor = true;
+
+		#
+		# First, handle reference-style links: [link text] [id]
+		#
+		$text = preg_replace_callback('{
+			(					# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets_re.')	# link text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+			)
+			}xs',
+			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		#
+		# Next, inline-style links: [link text](url "optional title")
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  \[
+				('.$this->nested_brackets_re.')	# link text = $2
+			  \]
+			  \(			# literal paren
+				[ ]*
+				(?:
+					<(\S*)>	# href = $3
+				|
+					('.$this->nested_url_parenthesis_re.')	# href = $4
+				)
+				[ ]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# Title = $7
+				  \6		# matching quote
+				  [ ]*	# ignore any spaces/tabs between closing quote and )
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_DoAnchors_inline_callback'), $text);
+
+		#
+		# Last, handle reference-style shortcuts: [link text]
+		# These must come last in case you've also got [link test][1]
+		# or [link test](/foo)
+		#
+//		$text = preg_replace_callback('{
+//			(					# wrap whole match in $1
+//			  \[
+//				([^\[\]]+)		# link text = $2; can\'t contain [ or ]
+//			  \]
+//			)
+//			}xs',
+//			array(&$this, '_doAnchors_reference_callback'), $text);
+
+		$this->in_anchor = false;
+		return $text;
+	}
+	function _doAnchors_reference_callback($matches) {
+		$whole_match =  $matches[1];
+		$link_text   =  $matches[2];
+		$link_id     =& $matches[3];
+
+		if ($link_id == "") {
+			# for shortcut links like [this][] or [this].
+			$link_id = $link_text;
+		}
+
+		# lower-case and turn embedded newlines into spaces
+		$link_id = strtolower($link_id);
+		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$url = $this->encodeAttribute($url);
+
+			$result = "<a href=\"$url\"";
+			if ( isset( $this->titles[$link_id] ) ) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text</a>";
+			$result = $this->hashPart($result);
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+	function _doAnchors_inline_callback($matches) {
+		$whole_match	=  $matches[1];
+		$link_text		=  $this->runSpanGamut($matches[2]);
+		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$url = $this->encodeAttribute($url);
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		return $this->hashPart($result);
+	}
+
+
+	function doImages($text) {
+	#
+	# Turn Markdown image shortcuts into <img> tags.
+	#
+		#
+		# First, handle reference-style labeled images: ![alt text][id]
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets_re.')		# alt text = $2
+			  \]
+
+			  [ ]?				# one optional space
+			  (?:\n[ ]*)?		# one optional newline followed by spaces
+
+			  \[
+				(.*?)		# id = $3
+			  \]
+
+			)
+			}xs',
+			array(&$this, '_doImages_reference_callback'), $text);
+
+		#
+		# Next, handle inline images:  ![alt text](url "optional title")
+		# Don't forget: encode * and _
+		#
+		$text = preg_replace_callback('{
+			(				# wrap whole match in $1
+			  !\[
+				('.$this->nested_brackets_re.')		# alt text = $2
+			  \]
+			  \s?			# One optional whitespace character
+			  \(			# literal paren
+				[ ]*
+				(?:
+					<(\S*)>	# src url = $3
+				|
+					('.$this->nested_url_parenthesis_re.')	# src url = $4
+				)
+				[ ]*
+				(			# $5
+				  ([\'"])	# quote char = $6
+				  (.*?)		# title = $7
+				  \6		# matching quote
+				  [ ]*
+				)?			# title is optional
+			  \)
+			)
+			}xs',
+			array(&$this, '_doImages_inline_callback'), $text);
+
+		return $text;
+	}
+	function _doImages_reference_callback($matches) {
+		$whole_match = $matches[1];
+		$alt_text    = $matches[2];
+		$link_id     = strtolower($matches[3]);
+
+		if ($link_id == "") {
+			$link_id = strtolower($alt_text); # for shortcut links like ![this][].
+		}
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		if (isset($this->urls[$link_id])) {
+			$url = $this->encodeAttribute($this->urls[$link_id]);
+			$result = "<img src=\"$url\" alt=\"$alt_text\"";
+			if (isset($this->titles[$link_id])) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+			$result .= $this->empty_element_suffix;
+			$result = $this->hashPart($result);
+		}
+		else {
+			# If there's no such link ID, leave intact:
+			$result = $whole_match;
+		}
+
+		return $result;
+	}
+	function _doImages_inline_callback($matches) {
+		$whole_match	= $matches[1];
+		$alt_text		= $matches[2];
+		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$alt_text = $this->encodeAttribute($alt_text);
+		$url = $this->encodeAttribute($url);
+		$result = "<img src=\"$url\" alt=\"$alt_text\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\""; # $title already quoted
+		}
+		$result .= $this->empty_element_suffix;
+
+		return $this->hashPart($result);
+	}
+
+
+	function doHeaders($text) {
+		# Setext-style headers:
+		#	  Header 1
+		#	  ========
+		#
+		#	  Header 2
+		#	  --------
+		#
+		$text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1
+		#	## Header 2
+		#	## Header 2 with closing hashes ##
+		#	...
+		#	###### Header 6
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_callback_setext($matches) {
+		# Terrible hack to check we haven't found an empty list item.
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
+			return $matches[0];
+
+		$level = $matches[2]{0} == '=' ? 1 : 2;
+		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+
+
+	function doLists($text) {
+	#
+	# Form HTML ordered (numbered) and unordered (bulleted) lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul_re  = '[*+-]';
+		$marker_ol_re  = '\d+[.]';
+		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+
+		$markers_relist = array($marker_ul_re, $marker_ol_re);
+
+		foreach ($markers_relist as $marker_re) {
+			# Re-usable pattern to match any entirel ul or ol list:
+			$whole_list_re = '
+				(								# $1 = whole list
+				  (								# $2
+					[ ]{0,'.$less_than_tab.'}
+					('.$marker_re.')			# $3 = first list item marker
+					[ ]+
+				  )
+				  (?s:.+?)
+				  (								# $4
+					  \z
+					|
+					  \n{2,}
+					  (?=\S)
+					  (?!						# Negative lookahead for another list item marker
+						[ ]*
+						'.$marker_re.'[ ]+
+					  )
+				  )
+				)
+			'; // mx
+
+			# We use a different prefix before nested lists than top-level lists.
+			# See extended comment in _ProcessListItems().
+
+			if ($this->list_level) {
+				$text = preg_replace_callback('{
+						^
+						'.$whole_list_re.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+			else {
+				$text = preg_replace_callback('{
+						(?:(?<=\n)\n|\A\n?) # Must eat the newline
+						'.$whole_list_re.'
+					}mx',
+					array(&$this, '_doLists_callback'), $text);
+			}
+		}
+
+		return $text;
+	}
+	function _doLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$marker_ul_re  = '[*+-]';
+		$marker_ol_re  = '\d+[.]';
+		$marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
+
+		$list = $matches[1];
+		$list_type = preg_match("/$marker_ul_re/", $matches[3]) ? "ul" : "ol";
+
+		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+
+		$list .= "\n";
+		$result = $this->processListItems($list, $marker_any_re);
+
+		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
+		return "\n". $result ."\n\n";
+	}
+
+	var $list_level = 0;
+
+	function processListItems($list_str, $marker_any_re) {
+	#
+	#	Process the contents of a single ordered or unordered list, splitting it
+	#	into individual list items.
+	#
+		# The $this->list_level global keeps track of when we're inside a list.
+		# Each time we enter a list, we increment it; when we leave a list,
+		# we decrement. If it's zero, we're not in a list anymore.
+		#
+		# We do this because when we're not inside a list, we want to treat
+		# something like this:
+		#
+		#		I recommend upgrading to version
+		#		8. Oops, now this line is treated
+		#		as a sub-list.
+		#
+		# As a single paragraph, despite the fact that the second line starts
+		# with a digit-period-space sequence.
+		#
+		# Whereas when we're inside a list (or sub-list), that line will be
+		# treated as the start of a sub-list. What a kludge, huh? This is
+		# an aspect of Markdown's syntax that's hard to parse perfectly
+		# without resorting to mind-reading. Perhaps the solution is to
+		# change the syntax rules such that sub-lists must start with a
+		# starting cardinal number; e.g. "1." or "a.".
+
+		$this->list_level++;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		$list_str = preg_replace_callback('{
+			(\n)?							# leading line = $1
+			(^[ ]*)							# leading whitespace = $2
+			('.$marker_any_re.'				# list marker and space = $3
+				(?:[ ]+|(?=\n))	# space only required if item is not empty
+			)
+			((?s:.*?))						# list item text   = $4
+			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
+			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
+			}xm',
+			array(&$this, '_processListItems_callback'), $list_str);
+
+		$this->list_level--;
+		return $list_str;
+	}
+	function _processListItems_callback($matches) {
+		$item = $matches[4];
+		$leading_line =& $matches[1];
+		$leading_space =& $matches[2];
+		$marker_space = $matches[3];
+		$tailing_blank_line =& $matches[5];
+
+		if ($leading_line || $tailing_blank_line ||
+			preg_match('/\n{2,}/', $item))
+		{
+			# Replace marker with the appropriate whitespace indentation
+			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $this->runBlockGamut($this->outdent($item)."\n");
+		}
+		else {
+			# Recursion for sub-lists:
+			$item = $this->doLists($this->outdent($item));
+			$item = preg_replace('/\n+$/', '', $item);
+			$item = $this->runSpanGamut($item);
+		}
+
+		return "<li>" . $item . "</li>\n";
+	}
+
+
+	function doCodeBlocks($text) {
+	#
+	#	Process Markdown `<pre><code>` blocks.
+	#
+		$text = preg_replace_callback('{
+				(?:\n\n|\A\n?)
+				(	            # $1 = the code block -- one or more lines, starting with a space/tab
+				  (?>
+					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					.*\n+
+				  )+
+				)
+				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+			}xm',
+			array(&$this, '_doCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doCodeBlocks_callback($matches) {
+		$codeblock = $matches[1];
+
+		$codeblock = $this->outdent($codeblock);
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+
+		# trim leading newlines and trailing newlines
+		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
+
+		$codeblock = "<pre><code>$codeblock\n</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+
+
+	function makeCodeSpan($code) {
+	#
+	# Create a code span markup for $code. Called from handleSpanToken.
+	#
+		$code = htmlspecialchars(trim($code), ENT_NOQUOTES);
+		return $this->hashPart("<code>$code</code>");
+	}
+
+
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<!_)_(?!_))(?=\S)(?![.,:;]\s)',
+		'*' => '(?<=\S)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S)(?<!_)_(?!_)',
+		);
+	var $strong_relist = array(
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<!_)__(?!_))(?=\S)(?![.,:;]\s)',
+		'**' => '(?<=\S)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S)(?<!_)__(?!_)',
+		);
+	var $em_strong_relist = array(
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<!_)___(?!_))(?=\S)(?![.,:;]\s)',
+		'***' => '(?<=\S)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S)(?<!_)___(?!_)',
+		);
+	var $em_strong_prepared_relist;
+
+	function prepareItalicsAndBold() {
+	#
+	# Prepare regular expressions for seraching emphasis tokens in any
+	# context.
+	#
+		foreach ($this->em_relist as $em => $em_re) {
+			foreach ($this->strong_relist as $strong => $strong_re) {
+				# Construct list of allowed token expressions.
+				$token_relist = array();
+				if (isset($this->em_strong_relist["$em$strong"])) {
+					$token_relist[] = $this->em_strong_relist["$em$strong"];
+				}
+				$token_relist[] = $em_re;
+				$token_relist[] = $strong_re;
+
+				# Construct master expression from list.
+				$token_re = '{('. implode('|', $token_relist) .')}';
+				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
+			}
+		}
+	}
+
+	function doItalicsAndBold($text) {
+		$token_stack = array('');
+		$text_stack = array('');
+		$em = '';
+		$strong = '';
+		$tree_char_em = false;
+
+		while (1) {
+			#
+			# Get prepared regular expression for seraching emphasis tokens
+			# in current context.
+			#
+			$token_re = $this->em_strong_prepared_relist["$em$strong"];
+
+			#
+			# Each loop iteration seach for the next emphasis token.
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+			$text_stack[0] .= $parts[0];
+			$token =& $parts[1];
+			$text =& $parts[2];
+
+			if (empty($token)) {
+				# Reached end of text span: empty stack without emitting.
+				# any more emphasis.
+				while ($token_stack[0]) {
+					$text_stack[1] .= array_shift($token_stack);
+					$text_stack[0] .= array_shift($text_stack);
+				}
+				break;
+			}
+
+			$token_len = strlen($token);
+			if ($tree_char_em) {
+				# Reached closing marker while inside a three-char emphasis.
+				if ($token_len == 3) {
+					# Three-char closing marker, close em and strong.
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong><em>$span</em></strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$em = '';
+					$strong = '';
+				} else {
+					# Other closing marker: close one em or strong and
+					# change current token state to match the other
+					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$tag = $token_len == 2 ? "strong" : "em";
+					$span = $text_stack[0];
+					$span = $this->runSpanGamut($span);
+					$span = "<$tag>$span</$tag>";
+					$text_stack[0] = $this->hashPart($span);
+					$$tag = ''; # $$tag stands for $em or $strong
+				}
+				$tree_char_em = false;
+			} else if ($token_len == 3) {
+				if ($em) {
+					# Reached closing marker for both em and strong.
+					# Closing strong marker:
+					for ($i = 0; $i < 2; ++$i) {
+						$shifted_token = array_shift($token_stack);
+						$tag = strlen($shifted_token) == 2 ? "strong" : "em";
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<$tag>$span</$tag>";
+						$text_stack[0] .= $this->hashPart($span);
+						$$tag = ''; # $$tag stands for $em or $strong
+					}
+				} else {
+					# Reached opening three-char emphasis marker. Push on token
+					# stack; will be handled by the special condition above.
+					$em = $token{0};
+					$strong = "$em$em";
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$tree_char_em = true;
+				}
+			} else if ($token_len == 2) {
+				if ($strong) {
+					# Unwind any dangling emphasis marker:
+					if (strlen($token_stack[0]) == 1) {
+						$text_stack[1] .= array_shift($token_stack);
+						$text_stack[0] .= array_shift($text_stack);
+					}
+					# Closing strong marker:
+					array_shift($token_stack);
+					$span = array_shift($text_stack);
+					$span = $this->runSpanGamut($span);
+					$span = "<strong>$span</strong>";
+					$text_stack[0] .= $this->hashPart($span);
+					$strong = '';
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$strong = $token;
+				}
+			} else {
+				# Here $token_len == 1
+				if ($em) {
+					if (strlen($token_stack[0]) == 1) {
+						# Closing emphasis marker:
+						array_shift($token_stack);
+						$span = array_shift($text_stack);
+						$span = $this->runSpanGamut($span);
+						$span = "<em>$span</em>";
+						$text_stack[0] .= $this->hashPart($span);
+						$em = '';
+					} else {
+						$text_stack[0] .= $token;
+					}
+				} else {
+					array_unshift($token_stack, $token);
+					array_unshift($text_stack, '');
+					$em = $token;
+				}
+			}
+		}
+		return $text_stack[0];
+	}
+
+
+	function doBlockQuotes($text) {
+		$text = preg_replace_callback('/
+			  (								# Wrap whole match in $1
+				(?>
+				  ^[ ]*>[ ]?			# ">" at the start of a line
+					.+\n					# rest of the first line
+				  (.+\n)*					# subsequent consecutive lines
+				  \n*						# blanks
+				)+
+			  )
+			/xm',
+			array(&$this, '_doBlockQuotes_callback'), $text);
+
+		return $text;
+	}
+	function _doBlockQuotes_callback($matches) {
+		$bq = $matches[1];
+		# trim one level of quoting - trim whitespace-only lines
+		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
+		$bq = $this->runBlockGamut($bq);		# recurse
+
+		$bq = preg_replace('/^/m', "  ", $bq);
+		# These leading spaces cause problem with <pre> content,
+		# so we need to fix that:
+		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
+			array(&$this, '_DoBlockQuotes_callback2'), $bq);
+
+		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+	}
+	function _doBlockQuotes_callback2($matches) {
+		$pre = $matches[1];
+		$pre = preg_replace('/^  /m', '', $pre);
+		return $pre;
+	}
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
+				# Is a paragraph.
+				$value = $this->runSpanGamut($value);
+				$value = preg_replace('/^([ ]*)/', "<p>", $value);
+				$value .= "</p>";
+				$grafs[$key] = $this->unhash($value);
+			}
+			else {
+				# Is a block.
+				# Modify elements of @grafs in-place...
+				$graf = $value;
+				$block = $this->html_hashes[$graf];
+				$graf = $block;
+//				if (preg_match('{
+//					\A
+//					(							# $1 = <div> tag
+//					  <div  \s+
+//					  [^>]*
+//					  \b
+//					  markdown\s*=\s*  ([\'"])	#	$2 = attr quote char
+//					  1
+//					  \2
+//					  [^>]*
+//					  >
+//					)
+//					(							# $3 = contents
+//					.*
+//					)
+//					(</div>)					# $4 = closing tag
+//					\z
+//					}xs', $block, $matches))
+//				{
+//					list(, $div_open, , $div_content, $div_close) = $matches;
+//
+//					# We can't call Markdown(), because that resets the hash;
+//					# that initialization code should be pulled into its own sub, though.
+//					$div_content = $this->hashHTMLBlocks($div_content);
+//
+//					# Run document gamut methods on the content.
+//					foreach ($this->document_gamut as $method => $priority) {
+//						$div_content = $this->$method($div_content);
+//					}
+//
+//					$div_open = preg_replace(
+//						'{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
+//
+//					$graf = $div_open . "\n" . $div_content . "\n" . $div_close;
+//				}
+				$grafs[$key] = $graf;
+			}
+		}
+
+		return implode("\n\n", $grafs);
+	}
+
+
+	function encodeAttribute($text) {
+	#
+	# Encode text for a double-quoted HTML attribute. This function
+	# is *not* suitable for attributes enclosed in single quotes.
+	#
+		$text = $this->encodeAmpsAndAngles($text);
+		$text = str_replace('"', '&quot;', $text);
+		return $text;
+	}
+
+
+	function encodeAmpsAndAngles($text) {
+	#
+	# Smart processing for ampersands and angle brackets that need to
+	# be encoded. Valid character entities are left alone unless the
+	# no-entities mode is set.
+	#
+		if ($this->no_entities) {
+			$text = str_replace('&', '&amp;', $text);
+		} else {
+			# Ampersand-encoding based entirely on Nat Irons's Amputator
+			# MT plugin: <http://bumppo.net/projects/amputator/>
+			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
+								'&amp;', $text);;
+		}
+		# Encode remaining <'s
+		$text = str_replace('<', '&lt;', $text);
+
+		return $text;
+	}
+
+
+	function doAutoLinks($text) {
+		$text = preg_replace_callback('{<((https?|ftp|dict):[^\'">\s]+)>}i',
+			array(&$this, '_doAutoLinks_url_callback'), $text);
+
+		# Email addresses: <address@domain.foo>
+		$text = preg_replace_callback('{
+			<
+			(?:mailto:)?
+			(
+				[-.\w\x80-\xFF]+
+				\@
+				[-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
+			)
+			>
+			}xi',
+			array(&$this, '_doAutoLinks_email_callback'), $text);
+
+		return $text;
+	}
+	function _doAutoLinks_url_callback($matches) {
+		$url = $this->encodeAttribute($matches[1]);
+		$link = "<a href=\"$url\">$url</a>";
+		return $this->hashPart($link);
+	}
+	function _doAutoLinks_email_callback($matches) {
+		$address = $matches[1];
+		$link = $this->encodeEmailAddress($address);
+		return $this->hashPart($link);
+	}
+
+
+	function encodeEmailAddress($addr) {
+	#
+	#	Input: an email address, e.g. "foo@example.com"
+	#
+	#	Output: the email address as a mailto link, with each character
+	#		of the address encoded as either a decimal or hex entity, in
+	#		the hopes of foiling most address harvesting spam bots. E.g.:
+	#
+	#	  <p><a href="&#109;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#x66;o&#111;
+	#        &#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;&#101;&#46;&#x63;&#111;
+	#        &#x6d;">&#x66;o&#111;&#x40;&#101;&#x78;&#97;&#x6d;&#112;&#x6c;
+	#        &#101;&#46;&#x63;&#111;&#x6d;</a></p>
+	#
+	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
+	#   With some optimizations by Milian Wolff.
+	#
+		$addr = "mailto:" . $addr;
+		$chars = preg_split('/(?<!^)(?!$)/', $addr);
+		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+
+		foreach ($chars as $key => $char) {
+			$ord = ord($char);
+			# Ignore non-ascii chars.
+			if ($ord < 128) {
+				$r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
+				# roughly 10% raw, 45% hex, 45% dec
+				# '@' *must* be encoded. I insist.
+				if ($r > 90 && $char != '@') /* do nothing */;
+				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
+				else              $chars[$key] = '&#'.$ord.';';
+			}
+		}
+
+		$addr = implode('', $chars);
+		$text = implode('', array_slice($chars, 7)); # text without `mailto:`
+		$addr = "<a href=\"$addr\">$text</a>";
+
+		return $addr;
+	}
+
+
+	function parseSpan($str) {
+	#
+	# Take the string $str and parse it into tokens, hashing embeded HTML,
+	# escaped characters and handling code spans.
+	#
+		$output = '';
+
+		$span_re = '{
+				(
+					\\\\'.$this->escape_chars_re.'
+				|
+					(?<![`\\\\])
+					`+						# code span marker
+			'.( $this->no_markup ? '' : '
+				|
+					<!--    .*?     -->		# comment
+				|
+					<\?.*?\?> | <%.*?%>		# processing instruction
+				|
+					<[/!$]?[-a-zA-Z0-9:]+	# regular tags
+					(?>
+						\s
+						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
+					)?
+					>
+			').'
+				)
+				}xs';
+
+		while (1) {
+			#
+			# Each loop iteration seach for either the next tag, the next
+			# openning code span marker, or the next escaped character.
+			# Each token is then passed to handleSpanToken.
+			#
+			$parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
+
+			# Create token from text preceding tag.
+			if ($parts[0] != "") {
+				$output .= $parts[0];
+			}
+
+			# Check if we reach the end.
+			if (isset($parts[1])) {
+				$output .= $this->handleSpanToken($parts[1], $parts[2]);
+				$str = $parts[2];
+			}
+			else {
+				break;
+			}
+		}
+
+		return $output;
+	}
+
+
+	function handleSpanToken($token, &$str) {
+	#
+	# Handle $token provided by parseSpan by determining its nature and
+	# returning the corresponding value that should replace it.
+	#
+		switch ($token{0}) {
+			case "\\":
+				return $this->hashPart("&#". ord($token{1}). ";");
+			case "`":
+				# Search for end marker in remaining text.
+				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
+					$str, $matches))
+				{
+					$str = $matches[2];
+					$codespan = $this->makeCodeSpan($matches[1]);
+					return $this->hashPart($codespan);
+				}
+				return $token; // return as text since no ending marker found.
+			default:
+				return $this->hashPart($token);
+		}
+	}
+
+
+	function outdent($text) {
+	#
+	# Remove one level of line-leading tabs or spaces
+	#
+		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+	}
+
+
+	# String length function for detab. `_initDetab` will create a function to
+	# hanlde UTF-8 if the default function does not exist.
+	var $utf8_strlen = 'mb_strlen';
+
+	function detab($text) {
+	#
+	# Replace tabs with the appropriate amount of space.
+	#
+		# For each line we separate the line in blocks delemited by
+		# tab characters. Then we reconstruct every line by adding the
+		# appropriate number of space between each blocks.
+
+		$text = preg_replace_callback('/^.*\t.*$/m',
+			array(&$this, '_detab_callback'), $text);
+
+		return $text;
+	}
+	function _detab_callback($matches) {
+		$line = $matches[0];
+		$strlen = $this->utf8_strlen; # strlen function for UTF-8.
+
+		# Split in blocks.
+		$blocks = explode("\t", $line);
+		# Add each blocks to the line.
+		$line = $blocks[0];
+		unset($blocks[0]); # Do not add first block twice.
+		foreach ($blocks as $block) {
+			# Calculate amount of space, insert spaces, insert block.
+			$amount = $this->tab_width -
+				$strlen($line, 'UTF-8') % $this->tab_width;
+			$line .= str_repeat(" ", $amount) . $block;
+		}
+		return $line;
+	}
+	function _initDetab() {
+	#
+	# Check for the availability of the function in the `utf8_strlen` property
+	# (initially `mb_strlen`). If the function is not available, create a
+	# function that will loosely count the number of UTF-8 characters with a
+	# regular expression.
+	#
+		if (function_exists($this->utf8_strlen)) return;
+		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
+			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
+			$text, $m);');
+	}
+
+
+	function unhash($text) {
+	#
+	# Swap back in all the tags hashed by _HashHTMLBlocks.
+	#
+		return preg_replace_callback('/(.)\x1A[0-9]+\1/',
+			array(&$this, '_unhash_callback'), $text);
+	}
+	function _unhash_callback($matches) {
+		return $this->html_hashes[$matches[0]];
+	}
+
+}
+
+
+#
+# Markdown Extra Parser Class
+#
+
+class MarkdownExtra_Parser extends Markdown_Parser {
+
+	# Prefix for footnote ids.
+	var $fn_id_prefix = "";
+
+	# Optional title attribute for footnote links and backlinks.
+	var $fn_link_title = MARKDOWN_FN_LINK_TITLE;
+	var $fn_backlink_title = MARKDOWN_FN_BACKLINK_TITLE;
+
+	# Optional class attribute for footnote links and backlinks.
+	var $fn_link_class = MARKDOWN_FN_LINK_CLASS;
+	var $fn_backlink_class = MARKDOWN_FN_BACKLINK_CLASS;
+
+	var $el_enable = MARKDOWN_EL_ENABLE;
+	var $el_local_domain = MARKDOWN_EL_LOCAL_DOMAIN;
+	var $el_new_window = MARKDOWN_EL_NEW_WINDOW;
+	var $el_css_class = MARKDOWN_EL_CSS_CLASS;
+
+	var $ha_enable = MARKDOWN_HA_ENABLE;
+	var $ha_class = MARKDOWN_HA_CLASS;
+	var $ha_text = MARKDOWN_HA_TEXT;
+
+	# Predefined abbreviations.
+	var $predef_abbr = array();
+
+
+	function MarkdownExtra_Parser() {
+	#
+	# Constructor function. Initialize the parser object.
+	#
+		# Add extra escapable characters before parent constructor
+		# initialize the table.
+		$this->escape_chars .= ':|';
+
+		if ($this->el_local_domain === null) {
+			$this->el_local_domain = $_SERVER['SERVER_NAME'];
+		}
+
+		# Insert extra document, block, and span transformations.
+		# Parent constructor will do the sorting.
+		$this->document_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"stripFootnotes"     => 15,
+			"stripAbbreviations" => 25,
+			"appendFootnotes"    => 50,
+			);
+		$this->block_gamut += array(
+			"doFencedCodeBlocks" => 5,
+			"doTables"           => 15,
+			"doDefLists"         => 45,
+			);
+		$this->span_gamut += array(
+			"doFootnotes"        => 5,
+			"doAbbreviations"    => 70,
+			);
+
+		parent::Markdown_Parser();
+	}
+
+
+	# Extra variables used during extra transformations.
+	var $footnotes = array();
+	var $footnotes_ordered = array();
+	var $abbr_desciptions = array();
+	var $abbr_word_re = '';
+
+	# Give the current footnote number.
+	var $footnote_counter = 1;
+
+
+	function setup() {
+	#
+	# Setting up Extra-specific variables.
+	#
+		parent::setup();
+
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+		$this->footnote_counter = 1;
+
+		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
+			if ($this->abbr_word_re)
+				$this->abbr_word_re .= '|';
+			$this->abbr_word_re .= preg_quote($abbr_word);
+			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		}
+	}
+
+	function teardown() {
+	#
+	# Clearing Extra-specific variables.
+	#
+		$this->footnotes = array();
+		$this->footnotes_ordered = array();
+		$this->abbr_desciptions = array();
+		$this->abbr_word_re = '';
+
+		parent::teardown();
+	}
+
+
+	### HTML Block Parser ###
+
+	# Tags that are always treated as block tags:
+	var $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend';
+
+	# Tags treated as block tags only if the opening tag is alone on it's line:
+	var $context_block_tags_re = 'script|noscript|math|ins|del';
+
+	# Tags where markdown="1" default to span mode:
+	var $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
+
+	# Tags which must not have their contents modified, no matter where
+	# they appear:
+	var $clean_tags_re = 'script|math';
+
+	# Tags that do not need to be closed.
+	var $auto_close_tags_re = 'hr|img';
+
+
+	function hashHTMLBlocks($text) {
+	#
+	# Hashify HTML Blocks and "clean tags".
+	#
+	# We only want to do this for block-level HTML tags, such as headers,
+	# lists, and tables. That's because we still want to wrap <p>s around
+	# "paragraphs" that are wrapped in non-block-level tags, such as anchors,
+	# phrase emphasis, and spans. The list of tags we're looking for is
+	# hard-coded.
+	#
+	# This works by calling _HashHTMLBlocks_InMarkdown, which then calls
+	# _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
+	# attribute is found whitin a tag, _HashHTMLBlocks_InHTML calls back
+	#  _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
+	# These two functions are calling each other. It's recursive!
+	#
+		#
+		# Call the HTML-in-Markdown hasher.
+		#
+		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+
+		return $text;
+	}
+	function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
+										$enclosing_tag_re = '', $span = false)
+	{
+	#
+	# Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
+	#
+	# *   $indent is the number of space to be ignored when checking for code
+	#     blocks. This is important because if we don't take the indent into
+	#     account, something like this (which looks right) won't work as expected:
+	#
+	#     <div>
+	#         <div markdown="1">
+	#         Hello World.  <-- Is this a Markdown code block or text?
+	#         </div>  <-- Is this a Markdown code block or a real tag?
+	#     <div>
+	#
+	#     If you don't like this, just don't indent the tag on which
+	#     you apply the markdown="1" attribute.
+	#
+	# *   If $enclosing_tag_re is not empty, stops at the first unmatched closing
+	#     tag with that name. Nested tags supported.
+	#
+	# *   If $span is true, text inside must treated as span. So any double
+	#     newline will be replaced by a single newline so that it does not create
+	#     paragraphs.
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+
+		# Regex to check for the presense of newlines around a block tag.
+		$newline_before_re = '/(?:^\n?|\n\n)*$/';
+		$newline_after_re =
+			'{
+				^						# Start of text following the tag.
+				(?>[ ]*<!--.*?-->)?		# Optional comment.
+				[ ]*\n					# Must be followed by newline.
+			}xs';
+
+		# Regex to match any tag.
+		$block_tag_re =
+			'{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						(?>				# Tag name.
+							'.$this->block_tags_re.'			|
+							'.$this->context_block_tags_re.'	|
+							'.$this->clean_tags_re.'        	|
+							(?!\s)'.$enclosing_tag_re.'
+						)
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				|
+					# Code span marker
+					`+
+				'. ( !$span ? ' # If not in span.
+				|
+					# Indented code block
+					(?> ^[ ]*\n? | \n[ ]*\n )
+					[ ]{'.($indent+4).'}[^\n]* \n
+					(?>
+						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+					)*
+				|
+					# Fenced code block marker
+					(?> ^ | \n )
+					[ ]{'.($indent).'}~~~+[ ]*\n
+				' : '' ). ' # End (if not is span).
+				)
+			}xs';
+
+
+		$depth = 0;		# Current depth inside the tag tree.
+		$parsed = "";	# Parsed text that will be returned.
+
+		#
+		# Loop through every tag until we find the closing tag of the parent
+		# or loop until reaching the end of text if no parent tag specified.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made
+			# by the pattern.
+			#
+			$parts = preg_split($block_tag_re, $text, 2,
+								PREG_SPLIT_DELIM_CAPTURE);
+
+			# If in Markdown span mode, add a empty-string span-level hash
+			# after each newline to prevent triggering any block element.
+			if ($span) {
+				$void = $this->hashPart("", ':');
+				$newline = "$void\n";
+				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+			}
+
+			$parsed .= $parts[0]; # Text before current tag.
+
+			# If end of $text has been reached. Stop loop.
+			if (count($parts) < 3) {
+				$text = "";
+				break;
+			}
+
+			$tag  = $parts[1]; # Tag to handle.
+			$text = $parts[2]; # Remaining text after current tag.
+			$tag_re = preg_quote($tag); # For use in a regular expression.
+
+			#
+			# Check for: Code span marker
+			#
+			if ($tag{0} == "`") {
+				# Find corresponding end marker.
+				$tag_re = preg_quote($tag);
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
+					$text, $matches))
+				{
+					# End marker found: pass text unchanged until marker.
+					$parsed .= $tag . $matches[0];
+					$text = substr($text, strlen($matches[0]));
+				}
+				else {
+					# Unmatched marker: just skip it.
+					$parsed .= $tag;
+				}
+			}
+			#
+			# Check for: Indented code block or fenced code block marker.
+			#
+			else if ($tag{0} == "\n" || $tag{0} == "~") {
+				if ($tag{1} == "\n" || $tag{1} == " ") {
+					# Indented code block: pass it unchanged, will be handled
+					# later.
+					$parsed .= $tag;
+				}
+				else {
+					# Fenced code block marker: find matching end marker.
+					$tag_re = preg_quote(trim($tag));
+					if (preg_match('{^(?>.*\n)+?'.$tag_re.' *\n}', $text,
+						$matches))
+					{
+						# End marker found: pass text unchanged until marker.
+						$parsed .= $tag . $matches[0];
+						$text = substr($text, strlen($matches[0]));
+					}
+					else {
+						# No end marker: just skip it.
+						$parsed .= $tag;
+					}
+				}
+			}
+			#
+			# Check for: Opening Block level tag or
+			#            Opening Context Block tag (like ins and del)
+			#               used as a block tag (tag is alone on it's line).
+			#
+			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
+				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+					preg_match($newline_before_re, $parsed) &&
+					preg_match($newline_after_re, $text)	)
+				)
+			{
+				# Need to parse tag and following text using the HTML parser.
+				list($block_text, $text) =
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+
+				# Make sure it stays outside of any paragraph by adding newlines.
+				$parsed .= "\n\n$block_text\n\n";
+			}
+			#
+			# Check for: Clean tag (like script, math)
+			#            HTML Comments, processing instructions.
+			#
+			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Need to parse tag and following text using the HTML parser.
+				# (don't check for markdown attribute)
+				list($block_text, $text) =
+					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+
+				$parsed .= $block_text;
+			}
+			#
+			# Check for: Tag with same name as enclosing tag.
+			#
+			else if ($enclosing_tag_re !== '' &&
+				# Same name as enclosing tag.
+				preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
+			{
+				#
+				# Increase/decrease nested tag count.
+				#
+				if ($tag{1} == '/')						$depth--;
+				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+
+				if ($depth < 0) {
+					#
+					# Going out of parent element. Clean up and break so we
+					# return to the calling function.
+					#
+					$text = $tag . $text;
+					break;
+				}
+
+				$parsed .= $tag;
+			}
+			else {
+				$parsed .= $tag;
+			}
+		} while ($depth >= 0);
+
+		return array($parsed, $text);
+	}
+	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
+	#
+	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
+	#
+	# *   Calls $hash_method to convert any blocks.
+	# *   Stops when the first opening tag closes.
+	# *   $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
+	#     (it is not inside clean tags)
+	#
+	# Returns an array of that form: ( processed text , remaining text )
+	#
+		if ($text === '') return array('', '');
+
+		# Regex to match `markdown` attribute inside of a tag.
+		$markdown_attr_re = '
+			{
+				\s*			# Eat whitespace before the `markdown` attribute
+				markdown
+				\s*=\s*
+				(?>
+					(["\'])		# $1: quote delimiter
+					(.*?)		# $2: attribute value
+					\1			# matching delimiter
+				|
+					([^\s>]*)	# $3: unquoted attribute value
+				)
+				()				# $4: make $3 always defined (avoid warnings)
+			}xs';
+
+		# Regex to match any tag.
+		$tag_re = '{
+				(					# $2: Capture hole tag.
+					</?					# Any opening or closing tag.
+						[\w:$]+			# Tag name.
+						(?:
+							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
+							(?>
+								".*?"		|	# Double quotes (can contain `>`)
+								\'.*?\'   	|	# Single quotes (can contain `>`)
+								.+?				# Anything but quotes and `>`.
+							)*?
+						)?
+					>					# End of tag.
+				|
+					<!--    .*?     -->	# HTML Comment
+				|
+					<\?.*?\?> | <%.*?%>	# Processing instruction
+				|
+					<!\[CDATA\[.*?\]\]>	# CData Block
+				)
+			}xs';
+
+		$original_text = $text;		# Save original text in case of faliure.
+
+		$depth		= 0;	# Current depth inside the tag tree.
+		$block_text	= "";	# Temporary text holder for current text.
+		$parsed		= "";	# Parsed text that will be returned.
+
+		#
+		# Get the name of the starting tag.
+		# (This pattern makes $base_tag_name_re safe without quoting.)
+		#
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
+			$base_tag_name_re = $matches[1];
+
+		#
+		# Loop through every tag until we find the corresponding closing tag.
+		#
+		do {
+			#
+			# Split the text using the first $tag_match pattern found.
+			# Text before  pattern will be first in the array, text after
+			# pattern will be at the end, and between will be any catches made
+			# by the pattern.
+			#
+			$parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
+
+			if (count($parts) < 3) {
+				#
+				# End of $text reached with unbalenced tag(s).
+				# In that case, we return original text unchanged and pass the
+				# first character as filtered to prevent an infinite loop in the
+				# parent function.
+				#
+				return array($original_text{0}, substr($original_text, 1));
+			}
+
+			$block_text .= $parts[0]; # Text before current tag.
+			$tag         = $parts[1]; # Tag to handle.
+			$text        = $parts[2]; # Remaining text after current tag.
+
+			#
+			# Check for: Auto-close tag (like <hr/>)
+			#			 Comments and Processing Instructions.
+			#
+			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
+				$tag{1} == '!' || $tag{1} == '?')
+			{
+				# Just add the tag to the block as if it was text.
+				$block_text .= $tag;
+			}
+			else {
+				#
+				# Increase/decrease nested tag count. Only do so if
+				# the tag's name match base tag's.
+				#
+				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
+					if ($tag{1} == '/')						$depth--;
+					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				}
+
+				#
+				# Check for `markdown="1"` attribute and handle it.
+				#
+				if ($md_attr &&
+					preg_match($markdown_attr_re, $tag, $attr_m) &&
+					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+				{
+					# Remove `markdown` attribute from opening tag.
+					$tag = preg_replace($markdown_attr_re, '', $tag);
+
+					# Check if text inside this tag must be parsed in span mode.
+					$this->mode = $attr_m[2] . $attr_m[3];
+					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
+						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
+
+					# Calculate indent before tag.
+					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
+						$strlen = $this->utf8_strlen;
+						$indent = $strlen($matches[1], 'UTF-8');
+					} else {
+						$indent = 0;
+					}
+
+					# End preceding block with this tag.
+					$block_text .= $tag;
+					$parsed .= $this->$hash_method($block_text);
+
+					# Get enclosing tag name for the ParseMarkdown function.
+					# (This pattern makes $tag_name_re safe without quoting.)
+					preg_match('/^<([\w:$]*)\b/', $tag, $matches);
+					$tag_name_re = $matches[1];
+
+					# Parse the content using the HTML-in-Markdown parser.
+					list ($block_text, $text)
+						= $this->_hashHTMLBlocks_inMarkdown($text, $indent,
+							$tag_name_re, $span_mode);
+
+					# Outdent markdown text.
+					if ($indent > 0) {
+						$block_text = preg_replace("/^[ ]{1,$indent}/m", "",
+													$block_text);
+					}
+
+					# Append tag content to parsed text.
+					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
+					else				$parsed .= "$block_text";
+
+					# Start over a new block.
+					$block_text = "";
+				}
+				else $block_text .= $tag;
+			}
+
+		} while ($depth > 0);
+
+		#
+		# Hash last block text that wasn't processed inside the loop.
+		#
+		$parsed .= $this->$hash_method($block_text);
+
+		return array($parsed, $text);
+	}
+
+
+	function hashClean($text) {
+	#
+	# Called whenever a tag must be hashed when a function insert a "clean" tag
+	# in $text, it pass through this function and is automaticaly escaped,
+	# blocking invalid nested overlap.
+	#
+		return $this->hashPart($text, 'C');
+	}
+
+	function _doAnchors_inline_callback($matches) {
+		// $whole_match	=  $matches[1];
+		$link_text		=  $this->runSpanGamut($matches[2]);
+		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
+		$title			=& $matches[7];
+
+		$url = $this->encodeAttribute($url);
+
+		$result = "<a href=\"$url\"";
+		if (isset($title)) {
+			$title = $this->encodeAttribute($title);
+			$result .=  " title=\"$title\"";
+		}
+
+		if ($this->el_enable && preg_match('/^https?\:\/\//', $url) && !preg_match('/^https?\:\/\/'.$this->el_local_domain.'/', $url)) {
+			if ($this->el_new_window) {
+				$result .= ' target="_blank"';
+			}
+
+			if ($this->el_css_class) {
+				$result .= ' class="'.$this->el_css_class.'"';
+			}
+		}
+
+		$link_text = $this->runSpanGamut($link_text);
+		$result .= ">$link_text</a>";
+
+		return $this->hashPart($result);
+	}
+
+	function _doAnchors_reference_callback($matches) {
+		$whole_match =  $matches[1];
+		$link_text   =  $matches[2];
+		$link_id     =& $matches[3];
+		$result      =  '';
+
+		if ($link_id == "") {
+			# for shortcut links like [this][] or [this].
+			$link_id = $link_text;
+		}
+
+		# lower-case and turn embedded newlines into spaces
+		$link_id = strtolower($link_id);
+		$link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
+
+		if (isset($this->urls[$link_id])) {
+			$url = $this->urls[$link_id];
+			$url = $this->encodeAttribute($url);
+
+			$result = "<a href=\"$url\"";
+			if ( isset( $this->titles[$link_id] ) ) {
+				$title = $this->titles[$link_id];
+				$title = $this->encodeAttribute($title);
+				$result .=  " title=\"$title\"";
+			}
+
+			if ($this->el_enable && preg_match('/^https?\:\/\//', $url) && !preg_match('/^https?\:\/\/'.$this->el_local_domain.'/', $url)) {
+				if ($this->el_new_window) {
+					$result .= ' target="_blank"';
+				}
+
+				if ($this->el_css_class) {
+					$result .= ' class="'.$this->el_css_class.'"';
+				}
+			}
+
+			$link_text = $this->runSpanGamut($link_text);
+			$result .= ">$link_text</a>";
+			$result = $this->hashPart($result);
+		}
+		else {
+			$result = $whole_match;
+		}
+		return $result;
+	}
+
+	function doHeaders($text) {
+	#
+	# Redefined to add id attribute support.
+	#
+		# Setext-style headers:
+		#	  Header 1  {#header1}
+		#	  ========
+		#
+		#	  Header 2  {#header2}
+		#	  --------
+		#
+		$text = preg_replace_callback(
+			'{
+				(^.+?)								# $1: Header text
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})?	# $2: Id attribute
+				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
+			}mx',
+			array(&$this, '_doHeaders_callback_setext'), $text);
+
+		# atx-style headers:
+		#	# Header 1        {#header1}
+		#	## Header 2       {#header2}
+		#	## Header 2 with closing hashes ##  {#header3}
+		#	...
+		#	###### Header 6   {#header2}
+		#
+		$text = preg_replace_callback('{
+				^(\#{1,6})	# $1 = string of #\'s
+				[ ]*
+				(.+?)		# $2 = Header text
+				[ ]*
+				\#*			# optional closing #\'s (not counted)
+				(?:[ ]+\{\#([-_:a-zA-Z0-9]+)\})? # id attribute
+				[ ]*
+				\n+
+			}xm',
+			array(&$this, '_doHeaders_callback_atx'), $text);
+
+		return $text;
+	}
+	function _doHeaders_attr($attr) {
+		if (empty($attr))  return "";
+		return " id=\"$attr\"";
+	}
+	function _doHeaders_callback_setext($matches) {
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
+			return $matches[0];
+		$level = $matches[3]{0} == '=' ? 1 : 2;
+		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$body  = $this->runSpanGamut($matches[1]);
+		$body  = $this->_doHeaders_selflink($id, $body);
+
+		$block = "<h$level$attr>$body</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_callback_atx($matches) {
+		$level = strlen($matches[1]);
+		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$body  = $this->runSpanGamut($matches[2]);
+		$body = $this->_doHeaders_selflink($id, $body);
+
+		$block = "<h$level$attr>$body</h$level>";
+		return "\n" . $this->hashBlock($block) . "\n\n";
+	}
+	function _doHeaders_selflink($id, $body) {
+		if (!empty($id)) {
+			$link = '<a href="#'.$id.'"';
+
+			if ($this->ha_class) {
+				$link .= ' class="'.$this->ha_class.'"';
+			}
+
+			$link .= '>'.$this->ha_text.'</a>';
+
+			$body .= $link;
+		}
+
+		return $body;
+	}
+
+
+	function doTables($text) {
+	#
+	# Form HTML tables.
+	#
+		$less_than_tab = $this->tab_width - 1;
+		#
+		# Find tables with leading pipe.
+		#
+		#	| Header 1 | Header 2
+		#	| -------- | --------
+		#	| Cell 1   | Cell 2
+		#	| Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|]							# Optional leading pipe (present)
+				(.+) \n						# $1: Header row (at least one pipe)
+
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
+
+				(							# $3: Cells
+					(?>
+						[ ]*				# Allowed whitespace.
+						[|] .* \n			# Row content.
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_doTable_leadingPipe_callback'), $text);
+
+		#
+		# Find tables without leading pipe.
+		#
+		#	Header 1 | Header 2
+		#	-------- | --------
+		#	Cell 1   | Cell 2
+		#	Cell 3   | Cell 4
+		#
+		$text = preg_replace_callback('
+			{
+				^							# Start of a line
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
+
+				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
+
+				(							# $3: Cells
+					(?>
+						.* [|] .* \n		# Row content
+					)*
+				)
+				(?=\n|\Z)					# Stop at final double newline.
+			}xm',
+			array(&$this, '_DoTable_callback'), $text);
+
+		return $text;
+	}
+	function _doTable_leadingPipe_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		# Remove leading pipe for each row.
+		$content	= preg_replace('/^ *[|]/m', '', $content);
+
+		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
+	}
+	function _doTable_callback($matches) {
+		$head		= $matches[1];
+		$underline	= $matches[2];
+		$content	= $matches[3];
+
+		# Remove any tailing pipes for each line.
+		$head		= preg_replace('/[|] *$/m', '', $head);
+		$underline	= preg_replace('/[|] *$/m', '', $underline);
+		$content	= preg_replace('/[|] *$/m', '', $content);
+
+		# Reading alignement from header underline.
+		$separators	= preg_split('/ *[|] */', $underline);
+		foreach ($separators as $n => $s) {
+			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
+			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
+			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
+			else									$attr[$n] = '';
+		}
+
+		# Parsing span elements, including code spans, character escapes,
+		# and inline HTML tags, so that pipes inside those gets ignored.
+		$head		= $this->parseSpan($head);
+		$headers	= preg_split('/ *[|] */', $head);
+		$col_count	= count($headers);
+
+		# Write column headers.
+		$text = "<table>\n";
+		$text .= "<thead>\n";
+		$text .= "<tr>\n";
+		foreach ($headers as $n => $header)
+			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		$text .= "</tr>\n";
+		$text .= "</thead>\n";
+
+		# Split content by row.
+		$rows = explode("\n", trim($content, "\n"));
+
+		$text .= "<tbody>\n";
+		foreach ($rows as $row) {
+			# Parsing span elements, including code spans, character escapes,
+			# and inline HTML tags, so that pipes inside those gets ignored.
+			$row = $this->parseSpan($row);
+
+			# Split row by cell.
+			$row_cells = preg_split('/ *[|] */', $row, $col_count);
+			$row_cells = array_pad($row_cells, $col_count, '');
+
+			$text .= "<tr>\n";
+			foreach ($row_cells as $n => $cell)
+				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			$text .= "</tr>\n";
+		}
+		$text .= "</tbody>\n";
+		$text .= "</table>";
+
+		return $this->hashBlock($text) . "\n";
+	}
+
+
+	function doDefLists($text) {
+	#
+	# Form HTML definition lists.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Re-usable pattern to match any entire dl list:
+		$whole_list_re = '(?>
+			(								# $1 = whole list
+			  (								# $2
+				[ ]{0,'.$less_than_tab.'}
+				((?>.*\S.*\n)+)				# $3 = defined term
+				\n?
+				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+			  )
+			  (?s:.+?)
+			  (								# $4
+				  \z
+				|
+				  \n{2,}
+				  (?=\S)
+				  (?!						# Negative lookahead for another term
+					[ ]{0,'.$less_than_tab.'}
+					(?: \S.*\n )+?			# defined term
+					\n?
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+				  (?!						# Negative lookahead for another definition
+					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				  )
+			  )
+			)
+		)'; // mx
+
+		$text = preg_replace_callback('{
+				(?>\A\n?|(?<=\n\n))
+				'.$whole_list_re.'
+			}mx',
+			array(&$this, '_doDefLists_callback'), $text);
+
+		return $text;
+	}
+	function _doDefLists_callback($matches) {
+		# Re-usable patterns to match list item bullets and number markers:
+		$list = $matches[1];
+
+		# Turn double returns into triple returns, so that we can make a
+		# paragraph for the last item in a list, if necessary:
+		$result = trim($this->processDefListItems($list));
+		$result = "<dl>\n" . $result . "\n</dl>";
+		return $this->hashBlock($result) . "\n\n";
+	}
+
+
+	function processDefListItems($list_str) {
+	#
+	#	Process the contents of a single definition list, splitting it
+	#	into individual term and definition list items.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# trim trailing blank lines:
+		$list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
+
+		# Process definition terms.
+		$list_str = preg_replace_callback('{
+			(?>\A\n?|\n\n+)					# leading line
+			(								# definition terms = $1
+				[ ]{0,'.$less_than_tab.'}	# leading whitespace
+				(?![:][ ]|[ ])				# negative lookahead for a definition
+											#   mark (colon) or more whitespace.
+				(?> \S.* \n)+?				# actual term (not whitespace).
+			)
+			(?=\n?[ ]{0,3}:[ ])				# lookahead for following line feed
+											#   with a definition mark.
+			}xm',
+			array(&$this, '_processDefListItems_callback_dt'), $list_str);
+
+		# Process actual definitions.
+		$list_str = preg_replace_callback('{
+			\n(\n+)?						# leading line = $1
+			(								# marker space = $2
+				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
+				[:][ ]+						# definition mark (colon)
+			)
+			((?s:.+?))						# definition text = $3
+			(?= \n+ 						# stop at next definition mark,
+				(?:							# next term or end of text
+					[ ]{0,'.$less_than_tab.'} [:][ ]	|
+					<dt | \z
+				)
+			)
+			}xm',
+			array(&$this, '_processDefListItems_callback_dd'), $list_str);
+
+		return $list_str;
+	}
+	function _processDefListItems_callback_dt($matches) {
+		$anchor_regexp = '/\{\#([-_:a-zA-Z0-9]+)\}/';
+		$terms = explode("\n", trim($matches[1]));
+		$text = '';
+		$id = array();
+
+		foreach ($terms as $term) {
+			$id = '';
+			if (preg_match($anchor_regexp, $term, $id) > 0) {
+				$term = preg_replace($anchor_regexp, '', $term);
+				$id = ' id="'.trim($id[1]).'"';
+			}
+
+			if (count($id) === 0) {
+				$id = '';
+			}
+
+			$term = $this->runSpanGamut(trim($term));
+			$text .= "\n<dt$id>" . $term . "</dt>";
+		}
+		return $text . "\n";
+	}
+	function _processDefListItems_callback_dd($matches) {
+		$leading_line	= $matches[1];
+		$marker_space	= $matches[2];
+		$def			= $matches[3];
+
+		if ($leading_line || preg_match('/\n{2,}/', $def)) {
+			# Replace marker with the appropriate whitespace indentation
+			$def = str_repeat(' ', strlen($marker_space)) . $def;
+			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
+			$def = "\n". $def ."\n";
+		}
+		else {
+			$def = rtrim($def);
+			$def = $this->runSpanGamut($this->outdent($def));
+		}
+
+		return "\n<dd>" . $def . "</dd>\n";
+	}
+
+
+	function doFencedCodeBlocks($text) {
+	#
+	# Adding the fenced code block syntax to regular Markdown:
+	#
+	# ~~~
+	# Code block
+	# ~~~
+	#
+		$less_than_tab = $this->tab_width;
+
+		$text = preg_replace_callback('{
+				(?:\n|\A)
+				# 1: Opening marker
+				(
+					~{3,} # Marker: three tilde or more.
+				)
+				[ ]* \n # Whitespace and newline following marker.
+
+				# 2: Content
+				(
+					(?>
+						(?!\1 [ ]* \n)	# Not a closing marker.
+						.*\n+
+					)+
+				)
+
+				# Closing marker.
+				\1 [ ]* \n
+			}xm',
+			array(&$this, '_doFencedCodeBlocks_callback'), $text);
+
+		return $text;
+	}
+	function _doFencedCodeBlocks_callback($matches) {
+		$codeblock = $matches[2];
+		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
+		$codeblock = preg_replace_callback('/^\n+/',
+			array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
+		$codeblock = "<pre><code>$codeblock</code></pre>";
+		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+	}
+	function _doFencedCodeBlocks_newlines($matches) {
+		return str_repeat("<br$this->empty_element_suffix",
+			strlen($matches[0]));
+	}
+
+
+	#
+	# Redefining emphasis markers so that emphasis by underscore does not
+	# work in the middle of a word.
+	#
+	var $em_relist = array(
+		''  => '(?:(?<!\*)\*(?!\*)|(?<![a-zA-Z0-9_])_(?!_))(?=\S)(?![.,:;]\s)',
+		'*' => '(?<=\S)(?<!\*)\*(?!\*)',
+		'_' => '(?<=\S)(?<!_)_(?![a-zA-Z0-9_])',
+		);
+	var $strong_relist = array(
+		''   => '(?:(?<!\*)\*\*(?!\*)|(?<![a-zA-Z0-9_])__(?!_))(?=\S)(?![.,:;]\s)',
+		'**' => '(?<=\S)(?<!\*)\*\*(?!\*)',
+		'__' => '(?<=\S)(?<!_)__(?![a-zA-Z0-9_])',
+		);
+	var $em_strong_relist = array(
+		''    => '(?:(?<!\*)\*\*\*(?!\*)|(?<![a-zA-Z0-9_])___(?!_))(?=\S)(?![.,:;]\s)',
+		'***' => '(?<=\S)(?<!\*)\*\*\*(?!\*)',
+		'___' => '(?<=\S)(?<!_)___(?![a-zA-Z0-9_])',
+		);
+
+
+	function formParagraphs($text) {
+	#
+	#	Params:
+	#		$text - string to process with html <p> tags
+	#
+		# Strip leading and trailing lines:
+		$text = preg_replace('/\A\n+|\n+\z/', '', $text);
+
+		$grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
+
+		#
+		# Wrap <p> tags and unhashify HTML blocks
+		#
+		foreach ($grafs as $key => $value) {
+			$value = trim($this->runSpanGamut($value));
+
+			# Check if this should be enclosed in a paragraph.
+			# Clean tag hashes & block tag hashes are left alone.
+			$is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
+
+			if ($is_p) {
+				$value = "<p>$value</p>";
+			}
+			$grafs[$key] = $value;
+		}
+
+		# Join grafs in one text, then unhash HTML tags.
+		$text = implode("\n\n", $grafs);
+
+		# Finish by removing any tag hashes still present in $text.
+		$text = $this->unhash($text);
+
+		return $text;
+	}
+
+
+	### Footnotes
+
+	function stripFootnotes($text) {
+	#
+	# Strips link definitions from text, stores the URLs and titles in
+	# hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [^id]: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
+			  [ ]*
+			  \n?					# maybe *one* newline
+			(						# text = $2 (no blank lines allowed)
+				(?:
+					.+				# actual text
+				|
+					\n				# newlines but
+					(?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
+					(?!\n+[ ]{0,3}\S)# ensure line is not blank and followed
+									# by non-indented content
+				)*
+			)
+			}xm',
+			array(&$this, '_stripFootnotes_callback'),
+			$text);
+		return $text;
+	}
+	function _stripFootnotes_callback($matches) {
+		$note_id = $this->fn_id_prefix . $matches[1];
+		$this->footnotes[$note_id] = $this->outdent($matches[2]);
+		return ''; # String that will replace the block
+	}
+
+
+	function doFootnotes($text) {
+	#
+	# Replace footnote references in $text [^id] with a special text-token
+	# which will be replaced by the actual footnote marker in appendFootnotes.
+	#
+		if (!$this->in_anchor) {
+			$text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
+		}
+		return $text;
+	}
+
+
+	function appendFootnotes($text) {
+	#
+	# Append footnote list to text.
+	#
+		$text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
+			array(&$this, '_appendFootnotes_callback'), $text);
+
+		if (!empty($this->footnotes_ordered)) {
+			$text .= "\n\n";
+			$text .= "<div class=\"footnotes\">\n";
+			$text .= "<hr". MARKDOWN_EMPTY_ELEMENT_SUFFIX ."\n";
+			$text .= "<ol>\n\n";
+
+			$attr = " rev=\"footnote\"";
+			if ($this->fn_backlink_class != "") {
+				$class = $this->fn_backlink_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_backlink_title != "") {
+				$title = $this->fn_backlink_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+			$num = 0;
+
+			while (!empty($this->footnotes_ordered)) {
+				$footnote = reset($this->footnotes_ordered);
+				$note_id = key($this->footnotes_ordered);
+				unset($this->footnotes_ordered[$note_id]);
+
+				$footnote .= "\n"; # Need to append newline before parsing.
+				$footnote = $this->runBlockGamut("$footnote\n");
+				$footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
+					array(&$this, '_appendFootnotes_callback'), $footnote);
+
+				$attr = str_replace("%%", ++$num, $attr);
+				$note_id = $this->encodeAttribute($note_id);
+
+				# Add backlink to last paragraph; create new paragraph if needed.
+				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
+				if (preg_match('{</p>$}', $footnote)) {
+					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+				} else {
+					$footnote .= "\n\n<p>$backlink</p>";
+				}
+
+				$text .= "<li id=\"fn:$note_id\">\n";
+				$text .= $footnote . "\n";
+				$text .= "</li>\n\n";
+			}
+
+			$text .= "</ol>\n";
+			$text .= "</div>";
+		}
+		return $text;
+	}
+	function _appendFootnotes_callback($matches) {
+		$node_id = $this->fn_id_prefix . $matches[1];
+
+		# Create footnote marker only if it has a corresponding footnote *and*
+		# the footnote hasn't been used by another marker.
+		if (isset($this->footnotes[$node_id])) {
+			# Transfert footnote content to the ordered list.
+			$this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
+			unset($this->footnotes[$node_id]);
+
+			$num = $this->footnote_counter++;
+			$attr = " rel=\"footnote\"";
+			if ($this->fn_link_class != "") {
+				$class = $this->fn_link_class;
+				$class = $this->encodeAttribute($class);
+				$attr .= " class=\"$class\"";
+			}
+			if ($this->fn_link_title != "") {
+				$title = $this->fn_link_title;
+				$title = $this->encodeAttribute($title);
+				$attr .= " title=\"$title\"";
+			}
+
+			$attr = str_replace("%%", $num, $attr);
+			$node_id = $this->encodeAttribute($node_id);
+
+			return
+				"<sup id=\"fnref:$node_id\">".
+				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"</sup>";
+		}
+
+		return "[^".$matches[1]."]";
+	}
+
+
+	### Abbreviations ###
+
+	function stripAbbreviations($text) {
+	#
+	# Strips abbreviations from text, stores titles in hash references.
+	#
+		$less_than_tab = $this->tab_width - 1;
+
+		# Link defs are in the form: [id]*: url "optional title"
+		$text = preg_replace_callback('{
+			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			(.*)					# text = $2 (no blank lines allowed)
+			}xm',
+			array(&$this, '_stripAbbreviations_callback'),
+			$text);
+		return $text;
+	}
+	function _stripAbbreviations_callback($matches) {
+		$abbr_word = $matches[1];
+		$abbr_desc = $matches[2];
+		if ($this->abbr_word_re)
+			$this->abbr_word_re .= '|';
+		$this->abbr_word_re .= preg_quote($abbr_word);
+		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
+		return ''; # String that will replace the block
+	}
+
+
+	function doAbbreviations($text) {
+	#
+	# Find defined abbreviations in text and wrap them in <abbr> elements.
+	#
+		if ($this->abbr_word_re) {
+			// cannot use the /x modifier because abbr_word_re may
+			// contain significant spaces:
+			$text = preg_replace_callback('{'.
+				'(?<![\w\x1A])'.
+				'(?:'.$this->abbr_word_re.')'.
+				'(?![\w\x1A])'.
+				'}',
+				array(&$this, '_doAbbreviations_callback'), $text);
+		}
+		return $text;
+	}
+	function _doAbbreviations_callback($matches) {
+		$abbr = $matches[0];
+		if (isset($this->abbr_desciptions[$abbr])) {
+			$desc = $this->abbr_desciptions[$abbr];
+			if (empty($desc)) {
+				return $this->hashPart("<abbr>$abbr</abbr>");
+			} else {
+				$desc = $this->encodeAttribute($desc);
+				return $this->hashPart("<abbr title=\"$desc\">$abbr</abbr>");
+			}
+		} else {
+			return $matches[0];
+		}
+	}
+
+}
+
+
+/*
+
+PHP Markdown Extra
+==================
+
+Description
+-----------
+
+This is a PHP port of the original Markdown formatter written in Perl
+by John Gruber. This special "Extra" version of PHP Markdown features
+further enhancements to the syntax for making additional constructs
+such as tables and definition list.
+
+Markdown is a text-to-HTML filter; it translates an easy-to-read /
+easy-to-write structured text format into HTML. Markdown's text format
+is most similar to that of plain text email, and supports features such
+as headers, *emphasis*, code blocks, blockquotes, and links.
+
+Markdown's syntax is designed not as a generic markup language, but
+specifically to serve as a front-end to (X)HTML. You can use span-level
+HTML tags anywhere in a Markdown document, and you can use block level
+HTML tags (like <div> and <table> as well).
+
+For more information about Markdown's syntax, see:
+
+<http://daringfireball.net/projects/markdown/>
+
+
+Bugs
+----
+
+To file bug reports please send email to:
+
+<michel.fortin@michelf.com>
+
+Please include with your report: (1) the example input; (2) the output you
+expected; (3) the output Markdown actually produced.
+
+
+Version History
+---------------
+
+See the readme file for detailed release notes for this version.
+
+
+Copyright and License
+---------------------
+
+PHP Markdown & Extra
+Copyright (c) 2004-2008 Michel Fortin
+<http://www.michelf.com/>
+All rights reserved.
+
+Based on Markdown
+Copyright (c) 2003-2006 John Gruber
+<http://daringfireball.net/>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+*	Redistributions of source code must retain the above copyright notice,
+	this list of conditions and the following disclaimer.
+
+*	Redistributions in binary form must reproduce the above copyright
+	notice, this list of conditions and the following disclaimer in the
+	documentation and/or other materials provided with the distribution.
+
+*	Neither the name "Markdown" nor the names of its contributors may
+	be used to endorse or promote products derived from this software
+	without specific prior written permission.
+
+This software is provided by the copyright holders and contributors "as
+is" and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the copyright owner
+or contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+*/
+?>
diff --git a/mod/contacts.php b/mod/contacts.php
index 4d5311b69..834b1c63d 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -261,6 +261,14 @@ function contacts_content(&$a) {
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Contact Editor'),
+			'$submit' => t('Submit'),
+			'$lbl_vis1' => t('Profile Visibility'),
+			'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $r[0]['name']),
+			'$lbl_info1' => t('Contact Information / Notes'),
+			'$lbl_rep1' => t('Online Reputation'),
+			'$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'),
+			'$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.'),
+			'$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'),
 			'$visit' => t('Visit $name\'s profile'),
 			'$blockunblock' => t('Block/Unblock contact'),
 			'$ignorecont' => t('Ignore contact'),
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 2db745d25..02437ec36 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -434,6 +434,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 				$arr['object'] .= '</link></object>' . "\n";
 				$arr['last-child'] = 1;
 
+				$arr['allow_cid'] = $user[0]['allow_cid'];
+				$arr['allow_gid'] = $user[0]['allow_gid'];
+				$arr['deny_cid']  = $user[0]['deny_cid'];
+				$arr['deny_gid']  = $user[0]['deny_gid'];
+
 				$i = item_store($arr);
 				if($i)
 			    	proc_run('php',"include/notifier.php","activity","$i");
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index cd67df1d7..f6f68d348 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -10,6 +10,12 @@ function dfrn_notify_post(&$a) {
 	$data         = ((x($_POST,'data'))         ? $_POST['data']                    : '');
 	$key          = ((x($_POST,'key'))          ? $_POST['key']                     : '');
 	$dissolve     = ((x($_POST,'dissolve'))     ? intval($_POST['dissolve'])        :  0);
+	$perm         = ((x($_POST,'perm'))         ? notags(trim($_POST['perm']))      : 'r');
+
+	$writable = (-1);
+	if($dfrn_version >= 2.21) {
+		$writable = (($perm === 'rw') ? 1 : 0);
+	}
 
 	$direction = (-1);
 	if(strpos($dfrn_id,':') == 1) {
@@ -74,6 +80,14 @@ function dfrn_notify_post(&$a) {
 
 	$importer = $r[0];
 
+	if(($writable != (-1)) && ($writable != $importer['writable'])) {
+		q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
+			intval($writable),
+			intval($importer['id'])
+		);
+		$importer['writable'] = $writable;
+	}
+
 	logger('dfrn_notify: received notify from ' . $importer['name'] . ' for ' . $importer['username']);
 	logger('dfrn_notify: data: ' . $data, LOGGER_DATA);
 
@@ -118,8 +132,6 @@ function dfrn_notify_post(&$a) {
 	}
 
 
-
-
 	if($importer['readonly']) {
 		// We aren't receiving stuff from this person. But we will quietly ignore them
 		// rather than a blatant "go away" message.
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 2ccfadd03..2da1a30fa 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -16,6 +16,7 @@ function dfrn_poll_init(&$a) {
 	$challenge       = ((x($_GET,'challenge'))       ? $_GET['challenge']            : '');
 	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
 	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+	$perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
 
 	$direction = (-1);
 
@@ -183,8 +184,9 @@ function dfrn_poll_post(&$a) {
 	$challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
 	$url          = ((x($_POST,'url'))          ? $_POST['url']                  : '');
 	$sec          = ((x($_POST,'sec'))          ? $_POST['sec']                  : '');
-	$ptype        = ((x($_POST,'type'))         ? $_POST['type']                  : '');
+	$ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
 	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
+	$perm         = ((x($_POST,'perm'))         ? $_POST['perm']                 : 'r');
 
 	if($ptype === 'profile-check') {
 
@@ -295,6 +297,7 @@ function dfrn_poll_post(&$a) {
 	if(! count($r))
 		killme();
 
+	$contact = $r[0];
 	$owner_uid = $r[0]['uid'];
 	$contact_id = $r[0]['id']; 
 
@@ -328,6 +331,23 @@ function dfrn_poll_post(&$a) {
 		// NOTREACHED
 	}
 	else {
+
+		// Update the writable flag if it changed		
+		logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA);
+		if($dfrn_version >= 2.21) {
+			if($perm === 'rw')
+				$writable = 1;
+			else
+				$writable = 0;
+
+			if($writable !=  $contact['writable']) {
+				q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
+					intval($writable),
+					intval($contact_id)
+				);
+			}
+		}				
+
 		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
@@ -344,6 +364,7 @@ function dfrn_poll_content(&$a) {
 	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
 	$sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
 	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+	$perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
 
 	$direction = (-1);
 	if(strpos($dfrn_id,':') == 1) {
diff --git a/mod/display.php b/mod/display.php
index f74137e0e..da4566dc4 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -22,9 +22,6 @@ function display_content(&$a) {
 
 	$groups = array();
 
-	$tab = 'posts';
-
-
 	$contact = null;
 	$remote_contact = false;
 
@@ -48,6 +45,11 @@ function display_content(&$a) {
 		}
 	}
 
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+		intval($a->profile['uid'])
+	);
+	if(count($r))
+		$a->page_contact = $r[0];
 
 	$sql_extra = "
 		AND `allow_cid` = '' 
@@ -88,7 +90,7 @@ function display_content(&$a) {
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, 
+		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -102,17 +104,6 @@ function display_content(&$a) {
 	);
 
 
-
-	$cmnt_tpl = load_view_file('view/comment_item.tpl');
-	$like_tpl = load_view_file('view/like_noshare.tpl');
-	$tpl = load_view_file('view/wall_item.tpl');
-	$wallwall = load_view_file('view/wallwall_item.tpl');
-
-	$return_url = $_SESSION['return_url'] = $a->cmd;
-
-	$alike = array();
-	$dlike = array();
-
 	if(count($r)) {
 
 		if((local_user()) && (local_user() == $a->profile['uid'])) {
@@ -122,179 +113,10 @@ function display_content(&$a) {
 			);
 		}
 
-		foreach($r as $item) {
-			like_puller($a,$item,$alike,'like');
-			like_puller($a,$item,$dlike,'dislike');
-		}
-
-		$author_contacts = extract_item_authors($r,$a->profile['uid']);
-
-		foreach($r as $item) {
-
-			$template = $tpl;
-
-			$comment     = '';
-			$owner_url   = '';
-			$owner_photo = '';
-			$owner_name  = '';
-			
-			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-			
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-				: '<div class="wall-item-lock"></div>');
-
-			if(can_write_wall($a,$a->profile['uid'])) {
-				if($item['id'] == $item['parent']) {
-					$likebuttons = replace_macros($like_tpl,array(
-						'$id' => $item['id'],
-						'$likethis' => t("I like this \x28toggle\x29"),
-						'$nolike' => t("I don't like this \x28toggle\x29"),
-						'$share' => t('Share'),
-						'$wait' => t('Please wait') 
-					));
-				}
-				if($item['last-child']) {
-					$comment = replace_macros($cmnt_tpl,array(
-						'$return_path' => '', 
-						'$jsreload' => $_SESSION['return_url'],
-						'$type' => 'wall-comment',
-						'$id' => $item['item_id'],
-						'$parent' => $item['parent'],
-						'$profile_uid' =>  $a->profile['uid'],
-						'$mylink' => $contact['url'],
-						'$mytitle' => t('This is you'),
-						'$myphoto' => $contact['thumb'],
-						'$ww' => ''
-					));
-				}
-			}
-
-
-			$profile_url = $item['url'];
-			$sparkle = '';
-
-
-			// Top-level wall post not written by the wall owner (wall-to-wall)
-			// First figure out who owns it. 
-
-			$osparkle = '';
+		require_once('include/conversation.php');
 
-			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
-				
-				if($item['type'] === 'wall') {
-					// I do. Put me on the left of the wall-to-wall notice.
-					$owner_url = $a->contact['url'];
-					$owner_photo = $a->contact['thumb'];
-					$owner_name = $a->contact['name'];
-					$template = $wallwall;
-					$commentww = 'ww';	
-				}
-				if($item['type'] === 'remote' && ($item['owner-link'] != $item['author-link'])) {
-					// Could be anybody. 
-					$owner_url = $item['owner-link'];
-					$owner_photo = $item['owner-avatar'];
-					$owner_name = $item['owner-name'];
-					$template = $wallwall;
-					$commentww = 'ww';
-					// If it is our contact, use a friendly redirect link
-					if((link_compare($item['owner-link'],$item['url'])) && ($item['network'] === 'dfrn')) {
-						$owner_url = $redirect_url;
-						$osparkle = ' sparkle';
-					}
+		$o .= conversation($a,$r,'display', false);
 
-
-				}
-			}
-
-			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
-
-			$edpost = '';
-			if((local_user()) && ($item['uid'] == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
-				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
-			// Can we use our special contact URL for this author? 
-
-			if(strlen($item['author-link'])) {
-				$profile_link = $item['author-link'];
-				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-					$profile_link = $redirect_url;
-					$sparkle = ' sparkle';
-				}
-				elseif(isset($author_contacts[$item['author-link']])) {
-					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-					$sparkle = ' sparkle';
-				}
-			}
-
-			if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-				$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
-			else 
-				$drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
-
-			$like    = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-
-			$location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
-
-			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-				$indent .= ' shiny'; 
-
-
-			$tmp_item = replace_macros($template,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$olinktitle' => t('View $owner_name\'s profile'),
-				'$to' => t('to'),
-				'$wall' => t('Wall-to-Wall'),
-				'$vwall' => t('via Wall-To-Wall:'),
-				'$item_photo_menu' => item_photo_menu($item),
-				'$profile_url' => $profile_link,
-				'$name' => $profile_name,
-				'$sparkle' => $sparkle,
-				'$osparkle' => $osparkle,
-				'$thumb' => $profile_avatar,
-				'$title' => $item['title'],
-				'$body' => smilies(bbcode($item['body'])),
-				'$ago' => relative_date($item['created']),
-				'$lock' => $lock,
-				'$location' => $location,
-				'$indent' => $indent,
-				'$owner_url' => $owner_url,
-				'$owner_photo' => $owner_photo,
-				'$owner_name' => $owner_name,
-				'$plink' => get_plink($item),
-				'$edpost' => $edpost,
-				'$drop' => $drop,
-				'$vote' => $likebuttons,
-				'$like' => $like,
-				'$dislike' => $dislike,
-				'$comment' => $comment
-			));
-
-			$arr = array('item' => $item, 'output' => $tmp_item);
-			call_hooks('display_item', $arr);
-
-			$o .= $arr['output'];
-
-
-		}
 	}
 	else {
 		$r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
diff --git a/mod/follow.php b/mod/follow.php
index f30ecdc92..04858ce52 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -195,6 +195,9 @@ function follow_post(&$a) {
 	if(! x($vcard,'photo'))
 		$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; 
 
+
+	$writeable = ((($network === 'stat') && ($notify)) ? 1 : 0);
+
 	// check if we already have a contact
 	// the poll url is more reliable than the profile url, as we may have
 	// indirect links or webfinger links
@@ -217,8 +220,8 @@ function follow_post(&$a) {
 	else {
 		// create contact record 
 		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-			`blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 0, 0, 0 ) ",
+			`writable`, `blocked`, `readonly`, `pending` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
 			dbesc($profile),
@@ -230,7 +233,8 @@ function follow_post(&$a) {
 			dbesc($vcard['photo']),
 			dbesc($network),
 			intval(REL_FAN),
-			intval($priority)
+			intval($priority),
+			intval($writable)
 		);
 	}
 
diff --git a/mod/group.php b/mod/group.php
index 3ee14dd85..591c93627 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -128,11 +128,11 @@ function group_content(&$a) {
 			goaway($a->get_baseurl() . '/contacts');
 		}
 		$group = $r[0];
-		$ret = group_get_members($group['id']);
+		$members = group_get_members($group['id']);
 		$preselected = array();
-		if(count($ret))	{
-			foreach($ret as $p)
-				$preselected[] = $p['id'];
+		if(count($members))	{
+			foreach($members as $member)
+				$preselected[] = $member['id'];
 		}
 
 		$drop_tpl = load_view_file('view/group_drop.tpl');
@@ -156,6 +156,13 @@ function group_content(&$a) {
 		));
 
 	}
+
+	$o .= '<div id="group-members">';
+	foreach($members as $member) {
+		$o .= micropro($member,true,'mpgroup');
+	}
+	$o .= '</div><div id="group-members-end"></div>';
+
 	return $o;
 
 }
\ No newline at end of file
diff --git a/mod/install.php b/mod/install.php
index 5c508e4f2..740df6ca9 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -118,6 +118,16 @@ function install_content(&$a) {
 
 	$tpl = load_view_file('view/install_db.tpl');
 	$o .= replace_macros($tpl, array(
+		'$lbl_01' => t('Friendika Social Network'),
+		'$lbl_02' => t('Installation'),
+		'$lbl_03' => t('In order to install Friendika we need to know how to contact your database.'),
+		'$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+		'$lbl_05' => t('The database you specify below must already exist. If it does not, please create it before continuing.'),
+		'$lbl_06' => t('Database Server Name'),
+		'$lbl_07' => t('Database Login Name'),
+		'$lbl_08' => t('Database Login Password'),
+		'$lbl_09' => t('Database Name'),
+		'$lbl_10' => t('Please select a default timezone for your website'),
 		'$baseurl' => $a->get_baseurl(),
 		'$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()),
 		'$submit' => t('Submit'),
diff --git a/mod/lostpass.php b/mod/lostpass.php
index 335a1f512..c46a57e6a 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -71,8 +71,15 @@ function lostpass_content(&$a) {
 		if($r) {
 			$tpl = load_view_file('view/pwdreset.tpl');
 			$o .= replace_macros($tpl,array(
+				'$lbl1' => t('Password Reset'),
+				'$lbl2' => t('Your password has been reset as requested.'),
+				'$lbl3' => t('Your new password is'),
+				'$lbl4' => t('Save or copy your new password - and then'),
+				'$lbl5' => '<a href="' . $a->get_baseurl() . '">' . t('click here to login') . '</a>.',
+				'$lbl6' => t('Your password may be changed from the <em>Settings</em> page after successful login.'),
 				'$newpass' => $new_password,
 				'$baseurl' => $a->get_baseurl()
+
 			));
 				notice("Your password has been reset." . EOL);
 
diff --git a/mod/network.php b/mod/network.php
index 42c6c0c29..1b5ea5d65 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -32,8 +32,6 @@ function network_content(&$a, $update = 0) {
 
 	$o = '';
 
-	require_once("include/bbcode.php");
-
 	$contact_id = $a->cid;
 
 	$group = 0;
@@ -204,7 +202,7 @@ function network_content(&$a, $update = 0) {
 		// "New Item View" - show all items unthreaded in reverse created date order
 
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
 			`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item`, `contact`
@@ -248,7 +246,7 @@ function network_content(&$a, $update = 0) {
 			$parents_str = implode(', ', $parents_arr);
 
 			$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
+				`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`,
 				`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
 				`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 				FROM `item`, (SELECT `p`.`id`,`p`.`created` FROM `item` AS `p` WHERE `p`.`parent`=`p`.`id`) as `parentitem`, `contact`
@@ -264,345 +262,17 @@ function network_content(&$a, $update = 0) {
 		}
 	}
 
-	// find all the authors involved in remote conversations
-	// We will use a local profile photo if they are one of our contacts
-	// otherwise we have to get the photo from the item owner's site
-
-	$author_contacts = extract_item_authors($r,local_user());
-
-	$cmnt_tpl = load_view_file('view/comment_item.tpl');
-	$like_tpl = load_view_file('view/like.tpl');
-	$noshare_tpl = load_view_file('view/like_noshare.tpl');
-	$tpl = load_view_file('view/wall_item.tpl');
-	$wallwall = load_view_file('view/wallwall_item.tpl');
-
-	$alike = array();
-	$dlike = array();
-	
-	if(count($r)) {
-
-		if($nouveau) {
-
-			// "New Item View" - just loop through the items and format them minimally for display
-
-			$tpl = load_view_file('view/search_item.tpl');
-			$droptpl = load_view_file('view/wall_fake_drop.tpl');
-
-			foreach($r as $item) {
-
-				$comment     = '';
-				$owner_url   = '';
-				$owner_photo = '';
-				$owner_name  = '';
-				$sparkle     = '';
-			
-				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
-				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
-
-				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-				if(strlen($item['author-link'])) {
-					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-						$profile_link = $redirect_url;
-						$sparkle = ' sparkle';
-					}
-					elseif(isset($author_contacts[$item['author-link']])) {
-						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-						$sparkle = ' sparkle';
-					}
-				}
-
-				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-				if($coord) {
-					if($location)
-						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-					else
-						$location = '<span class="smalltext">' . $coord . '</span>';
-				}
-
-				$drop = replace_macros($droptpl,array('$id' => $item['id']));
-				$lock = '<div class="wall-item-lock"></div>';
-				
-				$o .= replace_macros($tpl,array(
-					'$id' => $item['item_id'],
-					'$linktitle' => t('View $name\'s profile'),
-					'$profile_url' => $profile_link,
-					'$item_photo_menu' => item_photo_menu($item),
-					'$name' => $profile_name,
-					'$sparkle' => $sparkle,
-					'$lock' => $lock,
-					'$thumb' => $profile_avatar,
-					'$title' => $item['title'],
-					'$body' => smilies(bbcode($item['body'])),
-					'$ago' => relative_date($item['created']),
-					'$location' => $location,
-					'$indent' => '',
-					'$owner_url' => $owner_url,
-					'$owner_photo' => $owner_photo,
-					'$owner_name' => $owner_name,
-					'$drop' => $drop,
-					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
-				));
-
-			}
-			$o .= paginate($a);
-
-			return $o;
-
-		}
-
-		// Normal View
-
-
-		// Figure out how many comments each parent has
-		// (Comments all have gravity of 6)
-		// Store the result in the $comments array
-
-		$comments = array();
-		foreach($r as $rr) {
-			if(intval($rr['gravity']) == 6) {
-				if(! x($comments,$rr['parent']))
-					$comments[$rr['parent']] = 1;
-				else
-					$comments[$rr['parent']] += 1;
-			}
-		}
-
-		// map all the like/dislike activities for each parent item 
-		// Store these in the $alike and $dlike arrays
-
-		foreach($r as $item) {
-			like_puller($a,$item,$alike,'like');
-			like_puller($a,$item,$dlike,'dislike');
-		}
-
-		$comments_collapsed = false;
-		$blowhard = 0;
-		$blowhard_count = 0;
-
-		foreach($r as $item) {
-
-			$comment = '';
-			$template = $tpl;
-			$commentww = '';
-			$sparkle = '';
-			$owner_url = $owner_photo = $owner_name = '';
-
-
-			// We've already parsed out like/dislike for special treatment. We can ignore them now
-
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
-				|| (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			// Take care of author collapsing and comment collapsing
-			// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
-			// If there are more than two comments, squash all but the last 2.
-
-			if($item['id'] == $item['parent']) {
-				if($blowhard == $item['cid'] && (! $item['self'])) {
-					$blowhard_count ++;
-					if($blowhard_count == 3) {
-						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
-					}
-				}
-				else {
-					$blowhard = $item['cid'];					
-					if($blowhard_count >= 3)
-						$o .= '</div>';
-					$blowhard_count = 0;
-				}
-
-				$comments_seen = 0;
-				$comments_collapsed = false;
-			}
-			else
-				$comments_seen ++;
-
+	// Set this so that the conversation function can find out contact info for our wall-wall items
+	$a->page_contact = $a->contact;
 
-			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-				if(! $comments_collapsed) {
-					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
-					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
-					$comments_collapsed = true;
-				}
-			}
-			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-				$o .= '</div>';
-			}
-
-
-
-			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-				: '<div class="wall-item-lock"></div>');
-
-
-			// Top-level wall post not written by the wall owner (wall-to-wall)
-			// First figure out who owns it. 
-
-			$osparkle = '';
-
-			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
-
-				if($item['type'] === 'wall') {
-					// I do. Put me on the left of the wall-to-wall notice.
-					$owner_url = $a->contact['url'];
-					$owner_photo = $a->contact['thumb'];
-					$owner_name = $a->contact['name'];
-					$template = $wallwall;
-					$commentww = 'ww';	
-				}
-				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
-					// Could be anybody. 
-					$owner_url = $item['owner-link'];
-					$owner_photo = $item['owner-avatar'];
-					$owner_name = $item['owner-name'];
-					$template = $wallwall;
-					$commentww = 'ww';
-					// If it is our contact, use a friendly redirect link
-					if((link_compare($item['owner-link'],$item['url'])) 
-						&& ($item['network'] === 'dfrn')) {
-						$owner_url = $redirect_url;
-						$osparkle = ' sparkle';
-					}
-				}
-			}
-
-			if($update)
-				$return_url = $_SESSION['return_url'];
-			else
-				$return_url = $_SESSION['return_url'] = $a->cmd;
-
-			$likebuttons = '';
-			if($item['id'] == $item['parent']) {
-				$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
-					'$id' => $item['id'],
-					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
-					'$share' => t('Share'),
-					'$wait' => t('Please wait') 
-				));
-			}
-
-			if($item['last-child']) {
-				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '', 
-					'$jsreload' => '', // $_SESSION['return_url'],
-					'$type' => 'net-comment',
-					'$id' => $item['item_id'],
-					'$parent' => $item['parent'],
-					'$profile_uid' =>  $_SESSION['uid'],
-					'$mylink' => $a->contact['url'],
-					'$mytitle' => t('This is you'),
-					'$myphoto' => $a->contact['thumb'],
-					'$ww' => $commentww
-				));
-			}
-
-			$edpost = '';
-			if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
-				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
-			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+	$mode = (($nouveau) ? 'network-new' : 'network');
 
-			$photo = $item['photo'];
-			$thumb = $item['thumb'];
+	require_once('include/conversation.php');
 
-			// Post was remotely authored.
-
-			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
-
-			if(strlen($item['author-link'])) {
-				$profile_link = $item['author-link'];
-				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-					$profile_link = $redirect_url;
-					$sparkle = ' sparkle';
-				}
-				elseif(isset($author_contacts[$item['author-link']])) {
-					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-					$sparkle = ' sparkle';
-				}
-			}
-			else 
-				$profile_link = $item['url'];
-
-			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-
-			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
-
-			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-				$indent .= ' shiny'; 
-
-
-
-			// Build the HTML
-
-			$tmp_item = replace_macros($template,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$olinktitle' => t('View $owner_name\'s profile'),
-				'$to' => t('to'),
-				'$wall' => t('Wall-to-Wall'),
-				'$vwall' => t('via Wall-To-Wall:'),
-				'$profile_url' => $profile_link,
-				'$item_photo_menu' => item_photo_menu($item),
-				'$name' => $profile_name,
-				'$thumb' => $profile_avatar,
-				'$osparkle' => $osparkle,
-				'$sparkle' => $sparkle,
-				'$title' => $item['title'],
-				'$body' => smilies(bbcode($item['body'])),
-				'$ago' => relative_date($item['created']),
-				'$lock' => $lock,
-				'$location' => $location,
-				'$indent' => $indent,
-				'$owner_url' => $owner_url,
-				'$owner_photo' => $owner_photo,
-				'$owner_name' => $owner_name,
-				'$plink' => get_plink($item),
-				'$edpost' => $edpost,
-				'$drop' => $drop,
-				'$vote' => $likebuttons,
-				'$like' => $like,
-				'$dislike' => $dislike,
-				'$comment' => $comment
-			));
-
-			$arr = array('item' => $item, 'output' => $tmp_item);
-			call_hooks('display_item', $arr);
-
-			$o .= $arr['output'];
-
-		}
-	}
+	$o .= conversation($a,$r,$mode,$update);
 
 	if(! $update) {
 
-		// if author collapsing is in force but didn't get closed, close it off now.
-
-		if($blowhard_count >= 3)
-			$o .= '</div>';
-
-
 		$o .= paginate($a);
 		$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
 	}
diff --git a/mod/notifications.php b/mod/notifications.php
index ed0831aab..c3f8449ed 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -147,17 +147,13 @@ function notifications_content(&$a) {
 				 LEFT JOIN `contact` ON `register`.`uid` = `contact`.`uid`
 				 LEFT JOIN `user` ON `register`.`uid` = `user`.`uid`;");
 		if(($r !== false) && (count($r))) {
-			$tpl = load_view_file("view/registrations.tpl");
+			$o .= '<ul>';
 			foreach($r as $rr) {
-				$o .= "<ul>";
-				$o .= replace_macros($tpl, array(
-					'$fullname' 	=> $rr['name'],
-					'$email'		=> $rr['email'],
-					'$approvelink' 	=> "regmod/allow/".$rr['hash'],
-					'$denylink' 	=> "regmod/deny/".$rr['hash'],
-				));
-				$o .= "</ul>";
+				$o .= '<li>' . sprintf('%s (%s) : ', $rr['name'],$rr['email']) 
+					. '<a href="regmod/allow/' . $rr['hash'] .'">' . t('Approve') 
+					. '</a> - <href="regmod/deny/' . $rr['hash'] . '">' . t('Deny') . '</a></li>' . "\r\n";
 			}
+			$o .= "</ul>";
 		}
 		else
 			notice( t('No registrations.') . EOL);
diff --git a/mod/opensearch.php b/mod/opensearch.php
new file mode 100644
index 000000000..69afba75c
--- /dev/null
+++ b/mod/opensearch.php
@@ -0,0 +1,18 @@
+<?php
+    function opensearch_content(&$a) {
+    	
+		$tpl = load_view_file('view/opensearch.tpl');
+	
+		header("Content-type: application/opensearchdescription+xml");
+	
+		$o = replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$nodename' => $a->get_hostname(),
+		));
+		
+		echo $o;
+		
+		killme();
+		
+	}
+?>
\ No newline at end of file
diff --git a/mod/parse_url.php b/mod/parse_url.php
index b3b42b6cb..a65215ca1 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -5,7 +5,11 @@ require_once('library/HTML5/Parser.php');
 
 function parse_url_content(&$a) {
 
-	$url = trim($_GET['url']);
+	logger('parse_url: ' . $_GET['url']);
+
+	$url = trim(hex2bin($_GET['url']));
+
+	logger('parse_url: ' . $url);
 
 	$text = null;
 
diff --git a/mod/photos.php b/mod/photos.php
index 061542c75..757b4685d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1105,6 +1105,8 @@ function photos_content(&$a) {
 							'$mylink' => $contact['url'],
 							'$mytitle' => t('This is you'),
 							'$myphoto' => $contact['thumb'],
+							'$comment' => t('Comment'),
+							'$submit' => t('Submit'),
 							'$ww' => ''
 						));
 					}
@@ -1257,17 +1259,14 @@ function photos_content(&$a) {
 	if(count($r)) {
 		foreach($r as $rr) {
 			$o .= replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] 
-					. '/image/' . $rr['resource-id'],
+				'$id'         => $rr['id'],
+				'$photolink'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
 				'$phototitle' => t('View Photo'),
-				'$imgsrc' => $a->get_baseurl() . '/photo/' 
-					. $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
-				'$albumlink' => $a->get_baseurl() . '/photos/' 
-					. $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
-				'$albumname' => $rr['album'],
-				'$albumalt' => t('View Album'),
-				'$imgalt' => $rr['filename']
+				'$imgsrc'     => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
+				'$albumlink'  => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+				'$albumname'  => $rr['album'],
+				'$albumalt'   => t('View Album'),
+				'$imgalt'     => $rr['filename']
 			));
 
 		}
diff --git a/mod/profile.php b/mod/profile.php
index b421591f6..0a044069a 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -106,16 +106,9 @@ function profile_content(&$a, $update = 0) {
 
 
 		if($tab === 'profile') {
-			$profile_lang = get_config('system','language');
-			if(! $profile_lang)
-				$profile_lang = 'en';
-			if(file_exists("view/$profile_lang/profile_advanced.php"))
-				require_once("view/$profile_lang/profile_advanced.php");
-			else
-				require_once('view/profile_advanced.php');
-
+			require_once('include/profile_advanced.php');
+			$o .= advanced_profile($a);
 			call_hooks('profile_advanced',$o);
-
 			return $o;
 		}
 
@@ -279,7 +272,7 @@ function profile_content(&$a, $update = 0) {
  
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
-			`contact`.`thumb`, `contact`.`self`, 
+			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 			WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
@@ -295,203 +288,17 @@ function profile_content(&$a, $update = 0) {
 	if($is_owner && ! $update)
 		$o .= get_birthdays();
 
-	$cmnt_tpl = load_view_file('view/comment_item.tpl');
-
-	$like_tpl = load_view_file('view/like.tpl');
-	$noshare_tpl = load_view_file('view/like_noshare.tpl');
-
-	$tpl = load_view_file('view/wall_item.tpl');
-
-	$droptpl = load_view_file('view/wall_item_drop.tpl');
-	$fakedrop = load_view_file('view/wall_fake_drop.tpl');
-
-	if($update)
-		$return_url = $_SESSION['return_url'];
-	else
-		$return_url = $_SESSION['return_url'] = $a->cmd;
-
-	$alike = array();
-	$dlike = array();
-
-	if($r !== false && count($r)) {
-
-		$comments = array();
-		foreach($r as $rr) {
-			if(intval($rr['gravity']) == 6) {
-				if(! x($comments,$rr['parent']))
-					$comments[$rr['parent']] = 1;
-				else
-					$comments[$rr['parent']] += 1;
-			}
-		}
-
-		foreach($r as $item) {
-			like_puller($a,$item,$alike,'like');
-			like_puller($a,$item,$dlike,'dislike');
-		}
-
-		$comments_collapsed = false;
 
-		foreach($r as $item) {
+	require_once('include/conversation.php');
 
-			$sparkle = '';		
-			$comment = '';
-			$likebuttons = '';
+	$o .= conversation($a,$r,'profile',$update);
 
-			$template = $tpl;
-			
-			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			if($item['id'] == $item['parent']) {
-				$comments_seen = 0;
-				$comments_collapsed = false;
-			}
-			else
-				$comments_seen ++;
-
-
-			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-				if(! $comments_collapsed) {
-					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
-					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
-					$comments_collapsed = true;
-				}
-			}
-			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-				$o .= '</div></div>';
-			}
-
-			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-				: '<div class="wall-item-lock"></div>');
-
-			if(can_write_wall($a,$a->profile['profile_uid'])) {
-				if($item['id'] == $item['parent']) {
-					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
-						'$id' => $item['id'],
-						'$likethis' => t("I like this \x28toggle\x29"),
-						'$nolike' => t("I don't like this \x28toggle\x29"),
-						'$share' => t('Share'),
-						'$wait' => t('Please wait') 
-					));
-				}
-				if($item['last-child']) {
-					$comment = replace_macros($cmnt_tpl,array(
-						'$return_path' => '', 
-						'$jsreload' => '', // $_SESSION['return_url'],
-						'$type' => 'wall-comment',
-						'$id' => $item['item_id'],
-						'$parent' => $item['parent'],
-						'$profile_uid' =>  $a->profile['profile_uid'],
-						'$mylink' => $contact['url'],
-						'$mytitle' => t('This is you'),
-						'$myphoto' => $contact['thumb'],
-						'$ww' => ''
-					));
-				}
-			}
-
-
-			$profile_url = $item['url'];
-
-			// This is my profile page but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
-			// I can go directly to their profile as an authenticated guest.
-
-			if(local_user() && ($item['contact-uid'] == local_user()) 
-				&& ($item['network'] === 'dfrn') && (! $item['self'] )) {
-				$profile_url = $redirect_url;
-				$sparkle = ' sparkle';
-			}
-			else
-				$sparkle = '';
-
-
-			$edpost = '';
-			if((local_user()) && ($a->profile['profile_uid'] == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
-				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
-
-
-			// We would prefer to use our own avatar link for this item because the one in the author-avatar might reference a 
-			// remote site (which could be down). We will use author-avatar if we haven't got something stored locally.
-			// We use this same logic block in mod/network.php to determine it this is a third party post and we don't have any 
-			// local contact info at all. In this module you should never encounter a third-party author, but we still will do
-			// the right thing if you ever do. 
-
-			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
-
-			$profile_link = $profile_url;
-
-			$drop = '';
-			$dropping = false;
-
-			if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-				$dropping = true;
-
-			$drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
-
-
-			$like    = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
-
-			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-				$indent .= ' shiny'; 
-
-
-			$tmp_item = replace_macros($template,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$profile_url' => $profile_link,
-				'$item_photo_menu' => item_photo_menu($item),				
-				'$name' => $profile_name,
-				'$thumb' => $profile_avatar,
-				'$sparkle' => $sparkle,
-				'$title' => $item['title'],
-				'$body' => smilies(bbcode($item['body'])),
-				'$ago' => relative_date($item['created']),
-				'$lock' => $lock,
-				'$location' => $location, 
-				'$indent' => $indent, 
-				'$plink' => get_plink($item),
-				'$edpost' => $edpost,
-				'$drop' => $drop,
-				'$like' => $like,
-				'$vote' => $likebuttons,
-				'$dislike' => $dislike,
-				'$comment' => $comment
-			));
-
-			$arr = array('item' => $item, 'output' => $tmp_item);
-			call_hooks('display_item', $arr);
-
-			$o .= $arr['output'];
-			
-		}
-	}
-
-	if($update) {
-		return $o;
-	}
+	if(! $update) {
 		
-	$o .= paginate($a);
-	$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+		$o .= paginate($a);
+		$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+	}
 
 	return $o;
 }
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 48805fbdd..fe4da3baf 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -184,7 +184,11 @@ function profile_photo_content(&$a) {
 		$tpl = load_view_file('view/profile_photo.tpl');
 
 		$o .= replace_macros($tpl,array(
-			'$user' => $a->user['nickname']
+			'$user' => $a->user['nickname'],
+			'$lbl_upfile' => t('Upload File:'),
+			'$title' => t('Upload Profile Photo'),
+			'$submit' => t('Upload'),
+			'$select' => sprintf('%s %s', t('or'), '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
 
 		return $o;
diff --git a/mod/profiles.php b/mod/profiles.php
index 434f58adf..4802f21aa 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -351,6 +351,9 @@ function profiles_content(&$a) {
 
 		$opt_tpl = load_view_file("view/profile-hide-friends.tpl");
 		$hide_friends = replace_macros($opt_tpl,array(
+			'$desc' => t('Hide my contact/friend list from viewers of this profile?'),
+			'$yes_str' => t('Yes'),
+			'$no_str' => t('No'),
 			'$yes_selected' => (($r[0]['hide-friends']) ? " checked=\"checked\" " : ""),
 			'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
 		));
@@ -363,6 +366,44 @@ function profiles_content(&$a) {
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = load_view_file("view/profile_edit.tpl");
 		$o .= replace_macros($tpl,array(
+			'$banner' => t('Edit Profile Details'),
+			'$submit' => t('Submit'),
+			'$viewprof' => t('View this profile'),
+			'$cr_prof' => t('Create a new profile using these settings'),
+			'$cl_prof' => t('Clone this profile'),
+			'$del_prof' => t('Delete this profile'),
+			'$lbl_profname' => t('Profile Name:'),
+			'$lbl_fullname' => t('Your Full Name:'),
+			'$lbl_title' => t('Title/Description:'),
+			'$lbl_gender' => t('Your Gender:'),
+			'$lbl_bd' => t("Birthday \x28y/m/d\x29:"),
+			'$lbl_address' => t('Street Address:'),
+			'$lbl_city' => t('Locality/City:'),
+			'$lbl_zip' => t('Postal/Zip Code:'),
+			'$lbl_country' => t('Country:'),
+			'$lbl_region' => t('Region/State:'),
+			'$lbl_marital' => t('<span class="heart">&hearts;</span> Marital Status:'),
+			'$lbl_with' => t("Who: \x28if applicable\x29"),
+			'$lbl_ex1' => t('Examples: cathy123, Cathy Williams, cathy@example.com'),
+			'$lbl_sexual' => t('Sexual Preference:'),
+			'$lbl_homepage' => t('Homepage URL:'),
+			'$lbl_politic' => t('Political Views:'),
+			'$lbl_religion' => t('Religious Views:'),
+			'$lbl_pubkey' => t('Public Keywords:'),
+			'$lbl_prvkey' => t('Private Keywords:'),
+			'$lbl_ex2' => t('Example: fishing photography software'),
+			'$lbl_pubdsc' => t("\x28Used for suggesting potential friends, can be seen by others\x29"),
+			'$lbl_prvdsc' => t("\x28Used for searching profiles, never shown to others\x29"),
+			'$lbl_about' => t('Tell us about yourself...'),
+			'$lbl_hobbies' => t('Hobbies/Interests'),
+			'$lbl_social' => t('Contact information and Social Networks'),
+			'$lbl_music' => t('Musical interests'),
+			'$lbl_book' => t('Books, literature'),
+			'$lbl_tv' => t('Television'),
+			'$lbl_film' => t('Film/dance/culture/entertainment'),
+			'$lbl_love' => t('Love/romance'),
+			'$lbl_work' => t('Work/employment'),
+			'$lbl_school' => t('School/education'),
 			'$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''),
 			'$baseurl' => $a->get_baseurl(),
 			'$profile_id' => $r[0]['id'],
@@ -410,7 +451,14 @@ function profiles_content(&$a) {
 			local_user());
 		if(count($r)) {
 
-			$o .= load_view_file('view/profile_listing_header.tpl');
+			$tpl_header = load_view_file('view/profile_listing_header.tpl');
+			$o .= replace_macros($tpl_header,array(
+				'$header' => t('Profiles'),
+				'$chg_photo' => t('Change profile photo'),
+				'$cr_new' => t('Create New Profile')
+			));
+
+
 			$tpl_default = load_view_file('view/profile_entry_default.tpl');
 			$tpl = load_view_file('view/profile_entry.tpl');
 
diff --git a/mod/search.php b/mod/search.php
index b53bd45c0..23b2ddb7e 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -65,7 +65,7 @@ function search_content(&$a) {
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, 
+		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
 		`user`.`nickname`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -80,68 +80,10 @@ function search_content(&$a) {
 		dbesc($search)
 	);
 
-	$tpl = load_view_file('view/search_item.tpl');
-	$droptpl = load_view_file('view/wall_fake_drop.tpl');
-
-	$return_url = $_SESSION['return_url'] = $a->cmd;
-
-	if(count($r)) {
-
-		foreach($r as $item) {
-
-			$total       = 0;
-			$comment     = '';
-			$owner_url   = '';
-			$owner_photo = '';
-			$owner_name  = '';
-			$sparkle     = '';
-			
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			$total ++;
-
-			$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
-			$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
-
-
-			$location = (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$drop = replace_macros($droptpl,array('$id' => $item['id']));
-			$lock = '<div class="wall-item-lock"></div>';
-
-			$o .= replace_macros($tpl,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$profile_url' => $profile_link,
-				'$item_photo_menu' => item_photo_menu($item),				
-				'$name' => $profile_name,
-				'$sparkle' => $sparkle,
-				'$lock' => $lock,
-				'$thumb' => $profile_avatar,
-				'$title' => $item['title'],
-				'$body' => bbcode($item['body']),
-				'$ago' => relative_date($item['created']),
-				'$location' => $location,
-				'$indent' => '',
-				'$owner_url' => $owner_url,
-				'$owner_photo' => $owner_photo,
-				'$owner_name' => $owner_name,
-				'$drop' => $drop,
-				'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $item['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
-			));
-
-		}
-	}
+
+	require_once('include/conversation.php');
+
+	$o .= conversation($a,$r,'search',false);
 
 	$o .= paginate($a);
 
diff --git a/mod/settings.php b/mod/settings.php
index 72b627d41..5f88d95fb 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -285,6 +285,9 @@ function settings_content(&$a) {
 	else {
 		$opt_tpl = load_view_file("view/profile-in-directory.tpl");
 		$profile_in_dir = replace_macros($opt_tpl,array(
+			'$desc'         => t('Publish your default profile in site directory?'),
+			'$yes_str'      => t('Yes'),
+			'$no_str'       => t('No'),
 			'$yes_selected' => (($profile['publish'])      ? " checked=\"checked\" " : ""),
 			'$no_selected'  => (($profile['publish'] == 0) ? " checked=\"checked\" " : "")
 		));
@@ -294,6 +297,9 @@ function settings_content(&$a) {
 		$opt_tpl = load_view_file("view/profile-in-netdir.tpl");
 
 		$profile_in_net_dir = replace_macros($opt_tpl,array(
+			'$desc'         => t('Publish your default profile in global social directory?'),
+			'$yes_str'      => t('Yes'),
+			'$no_str'       => t('No'),
 			'$yes_selected' => (($profile['net-publish'])      ? " checked=\"checked\" " : ""),
 			'$no_selected'  => (($profile['net-publish'] == 0) ? " checked=\"checked\" " : "")
 		));
@@ -309,18 +315,7 @@ function settings_content(&$a) {
 	if($invisible)
 		notice( t('Profile is <strong>not published</strong>.') . EOL );
 
-	$nickname_block = load_view_file("view/settings_nick_set.tpl");
 	
-	$nickname_subdir = '';
-	if(strlen($a->get_path())) {
-		$subdir_tpl = load_view_file('view/settings_nick_subdir.tpl');
-		$nickname_subdir = replace_macros($subdir_tpl, array(
-			'$baseurl' => $a->get_baseurl(),
-			'$nickname' => $nickname,
-			'$hostname' => $a->get_hostname()
-		));
-	}
-
 	$theme_selector = '<select name="theme" id="theme-select" >';
 	$files = glob('view/theme/*');
 
@@ -338,13 +333,16 @@ function settings_content(&$a) {
 	}
 	$theme_selector .= '</select>';
 
+	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
 
-	$nickname_block = replace_macros($nickname_block,array(
+	$tpl_addr = load_view_file("view/settings_nick_set.tpl");
+
+	$prof_addr = replace_macros($tpl_addr,array(
+		'$desc' => t('Your profile address is'),
 		'$nickname' => $nickname,
-		'$uid' => local_user(),
-		'$subdir' => $nickname_subdir,
-		'$basepath' => $a->get_hostname(),
-		'$baseurl' => $a->get_baseurl()));	
+		'$subdir' => $subdir,
+		'$basepath' => $a->get_hostname()
+	));
 
 	$stpl = load_view_file('view/settings.tpl');
 
@@ -354,6 +352,34 @@ function settings_content(&$a) {
 
 
 	$o .= replace_macros($stpl,array(
+		'$ptitle' => t('Account Settings'),
+		'$lbl_plug' => t('Plugin Settings'),
+		'$lbl_basic' => t('Basic Settings'),
+		'$lbl_fn' => t('Full Name:'),
+		'$lbl_email' => t('Email Address:'),
+		'$lbl_tz' => t('Your Timezone:'),
+		'$lbl_loc1' => t('Default Post Location:'),
+		'$lbl_loc2' => t('Use Browser Location:'),
+		'$lbl_theme' => t('Display Theme:'),
+		'$submit' => t('Submit'),
+		'$lbl_prv' => t('Security and Privacy Settings'),
+		'$lbl_maxreq' => t('Maximum Friend Requests/Day:'),
+		'$lbl_maxrdesc' => t("\x28to prevent spam abuse\x29"),
+		'$lbl_rempost' => t('Allow friends to post to your profile page:'),
+		'$lbl_exp1' => t("Automatically expire \x28delete\x29 posts older than"),
+		'$lbl_exp2' => t('days'),
+		'$lbl_not1' => t('Notification Settings'),
+		'$lbl_not2' => t('Send a notification email when:'),
+		'$lbl_not3' => t('You receive an introduction'),
+		'$lbl_not4' => t('Your introductions are confirmed'),
+		'$lbl_not5' => t('Someone writes on your profile wall'),
+		'$lbl_not6' => t('Someone writes a followup comment'),
+		'$lbl_not7' => t('You receive a private message'),
+		'$lbl_pass1' => t('Password Settings'),
+		'$lbl_pass2' => t('Leave password fields blank unless changing'),
+		'$lbl_pass3' => t('New Password:'),
+		'$lbl_pass4' => t('Confirm:'),
+		'$lbl_advn' => t('Advanced Page Settings'),
 		'$baseurl' => $a->get_baseurl(),
 		'$oidhtml' => $oidhtml,
 		'$uexport' => $uexport,
@@ -361,7 +387,7 @@ function settings_content(&$a) {
 		'$username' => $username,
 		'$openid' => $openid,
 		'$email' => $email,
-		'$nickname_block' => $nickname_block,
+		'$nickname_block' => $prof_addr,
 		'$timezone' => $timezone,
 		'$zoneselect' => select_timezone($timezone),
 		'$defloc' => $defloc,
diff --git a/mod/share.php b/mod/share.php
index 8a8229e8a..f355a842a 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -17,7 +17,7 @@ function share_init(&$a) {
 	$o = '';
 
 	$o .= '&#x2672; <a href="' . $r[0]['author-link'] . '">' . $r[0]['author-name'] . '</a><br />';
-	$o .= prepare_body($r[0]);
+	$o .= bbcode($r[0]['body'], true);
 	echo $o . '<br />';
 	killme();  
-}
\ No newline at end of file
+}
diff --git a/update.php b/update.php
index 1c243e6ee..bb4536ae9 100644
--- a/update.php
+++ b/update.php
@@ -423,3 +423,24 @@ function update_1045() {
 function update_1046() {
 	q("ALTER TABLE `item` ADD `attach` MEDIUMTEXT NOT NULL AFTER `tag` ");
 }
+
+function update_1047() {
+	q("ALTER TABLE `contact` ADD `writable` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `readonly` ");
+}
+
+function update_1048() {
+	q("UPDATE `contact` SET `writable` = 1 WHERE `network` = 'stat' AND `notify` != '' ");
+}
+
+function update_1049() {
+	q("CREATE TABLE `mailacct` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`uid` INT NOT NULL,
+	`server` CHAR( 255 ) NOT NULL ,
+	`user` CHAR( 255 ) NOT NULL ,
+	`pass` CHAR( 255 ) NOT NULL ,
+	`reply_to` CHAR( 255 ) NOT NULL ,
+	`last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'
+	) ENGINE = MYISAM ");
+}
+
diff --git a/util/messages.po b/util/messages.po
index 88e1fcd01..23f250da2 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,998 +6,868 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.941\n"
+"Project-Id-Version: 2.1.942\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-06 23:01-0700\n"
+"POT-Creation-Date: 2011-04-08 12:29+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
-msgstr ""
-
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:630 ../../addon/js_upload/js_upload.php:41
-msgid "Cancel"
-msgstr ""
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:483
-#, php-format
-msgid "%s welcomes %s"
+#: ../../index.php:208
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/photos.php:30 ../../wip/photos.php:31
-#: ../../wip/photos-chris.php:41
-msgid "Photo Albums"
+#: ../../index.php:209
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
-#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1244 ../../include/Photo.php:225
-#: ../../include/Photo.php:232 ../../include/Photo.php:239
-#: ../../include/items.php:1028 ../../include/items.php:1031
-#: ../../include/items.php:1034 ../../wip/photos.php:35
-#: ../../wip/photos.php:98 ../../wip/photos.php:731 ../../wip/photos.php:785
-#: ../../wip/photos.php:800 ../../wip/photos.php:1111
-#: ../../wip/photos.php:1122 ../../wip/photos-chris.php:45
-#: ../../wip/photos-chris.php:118 ../../wip/photos-chris.php:778
-#: ../../wip/photos-chris.php:832 ../../wip/photos-chris.php:847
-#: ../../wip/photos-chris.php:1158 ../../wip/photos-chris.php:1169
-msgid "Contact Photos"
+#: ../../index.php:264 ../../mod/group.php:88
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/photos.php:85 ../../mod/photos.php:773 ../../mod/editpost.php:10
-#: ../../mod/install.php:93 ../../mod/notifications.php:56
-#: ../../mod/contacts.php:106 ../../mod/settings.php:15
-#: ../../mod/settings.php:20 ../../mod/settings.php:211
-#: ../../mod/manage.php:75 ../../mod/network.php:6 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:13 ../../mod/register.php:25
-#: ../../mod/regmod.php:16 ../../mod/item.php:57 ../../mod/item.php:668
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133
-#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../index.php:265 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
+#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
+#: ../../mod/settings.php:15 ../../mod/settings.php:20
+#: ../../mod/settings.php:211 ../../mod/photos.php:85 ../../mod/photos.php:773
+#: ../../mod/display.php:311 ../../mod/editpost.php:10 ../../mod/invite.php:13
+#: ../../mod/invite.php:50 ../../mod/contacts.php:106
+#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
+#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:668
 #: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8
-#: ../../mod/display.php:309 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110
-#: ../../wip/photos.php:77 ../../wip/photos.php:723
-#: ../../wip/photos-chris.php:97 ../../wip/photos-chris.php:770
-#: ../../index.php:265
+#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
+#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
 msgid "Permission denied."
 msgstr ""
 
-#: ../../mod/photos.php:95 ../../wip/photos.php:87
-#: ../../wip/photos-chris.php:107
-msgid "Contact information unavailable"
-msgstr ""
-
-#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
-#: ../../mod/photos.php:865 ../../mod/register.php:285
-#: ../../mod/register.php:292 ../../mod/register.php:299
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
-#: ../../mod/profile_photo.php:227 ../../mod/profile_photo.php:236
-#: ../../wip/photos.php:98 ../../wip/photos.php:493 ../../wip/photos.php:785
-#: ../../wip/photos.php:800 ../../wip/photos-chris.php:118
-#: ../../wip/photos-chris.php:525 ../../wip/photos-chris.php:832
-#: ../../wip/photos-chris.php:847
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../mod/photos.php:116 ../../wip/photos.php:108
-#: ../../wip/photos-chris.php:128
-msgid "Album not found."
+#: ../../boot.php:359
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:859 ../../wip/photos.php:126
-#: ../../wip/photos.php:794 ../../wip/photos-chris.php:146
-#: ../../wip/photos-chris.php:841
-msgid "Delete Album"
+#: ../../boot.php:360 ../../mod/profile.php:387 ../../mod/photos.php:1108
+#: ../../mod/display.php:173 ../../mod/network.php:505
+msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1067 ../../wip/photos.php:192
-#: ../../wip/photos.php:955 ../../wip/photos-chris.php:212
-#: ../../wip/photos-chris.php:1002
-msgid "Delete Photo"
+#: ../../boot.php:813
+msgid "Create a New Account"
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../wip/photos.php:442
-#: ../../wip/photos-chris.php:462
-msgid "was tagged in a"
+#: ../../boot.php:814 ../../mod/register.php:463 ../../include/nav.php:62
+msgid "Register"
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../mod/like.php:110 ../../wip/photos.php:442
-#: ../../wip/photos-chris.php:462
-msgid "photo"
+#: ../../boot.php:820
+msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../wip/photos.php:442
-#: ../../wip/photos-chris.php:462
-msgid "by"
+#: ../../boot.php:821
+msgid "Password: "
 msgstr ""
 
-#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
-#: ../../wip/photos.php:511 ../../wip/photos-chris.php:555
-msgid "Image exceeds size limit of "
+#: ../../boot.php:822 ../../boot.php:828 ../../include/nav.php:45
+msgid "Login"
 msgstr ""
 
-#: ../../mod/photos.php:571 ../../mod/profile_photo.php:118
-#: ../../mod/wall_upload.php:65 ../../wip/photos.php:520
-#: ../../wip/photos-chris.php:567
-msgid "Unable to process image."
+#: ../../boot.php:826
+msgid "Nickname/Email/OpenID: "
 msgstr ""
 
-#: ../../mod/photos.php:589 ../../mod/profile_photo.php:232
-#: ../../mod/wall_upload.php:82 ../../wip/photos.php:537
-#: ../../wip/photos-chris.php:585
-msgid "Image upload failed."
+#: ../../boot.php:827
+msgid "Password (if not OpenID): "
 msgstr ""
 
-#: ../../mod/photos.php:661 ../../wip/photos.php:611
-#: ../../wip/photos-chris.php:658
-msgid "No photos selected"
+#: ../../boot.php:830
+msgid "Forgot your password?"
 msgstr ""
 
-#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
-#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/group.php:97
-#: ../../mod/group.php:155 ../../mod/invite.php:64
-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
-#: ../../addon/statusnet/statusnet.php:163
-#: ../../addon/statusnet/statusnet.php:189
-#: ../../addon/statusnet/statusnet.php:207 ../../addon/twitter/twitter.php:156
-#: ../../addon/twitter/twitter.php:175 ../../wip/photos.php:754
-#: ../../wip/photos.php:793 ../../wip/photos.php:954
-#: ../../wip/addon/randplace/randplace.php:178 ../../wip/photos-chris.php:801
-#: ../../wip/photos-chris.php:840 ../../wip/photos-chris.php:1001
-msgid "Submit"
+#: ../../boot.php:831 ../../mod/lostpass.php:74
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/photos.php:808 ../../wip/photos.php:742
-#: ../../wip/photos-chris.php:789
-msgid "Upload Photos"
+#: ../../boot.php:842 ../../include/nav.php:39
+msgid "Logout"
 msgstr ""
 
-#: ../../mod/photos.php:811 ../../mod/photos.php:854 ../../wip/photos.php:745
-#: ../../wip/photos.php:789 ../../wip/photos-chris.php:792
-#: ../../wip/photos-chris.php:836
-msgid "New album name: "
+#: ../../boot.php:1083
+msgid "prev"
 msgstr ""
 
-#: ../../mod/photos.php:812 ../../wip/photos.php:746
-#: ../../wip/photos-chris.php:793
-msgid "or existing album name: "
+#: ../../boot.php:1085
+msgid "first"
 msgstr ""
 
-#: ../../mod/photos.php:814 ../../mod/photos.php:1062 ../../wip/photos.php:749
-#: ../../wip/photos-chris.php:796
-msgid "Permissions"
+#: ../../boot.php:1114
+msgid "last"
 msgstr ""
 
-#: ../../mod/photos.php:869 ../../wip/photos.php:804
-#: ../../wip/photos-chris.php:851
-msgid "Edit Album"
+#: ../../boot.php:1117
+msgid "next"
 msgstr ""
 
-#: ../../mod/photos.php:879 ../../mod/photos.php:1263 ../../wip/photos.php:814
-#: ../../wip/photos.php:1141 ../../wip/photos-chris.php:861
-#: ../../wip/photos-chris.php:1188
-msgid "View Photo"
+#: ../../boot.php:1848
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../mod/photos.php:909 ../../wip/photos.php:843
-#: ../../wip/photos-chris.php:890
-msgid "Photo not available"
+#: ../../boot.php:1848
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../mod/photos.php:956 ../../wip/photos.php:864
-#: ../../wip/photos-chris.php:911
-msgid "Edit photo"
+#: ../../boot.php:1852
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../mod/photos.php:958
-msgid "Use as profile photo"
+#: ../../boot.php:1854
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../mod/photos.php:962 ../../mod/network.php:443
-#: ../../mod/profile.php:370 ../../mod/display.php:149
-msgid "Private Message"
+#: ../../boot.php:1860
+msgid "and"
 msgstr ""
 
-#: ../../mod/photos.php:969
-msgid "<< Prev"
+#: ../../boot.php:1863
+#, php-format
+msgid ", and %d other people"
 msgstr ""
 
-#: ../../mod/photos.php:973 ../../wip/photos.php:870
-#: ../../wip/photos-chris.php:917
-msgid "View Full Size"
+#: ../../boot.php:1864
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../mod/photos.php:977
-msgid "Next >>"
+#: ../../boot.php:1864
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../mod/photos.php:1036 ../../wip/photos.php:928
-#: ../../wip/photos-chris.php:975
-msgid "Tags: "
+#: ../../boot.php:2025
+msgid "No contacts"
 msgstr ""
 
-#: ../../mod/photos.php:1046 ../../wip/photos.php:938
-#: ../../wip/photos-chris.php:985
-msgid "[Remove any tag]"
-msgstr ""
+#: ../../boot.php:2033
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/photos.php:1055
-msgid "New album name"
+#: ../../boot.php:2049 ../../mod/viewcontacts.php:17
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/photos.php:1058 ../../wip/photos.php:948
-#: ../../wip/photos-chris.php:995
-msgid "Caption"
+#: ../../boot.php:2066 ../../mod/search.php:17 ../../include/nav.php:68
+msgid "Search"
 msgstr ""
 
-#: ../../mod/photos.php:1060 ../../wip/photos.php:950
-#: ../../wip/photos-chris.php:997
-msgid "Add a Tag"
+#: ../../boot.php:2221 ../../mod/profile.php:8
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/photos.php:1064 ../../wip/photos.php:952
-#: ../../wip/photos-chris.php:999
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../boot.php:2278
+msgid "Connect"
 msgstr ""
 
-#: ../../mod/photos.php:1084 ../../mod/network.php:487
-#: ../../mod/profile.php:377 ../../mod/display.php:156
-msgid "I like this (toggle)"
+#: ../../boot.php:2288
+msgid "Location:"
 msgstr ""
 
-#: ../../mod/photos.php:1085 ../../mod/network.php:488
-#: ../../mod/profile.php:378 ../../mod/display.php:157
-msgid "I don't like this (toggle)"
+#: ../../boot.php:2292
+msgid ", "
 msgstr ""
 
-#: ../../mod/photos.php:1086 ../../mod/network.php:105
-#: ../../mod/network.php:489 ../../mod/profile.php:165
-#: ../../mod/profile.php:379 ../../mod/display.php:158
-msgid "Share"
+#: ../../boot.php:2300 ../../include/profile_advanced.php:23
+msgid "Gender:"
 msgstr ""
 
-#: ../../mod/photos.php:1087 ../../mod/editpost.php:70
-#: ../../mod/network.php:114 ../../mod/network.php:490
-#: ../../mod/message.php:190 ../../mod/message.php:324
-#: ../../mod/profile.php:174 ../../mod/profile.php:380
-#: ../../mod/display.php:159
-msgid "Please wait"
+#: ../../boot.php:2304
+msgid "Status:"
 msgstr ""
 
-#: ../../mod/photos.php:1106 ../../mod/photos.php:1146
-#: ../../mod/photos.php:1175 ../../mod/network.php:503
-#: ../../mod/profile.php:392 ../../mod/display.php:171
-#: ../../wip/photos.php:986 ../../wip/photos.php:1025
-#: ../../wip/photos.php:1053 ../../wip/photos-chris.php:1033
-#: ../../wip/photos-chris.php:1072 ../../wip/photos-chris.php:1100
-msgid "This is you"
+#: ../../boot.php:2306 ../../include/profile_advanced.php:103
+msgid "Homepage:"
 msgstr ""
 
-#: ../../mod/photos.php:1203 ../../mod/network.php:512 ../../mod/group.php:141
-#: ../../mod/profile.php:438 ../../mod/display.php:238
-msgid "Delete"
+#: ../../boot.php:2397
+msgid "Monday"
 msgstr ""
 
-#: ../../mod/photos.php:1249 ../../wip/photos.php:1127
-#: ../../wip/photos-chris.php:1174
-msgid "Recent Photos"
+#: ../../boot.php:2397
+msgid "Tuesday"
 msgstr ""
 
-#: ../../mod/photos.php:1253 ../../wip/photos.php:1131
-#: ../../wip/photos-chris.php:1178
-msgid "Upload New Photos"
+#: ../../boot.php:2397
+msgid "Wednesday"
 msgstr ""
 
-#: ../../mod/photos.php:1269 ../../wip/photos.php:1147
-#: ../../wip/photos-chris.php:1194
-msgid "View Album"
+#: ../../boot.php:2397
+msgid "Thursday"
 msgstr ""
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
+#: ../../boot.php:2397
+msgid "Friday"
 msgstr ""
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
+#: ../../boot.php:2397
+msgid "Saturday"
 msgstr ""
 
-#: ../../mod/editpost.php:62 ../../mod/network.php:511
-#: ../../mod/profile.php:416 ../../mod/display.php:222
-msgid "Edit"
+#: ../../boot.php:2397
+msgid "Sunday"
 msgstr ""
 
-#: ../../mod/editpost.php:63 ../../mod/network.php:106
-#: ../../mod/message.php:188 ../../mod/message.php:322
-#: ../../mod/profile.php:166
-msgid "Upload photo"
+#: ../../boot.php:2401
+msgid "January"
 msgstr ""
 
-#: ../../mod/editpost.php:64 ../../mod/network.php:107
-#: ../../mod/message.php:189 ../../mod/message.php:323
-#: ../../mod/profile.php:167
-msgid "Insert web link"
+#: ../../boot.php:2401
+msgid "February"
 msgstr ""
 
-#: ../../mod/editpost.php:65 ../../mod/network.php:108
-#: ../../mod/profile.php:168
-msgid "Insert YouTube video"
+#: ../../boot.php:2401
+msgid "March"
 msgstr ""
 
-#: ../../mod/editpost.php:66 ../../mod/network.php:109
-#: ../../mod/profile.php:169
-msgid "Insert Vorbis [.ogg] video"
+#: ../../boot.php:2401
+msgid "April"
 msgstr ""
 
-#: ../../mod/editpost.php:67 ../../mod/network.php:110
-#: ../../mod/profile.php:170
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../boot.php:2401
+msgid "May"
 msgstr ""
 
-#: ../../mod/editpost.php:68 ../../mod/network.php:111
-#: ../../mod/profile.php:171
-msgid "Set your location"
+#: ../../boot.php:2401
+msgid "June"
 msgstr ""
 
-#: ../../mod/editpost.php:69 ../../mod/network.php:112
-#: ../../mod/profile.php:172
-msgid "Clear browser location"
+#: ../../boot.php:2401
+msgid "July"
 msgstr ""
 
-#: ../../mod/editpost.php:71 ../../mod/network.php:115
-#: ../../mod/profile.php:175
-msgid "Permission settings"
+#: ../../boot.php:2401
+msgid "August"
 msgstr ""
 
-#: ../../mod/editpost.php:77 ../../mod/network.php:121
-#: ../../mod/profile.php:182
-msgid "CC: email addresses"
+#: ../../boot.php:2401
+msgid "September"
 msgstr ""
 
-#: ../../mod/editpost.php:79 ../../mod/network.php:123
-#: ../../mod/profile.php:184
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../boot.php:2401
+msgid "October"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
+#: ../../boot.php:2401
+msgid "November"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
-msgid "Profile location is not valid or does not contain profile information."
+#: ../../boot.php:2401
+msgid "December"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
-msgid "Warning: profile location has no identifiable owner name."
+#: ../../boot.php:2416
+msgid "g A l F d"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
-msgid "Warning: profile location has no profile photo."
+#: ../../boot.php:2433
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
-#, 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"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/dfrn_request.php:164
-msgid "Introduction complete."
+#: ../../boot.php:2434
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:188
-msgid "Unrecoverable protocol error."
+#: ../../boot.php:2435
+msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:216
-msgid "Profile unavailable."
+#: ../../boot.php:2446
+msgid "[today]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:241
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../boot.php:2643
+msgid "link to source"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:242
-msgid "Spam protection measures have been invoked."
+#: ../../boot.php:2729
+msgid "View status"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:243
-msgid "Friends are advised to please try again in 24 hours."
+#: ../../boot.php:2730
+msgid "View profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:273
-msgid "Invalid locator"
+#: ../../boot.php:2731
+msgid "View photos"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:292
-msgid "Unable to resolve your name at the provided location."
+#: ../../boot.php:2732 ../../mod/contacts.php:385
+msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:305
-msgid "You have already introduced yourself here."
+#: ../../boot.php:2733
+msgid "Send PM"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
+#: ../../mod/manage.php:37
 #, php-format
-msgid "Apparently you are already friends with %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:330
-msgid "Invalid profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:336
-msgid "Disallowed profile URL."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90
-msgid "Failed to update contact record."
+msgid "Welcome back %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:423
-msgid "Your introduction has been sent."
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:477
-msgid "Please login to confirm introduction."
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:491
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:503
-#, php-format
-msgid "Welcome home %s."
+#: ../../mod/manage.php:106 ../../mod/profile.php:388
+#: ../../mod/profiles.php:370 ../../mod/settings.php:364
+#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
+#: ../../mod/photos.php:1109 ../../mod/display.php:174 ../../mod/invite.php:64
+#: ../../mod/contacts.php:264 ../../mod/install.php:133
+#: ../../mod/network.php:506 ../../mod/group.php:97 ../../mod/group.php:155
+#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
+#: ../../addon/statusnet/statusnet.php:163
+#: ../../addon/statusnet/statusnet.php:189
+#: ../../addon/statusnet/statusnet.php:207
+#: ../../addon/facebook/facebook.php:151
+#: ../../addon/randplace/randplace.php:179
+msgid "Submit"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:504
+#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
 #, php-format
-msgid "Please confirm your introduction/connection request to %s."
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:505
-msgid "Confirm"
+#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
+#: ../../mod/photos.php:571
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:538 ../../include/items.php:1411
-msgid "[Name Withheld]"
+#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:95 ../../mod/item.php:212
+#: ../../mod/message.php:93
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:545
-msgid "Introduction received at "
+#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:236
+#: ../../mod/photos.php:589
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
-#: ../../mod/register.php:329 ../../mod/register.php:366
-#: ../../mod/regmod.php:93 ../../mod/item.php:475 ../../mod/item.php:498
 #: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:392
-#: ../../mod/dfrn_notify.php:478 ../../mod/dfrn_confirm.php:649
-#: ../../include/items.php:1420
+#: ../../mod/dfrn_notify.php:478 ../../mod/regmod.php:93
+#: ../../mod/register.php:329 ../../mod/register.php:366
+#: ../../mod/dfrn_request.php:547 ../../mod/lostpass.php:39
+#: ../../mod/item.php:475 ../../mod/item.php:498
+#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1420
 msgid "Administrator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:617
-msgid "Friend/Connection Request"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:618
-msgid "Please answer the following:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:619
-msgid "Does $name know you?"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:620 ../../mod/register.php:436
-msgid "Yes"
+#: ../../mod/dfrn_notify.php:179
+msgid "noreply"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621 ../../mod/register.php:437
-msgid "No"
+#: ../../mod/dfrn_notify.php:237
+msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:622
-msgid "Add a personal note:"
+#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:623
-msgid ""
-"Please enter your profile address from one of the following supported social "
-"networks:"
+#: ../../mod/profile.php:102
+msgid "Status"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:624
-msgid "Friendika"
+#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:625
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/profile.php:104
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:626
-msgid "Private (secure) network"
+#: ../../mod/profile.php:130 ../../mod/network.php:77
+#: ../../mod/message.php:172
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
-msgid "Public (insecure) network"
+#: ../../mod/profile.php:131 ../../mod/network.php:78
+msgid "Please enter a YouTube link:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628
-msgid "Your profile address:"
+#: ../../mod/profile.php:132 ../../mod/network.php:79
+msgid "Please enter a video(.ogg) link/URL:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:629
-msgid "Submit Request"
+#: ../../mod/profile.php:133 ../../mod/network.php:80
+msgid "Please enter an audio(.ogg) link/URL:"
 msgstr ""
 
-#: ../../mod/install.php:33
-msgid "Could not create/connect to database."
+#: ../../mod/profile.php:134 ../../mod/network.php:81
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../mod/install.php:38
-msgid "Connected to database."
+#: ../../mod/profile.php:135 ../../mod/network.php:82
+msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../mod/install.php:72
-msgid "Proceed with Installation"
+#: ../../mod/profile.php:158 ../../mod/profile.php:372
+#: ../../mod/photos.php:1086 ../../mod/display.php:158
+#: ../../mod/network.php:105 ../../mod/network.php:489
+msgid "Share"
 msgstr ""
 
-#: ../../mod/install.php:74
-msgid "Your Friendika site database has been installed."
+#: ../../mod/profile.php:159 ../../mod/editpost.php:63
+#: ../../mod/network.php:106 ../../mod/message.php:188
+#: ../../mod/message.php:322
+msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/install.php:75
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/profile.php:160 ../../mod/editpost.php:64
+#: ../../mod/network.php:107 ../../mod/message.php:189
+#: ../../mod/message.php:323
+msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/profile.php:161 ../../mod/editpost.php:65
+#: ../../mod/network.php:108
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/install.php:78
-msgid "Proceed to registration"
+#: ../../mod/profile.php:162 ../../mod/editpost.php:66
+#: ../../mod/network.php:109
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/install.php:84
-msgid "Database import failed."
+#: ../../mod/profile.php:163 ../../mod/editpost.php:67
+#: ../../mod/network.php:110
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/install.php:85
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: ../../mod/profile.php:164 ../../mod/editpost.php:68
+#: ../../mod/network.php:111
+msgid "Set your location"
 msgstr ""
 
-#: ../../mod/install.php:98
-msgid "Welcome to Friendika."
+#: ../../mod/profile.php:165 ../../mod/editpost.php:69
+#: ../../mod/network.php:112
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/install.php:138
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/profile.php:166 ../../mod/network.php:113
+msgid "Set title"
 msgstr ""
 
-#: ../../mod/install.php:139
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
+#: ../../mod/profile.php:167 ../../mod/profile.php:373
+#: ../../mod/photos.php:1087 ../../mod/display.php:159
+#: ../../mod/editpost.php:70 ../../mod/network.php:114
+#: ../../mod/network.php:490 ../../mod/message.php:190
+#: ../../mod/message.php:324
+msgid "Please wait"
 msgstr ""
 
-#: ../../mod/install.php:146
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/profile.php:168 ../../mod/editpost.php:71
+#: ../../mod/network.php:115
+msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/install.php:147
-msgid "This is required for message delivery to work."
+#: ../../mod/profile.php:175 ../../mod/editpost.php:77
+#: ../../mod/network.php:121
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/install.php:169
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/profile.php:177 ../../mod/editpost.php:79
+#: ../../mod/network.php:123
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/install.php:170
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/profile.php:352 ../../mod/network.php:428
+#, php-format
+msgid "See all %d comments"
 msgstr ""
 
-#: ../../mod/install.php:179
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/profile.php:363 ../../mod/photos.php:962
+#: ../../mod/display.php:149 ../../mod/network.php:443
+msgid "Private Message"
 msgstr ""
 
-#: ../../mod/install.php:181
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/profile.php:370 ../../mod/photos.php:1084
+#: ../../mod/display.php:156 ../../mod/network.php:487
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/install.php:183
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/profile.php:371 ../../mod/photos.php:1085
+#: ../../mod/display.php:157 ../../mod/network.php:488
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/install.php:185
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/profile.php:385 ../../mod/photos.php:1106
+#: ../../mod/photos.php:1148 ../../mod/photos.php:1177
+#: ../../mod/display.php:171 ../../mod/network.php:503
+msgid "This is you"
 msgstr ""
 
-#: ../../mod/install.php:187
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/profile.php:411 ../../mod/display.php:224
+#: ../../mod/editpost.php:62 ../../mod/network.php:513
+msgid "Edit"
 msgstr ""
 
-#: ../../mod/install.php:198
-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."
+#: ../../mod/profile.php:433 ../../mod/photos.php:1205
+#: ../../mod/display.php:240 ../../mod/network.php:514 ../../mod/group.php:141
+msgid "Delete"
 msgstr ""
 
-#: ../../mod/install.php:199
-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."
+#: ../../mod/profile.php:455 ../../mod/search.php:124
+#: ../../mod/display.php:264 ../../mod/network.php:330
+#: ../../mod/network.php:563
+msgid "View $name's profile"
 msgstr ""
 
-#: ../../mod/install.php:200
+#: ../../mod/profile.php:489 ../../mod/display.php:320
+#: ../../mod/register.php:442 ../../mod/network.php:609
 msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
-#: ../../mod/install.php:201
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+#: ../../mod/follow.php:186
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/install.php:210
+#: ../../mod/follow.php:192
 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:225
-msgid "Errors encountered creating database tables."
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/match.php:10
-msgid "Profile Match"
+#: ../../mod/follow.php:243
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/match.php:50
-msgid "No matches"
+#: ../../mod/follow.php:289
+msgid "following"
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
+#: ../../mod/profile_photo.php:231 ../../mod/profile_photo.php:240
+#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
+#: ../../mod/photos.php:865 ../../mod/register.php:285
+#: ../../mod/register.php:292 ../../mod/register.php:299
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/home.php:23
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:243
 #, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../mod/notifications.php:28
-msgid "Invalid request identifier."
-msgstr ""
-
-#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
-msgid "Discard"
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
-msgid "Ignore"
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/notifications.php:68
-msgid "Pending Friend/Connect Notifications"
+#: ../../mod/profile_photo.php:188
+msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Show Ignored Requests"
+#: ../../mod/profile_photo.php:189
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Hide Ignored Requests"
+#: ../../mod/profile_photo.php:190
+msgid "Upload"
 msgstr ""
 
-#: ../../mod/notifications.php:104
-msgid "Claims to be known to you: "
+#: ../../mod/profile_photo.php:191 ../../mod/settings.php:336
+msgid "or"
 msgstr ""
 
-#: ../../mod/notifications.php:104
-msgid "yes"
+#: ../../mod/profile_photo.php:191
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/notifications.php:104
-msgid "no"
+#: ../../mod/profile_photo.php:204
+msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/notifications.php:110
-msgid "Approve as: "
+#: ../../mod/profile_photo.php:205
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/notifications.php:111
-msgid "Friend"
+#: ../../mod/profile_photo.php:206
+msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/notifications.php:112
-msgid "Fan/Admirer"
+#: ../../mod/profile_photo.php:234
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/notifications.php:119
-msgid "Notification type: "
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/notifications.php:120
-msgid "Friend/Connect Request"
+#: ../../mod/regmod.php:10
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/notifications.php:120
-msgid "New Follower"
+#: ../../mod/regmod.php:54
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/notifications.php:130
-msgid "Approve"
+#: ../../mod/regmod.php:92 ../../mod/register.php:328
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/notifications.php:139
-msgid "No notifications."
+#: ../../mod/regmod.php:96
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/notifications.php:143
-msgid "User registrations waiting for confirm"
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/notifications.php:163
-msgid "No registrations."
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/contacts.php:12
-msgid "Invite Friends"
+#: ../../mod/profiles.php:199
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/contacts.php:15
-msgid "Find People With Shared Interests"
+#: ../../mod/profiles.php:254
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/contacts.php:19
-msgid "Connect/Follow"
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/contacts.php:20
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/contacts.php:21
-msgid "Follow"
+#: ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
-msgid "Could not access contact record."
+#: ../../mod/profiles.php:354
+msgid "Hide my contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/contacts.php:57
-msgid "Could not locate selected profile."
+#: ../../mod/profiles.php:355 ../../mod/settings.php:289
+#: ../../mod/settings.php:301 ../../mod/register.php:436
+#: ../../mod/dfrn_request.php:620
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/contacts.php:88
-msgid "Contact updated."
+#: ../../mod/profiles.php:356 ../../mod/settings.php:290
+#: ../../mod/settings.php:302 ../../mod/register.php:437
+#: ../../mod/dfrn_request.php:621
+msgid "No"
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been blocked"
+#: ../../mod/profiles.php:369
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been unblocked"
+#: ../../mod/profiles.php:371
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/contacts.php:160
-msgid "Contact has been ignored"
+#: ../../mod/profiles.php:372
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/contacts.php:160
-msgid "Contact has been unignored"
+#: ../../mod/profiles.php:373
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/contacts.php:181
-msgid "stopped following"
+#: ../../mod/profiles.php:374
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/contacts.php:200
-msgid "Contact has been removed."
+#: ../../mod/profiles.php:375
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
+#: ../../mod/profiles.php:376
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
-msgid "Mutual Friendship"
+#: ../../mod/profiles.php:377
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
-msgid "is a fan of yours"
+#: ../../mod/profiles.php:378
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
-msgid "you are a fan of"
+#: ../../mod/profiles.php:379
+msgid "Birthday (y/m/d):"
 msgstr ""
 
-#: ../../mod/contacts.php:252
-msgid "Privacy Unavailable"
+#: ../../mod/profiles.php:380
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/contacts.php:253
-msgid "Private communications are not available for this contact."
+#: ../../mod/profiles.php:381
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/contacts.php:256
-msgid "Never"
+#: ../../mod/profiles.php:382
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "(Update was successful)"
+#: ../../mod/profiles.php:383
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "(Update was not successful)"
+#: ../../mod/profiles.php:384
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/contacts.php:263
-msgid "Contact Editor"
+#: ../../mod/profiles.php:385
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/contacts.php:264
-msgid "Visit $name's profile"
+#: ../../mod/profiles.php:386
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/contacts.php:265
-msgid "Block/Unblock contact"
+#: ../../mod/profiles.php:387
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/contacts.php:266
-msgid "Ignore contact"
+#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "Delete contact"
+#: ../../mod/profiles.php:389
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/contacts.php:269
-msgid "Last updated: "
+#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115
+msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/contacts.php:270
-msgid "Update public posts: "
+#: ../../mod/profiles.php:391
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/contacts.php:272
-msgid "Update now"
+#: ../../mod/profiles.php:392
+msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/contacts.php:275
-msgid "Unblock this contact"
+#: ../../mod/profiles.php:393
+msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/contacts.php:275
-msgid "Block this contact"
+#: ../../mod/profiles.php:394
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/contacts.php:276
-msgid "Unignore this contact"
+#: ../../mod/profiles.php:395
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/contacts.php:276
-msgid "Ignore this contact"
+#: ../../mod/profiles.php:396
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/contacts.php:279
-msgid "Currently blocked"
+#: ../../mod/profiles.php:397
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/contacts.php:280
-msgid "Currently ignored"
+#: ../../mod/profiles.php:398
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/contacts.php:311 ../../include/nav.php:112
-#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
-msgid "Contacts"
+#: ../../mod/profiles.php:399
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/contacts.php:313
-msgid "Show Blocked Connections"
+#: ../../mod/profiles.php:400
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/contacts.php:313
-msgid "Hide Blocked Connections"
+#: ../../mod/profiles.php:401
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/contacts.php:315 ../../mod/directory.php:38
-msgid "Finding: "
+#: ../../mod/profiles.php:402
+msgid "Television"
 msgstr ""
 
-#: ../../mod/contacts.php:316 ../../mod/directory.php:40
-msgid "Find"
+#: ../../mod/profiles.php:403
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44
-msgid "Visit $username's profile"
+#: ../../mod/profiles.php:404
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/contacts.php:377 ../../boot.php:2732
-msgid "Edit contact"
+#: ../../mod/profiles.php:405
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/lostpass.php:27
-msgid "Password reset request issued. Check your email."
+#: ../../mod/profiles.php:406
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/lostpass.php:38
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/profiles.php:411
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/lostpass.php:56
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../mod/profiles.php:421 ../../mod/directory.php:91
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/lostpass.php:100
-msgid "Forgot your Password?"
+#: ../../mod/profiles.php:456 ../../include/nav.php:110
+msgid "Profiles"
 msgstr ""
 
-#: ../../mod/lostpass.php:101
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/profiles.php:457
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/lostpass.php:102
-msgid "Nickname or Email: "
+#: ../../mod/profiles.php:458
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/lostpass.php:103
-msgid "Reset"
+#: ../../mod/profiles.php:470
+msgid "Profile Image"
 msgstr ""
 
 #: ../../mod/settings.php:38
@@ -1036,11 +906,11 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:216 ../../mod/settings.php:356
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:217
+#: ../../mod/settings.php:217 ../../mod/settings.php:355
 msgid "Account Settings"
 msgstr ""
 
@@ -1088,198 +958,571 @@ msgstr ""
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:310
+#: ../../mod/settings.php:288
+msgid "Publish your default profile in site directory?"
+msgstr ""
+
+#: ../../mod/settings.php:300
+msgid "Publish your default profile in global social directory?"
+msgstr ""
+
+#: ../../mod/settings.php:316
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:353
+#: ../../mod/settings.php:341
+msgid "Your profile address is"
+msgstr ""
+
+#: ../../mod/settings.php:351
 msgid "Export Personal Data"
 msgstr ""
 
+#: ../../mod/settings.php:357
+msgid "Basic Settings"
+msgstr ""
+
+#: ../../mod/settings.php:358 ../../include/profile_advanced.php:10
+msgid "Full Name:"
+msgstr ""
+
+#: ../../mod/settings.php:359
+msgid "Email Address:"
+msgstr ""
+
+#: ../../mod/settings.php:360
+msgid "Your Timezone:"
+msgstr ""
+
+#: ../../mod/settings.php:361
+msgid "Default Post Location:"
+msgstr ""
+
+#: ../../mod/settings.php:362
+msgid "Use Browser Location:"
+msgstr ""
+
+#: ../../mod/settings.php:363
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:365
+msgid "Security and Privacy Settings"
+msgstr ""
+
+#: ../../mod/settings.php:366
+msgid "Maximum Friend Requests/Day:"
+msgstr ""
+
+#: ../../mod/settings.php:367
+msgid "(to prevent spam abuse)"
+msgstr ""
+
+#: ../../mod/settings.php:368
+msgid "Allow friends to post to your profile page:"
+msgstr ""
+
+#: ../../mod/settings.php:369
+msgid "Automatically expire (delete) posts older than"
+msgstr ""
+
+#: ../../mod/settings.php:370 ../../include/datetime.php:154
+msgid "days"
+msgstr ""
+
 #: ../../mod/settings.php:371
+msgid "Notification Settings"
+msgstr ""
+
+#: ../../mod/settings.php:372
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:373
+msgid "You receive an introduction"
+msgstr ""
+
+#: ../../mod/settings.php:374
+msgid "Your introductions are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:375
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:376
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:377
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:378
+msgid "Password Settings"
+msgstr ""
+
+#: ../../mod/settings.php:379
+msgid "Leave password fields blank unless changing"
+msgstr ""
+
+#: ../../mod/settings.php:380
+msgid "New Password:"
+msgstr ""
+
+#: ../../mod/settings.php:381
+msgid "Confirm:"
+msgstr ""
+
+#: ../../mod/settings.php:382
+msgid "Advanced Page Settings"
+msgstr ""
+
+#: ../../mod/settings.php:397
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/search.php:62
+msgid "No results."
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/search.php:140 ../../mod/network.php:346
+msgid "View in context"
 msgstr ""
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+#: ../../mod/photos.php:30
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
+#: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1235
+#: ../../mod/photos.php:1246 ../../include/Photo.php:225
+#: ../../include/Photo.php:232 ../../include/Photo.php:239
+#: ../../include/items.php:1028 ../../include/items.php:1031
+#: ../../include/items.php:1034
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/network.php:18
-msgid "Normal View"
+#: ../../mod/photos.php:95
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/network.php:20
-msgid "New Item View"
+#: ../../mod/photos.php:116
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/network.php:59
+#: ../../mod/photos.php:134 ../../mod/photos.php:859
+msgid "Delete Album"
+msgstr ""
+
+#: ../../mod/photos.php:197 ../../mod/photos.php:1067
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../mod/photos.php:469
+msgid "was tagged in a"
+msgstr ""
+
+#: ../../mod/photos.php:469 ../../mod/like.php:110
+msgid "photo"
+msgstr ""
+
+#: ../../mod/photos.php:469
+msgid "by"
+msgstr ""
+
+#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
+msgid "Image exceeds size limit of "
+msgstr ""
+
+#: ../../mod/photos.php:661
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:808
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:811 ../../mod/photos.php:854
+msgid "New album name: "
+msgstr ""
+
+#: ../../mod/photos.php:812
+msgid "or existing album name: "
+msgstr ""
+
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062
+msgid "Permissions"
+msgstr ""
+
+#: ../../mod/photos.php:869
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:879 ../../mod/photos.php:1265
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:909
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:956
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:958
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:969
+msgid "<< Prev"
+msgstr ""
+
+#: ../../mod/photos.php:973
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:977
+msgid "Next >>"
+msgstr ""
+
+#: ../../mod/photos.php:1036
+msgid "Tags: "
+msgstr ""
+
+#: ../../mod/photos.php:1046
+msgid "[Remove any tag]"
+msgstr ""
+
+#: ../../mod/photos.php:1055
+msgid "New album name"
+msgstr ""
+
+#: ../../mod/photos.php:1058
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:1060
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1064
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+
+#: ../../mod/photos.php:1251
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../mod/photos.php:1255
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../mod/photos.php:1271
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/display.php:15 ../../mod/display.php:315 ../../mod/item.php:598
+msgid "Item not found."
+msgstr ""
+
+#: ../../mod/display.php:265 ../../mod/network.php:564
+msgid "View $owner_name's profile"
+msgstr ""
+
+#: ../../mod/display.php:266 ../../mod/network.php:565
+msgid "to"
+msgstr ""
+
+#: ../../mod/display.php:267 ../../mod/network.php:566
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../mod/display.php:268 ../../mod/network.php:567
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: ../../mod/display.php:308
+msgid "Item has been removed."
+msgstr ""
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr ""
+
+#: ../../mod/editpost.php:32
+msgid "Edit post"
+msgstr ""
+
+#: ../../mod/invite.php:28
 #, php-format
-msgid "%d member"
-msgid_plural "%d members"
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../mod/invite.php:32
+#, php-format
+msgid "Please join my network on %s"
+msgstr ""
+
+#: ../../mod/invite.php:38
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../mod/invite.php:42
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:60
+#: ../../mod/invite.php:57
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../mod/invite.php:59 ../../mod/message.php:185 ../../mod/message.php:319
+msgid "Your message:"
+msgstr ""
+
+#: ../../mod/invite.php:60
 #, php-format
-msgid "Warning: This group contains %s from an insecure network."
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/network.php:61
-msgid "Private messages to this group are at risk of public disclosure."
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/network.php:77 ../../mod/message.php:172
-#: ../../mod/profile.php:137
-msgid "Please enter a link URL:"
+#: ../../mod/invite.php:62
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/network.php:78 ../../mod/profile.php:138
-msgid "Please enter a YouTube link:"
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../mod/network.php:79 ../../mod/profile.php:139
-msgid "Please enter a video(.ogg) link/URL:"
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
 msgstr ""
 
-#: ../../mod/network.php:80 ../../mod/profile.php:140
-msgid "Please enter an audio(.ogg) link/URL:"
+#: ../../mod/contacts.php:19
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../mod/network.php:81 ../../mod/profile.php:141
-msgid "Where are you right now?"
+#: ../../mod/contacts.php:20
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../mod/network.php:82 ../../mod/profile.php:142
-msgid "Enter a title for this item"
+#: ../../mod/contacts.php:21
+msgid "Follow"
 msgstr ""
 
-#: ../../mod/network.php:113 ../../mod/profile.php:173
-msgid "Set title"
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/network.php:166
-msgid "No such group"
+#: ../../mod/contacts.php:57
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/network.php:177
-msgid "Group is empty"
+#: ../../mod/contacts.php:88
+msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/network.php:181
-msgid "Group: "
+#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/network.php:330 ../../mod/network.php:561
-#: ../../mod/profile.php:460 ../../mod/display.php:262
-#: ../../mod/search.php:124
-msgid "View $name's profile"
+#: ../../mod/contacts.php:146
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/network.php:346 ../../mod/search.php:140
-msgid "View in context"
+#: ../../mod/contacts.php:146
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/network.php:409
-msgid "See more posts like this"
+#: ../../mod/contacts.php:160
+msgid "Contact has been ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:160
+msgid "Contact has been unignored"
+msgstr ""
+
+#: ../../mod/contacts.php:181
+msgid "stopped following"
 msgstr ""
 
-#: ../../mod/network.php:428 ../../mod/profile.php:359
+#: ../../mod/contacts.php:200
+msgid "Contact has been removed."
+msgstr ""
+
+#: ../../mod/contacts.php:214 ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
+msgstr ""
+
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:360
+msgid "Mutual Friendship"
+msgstr ""
+
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:364
+msgid "is a fan of yours"
+msgstr ""
+
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:368
+msgid "you are a fan of"
+msgstr ""
+
+#: ../../mod/contacts.php:252
+msgid "Privacy Unavailable"
+msgstr ""
+
+#: ../../mod/contacts.php:253
+msgid "Private communications are not available for this contact."
+msgstr ""
+
+#: ../../mod/contacts.php:256
+msgid "Never"
+msgstr ""
+
+#: ../../mod/contacts.php:260
+msgid "(Update was successful)"
+msgstr ""
+
+#: ../../mod/contacts.php:260
+msgid "(Update was not successful)"
+msgstr ""
+
+#: ../../mod/contacts.php:263
+msgid "Contact Editor"
+msgstr ""
+
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
+msgstr ""
+
+#: ../../mod/contacts.php:266
 #, php-format
-msgid "See all %d comments"
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/network.php:562 ../../mod/display.php:263
-msgid "View $owner_name's profile"
+#: ../../mod/contacts.php:267
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/network.php:563 ../../mod/display.php:264
-msgid "to"
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
 msgstr ""
 
-#: ../../mod/network.php:564 ../../mod/display.php:265
-msgid "Wall-to-Wall"
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
 msgstr ""
 
-#: ../../mod/network.php:565 ../../mod/display.php:266
-msgid "via Wall-To-Wall:"
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> to guide them."
 msgstr ""
 
-#: ../../mod/network.php:607 ../../mod/register.php:442
-#: ../../mod/profile.php:494 ../../mod/display.php:318
+#: ../../mod/contacts.php:271
 msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+"Please take a moment to elaborate on this selection if you feel it could be "
+"helpful to others."
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../mod/contacts.php:272
+msgid "Visit $name's profile"
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../mod/contacts.php:273
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:127
-msgid "Group not found."
+#: ../../mod/contacts.php:274
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../mod/contacts.php:275
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/group.php:79
-msgid "Membership list updated."
+#: ../../mod/contacts.php:277
+msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/group.php:88 ../../index.php:264
-msgid "Permission denied"
+#: ../../mod/contacts.php:278
+msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/group.php:95
-msgid "Create a group of contacts/friends."
+#: ../../mod/contacts.php:280
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/group.php:96 ../../mod/group.php:153
-msgid "Group Name: "
+#: ../../mod/contacts.php:283
+msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/group.php:111
-msgid "Group removed."
+#: ../../mod/contacts.php:283
+msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/group.php:113
-msgid "Unable to remove group."
+#: ../../mod/contacts.php:284
+msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/group.php:152
-msgid "Group Editor"
+#: ../../mod/contacts.php:284
+msgid "Ignore this contact"
 msgstr ""
 
-#: ../../mod/group.php:154
-msgid "Members:"
+#: ../../mod/contacts.php:287
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:17 ../../boot.php:2049
-msgid "View Contacts"
+#: ../../mod/contacts.php:288
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:32
-msgid "No contacts."
+#: ../../mod/contacts.php:319 ../../include/acl_selectors.php:140
+#: ../../include/acl_selectors.php:155 ../../include/nav.php:112
+msgid "Contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:321
+msgid "Show Blocked Connections"
+msgstr ""
+
+#: ../../mod/contacts.php:321
+msgid "Hide Blocked Connections"
+msgstr ""
+
+#: ../../mod/contacts.php:323 ../../mod/directory.php:38
+msgid "Finding: "
+msgstr ""
+
+#: ../../mod/contacts.php:324 ../../mod/directory.php:40
+msgid "Find"
+msgstr ""
+
+#: ../../mod/contacts.php:384 ../../mod/viewcontacts.php:44
+msgid "Visit $username's profile"
+msgstr ""
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
 #: ../../mod/register.php:47
@@ -1336,11 +1579,6 @@ msgstr ""
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:328 ../../mod/regmod.php:92
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
 #: ../../mod/register.php:333
 msgid ""
 "Registration successful. Please check your email for further instructions."
@@ -1406,375 +1644,552 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:463 ../../include/nav.php:62 ../../boot.php:814
-msgid "Register"
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
 msgstr ""
 
-#: ../../mod/like.php:110
-msgid "status"
+#: ../../mod/install.php:33
+msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../mod/like.php:127
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../mod/install.php:38
+msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/like.php:129
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/friendika.php:12 ../../wip/friendika.php:12
-msgid "This is Friendika version"
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
 msgstr ""
 
-#: ../../mod/friendika.php:13 ../../wip/friendika.php:13
-msgid "running at web location"
+#: ../../mod/install.php:75
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/friendika.php:15
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr ""
+
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
+msgstr ""
+
+#: ../../mod/install.php:84
+msgid "Database import failed."
+msgstr ""
+
+#: ../../mod/install.php:85
 msgid ""
-"Shared content within the Friendika network is provided under the <a href="
-"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
-"3.0 license</a>"
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/friendika.php:17
+#: ../../mod/install.php:98
+msgid "Welcome to Friendika."
+msgstr ""
+
+#: ../../mod/install.php:121
+msgid "Friendika Social Network"
+msgstr ""
+
+#: ../../mod/install.php:122
+msgid "Installation"
+msgstr ""
+
+#: ../../mod/install.php:123
 msgid ""
-"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
-"a> to learn more about the Friendika project."
+"In order to install Friendika we need to know how to contact your database."
 msgstr ""
 
-#: ../../mod/friendika.php:19 ../../wip/friendika.php:15
-msgid "Bug reports and issues: please visit"
+#: ../../mod/install.php:124
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/friendika.php:20 ../../wip/friendika.php:16
+#: ../../mod/install.php:125
 msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
-"dot com"
+"The database you specify below must already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/friendika.php:25
-msgid "Installed plugins/addons/apps"
+#: ../../mod/install.php:126
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/friendika.php:33
-msgid "No installed plugins/addons/apps"
+#: ../../mod/install.php:127
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/regmod.php:10
-msgid "Please login."
+#: ../../mod/install.php:128
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/regmod.php:54
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/install.php:129
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/regmod.php:96
-msgid "Account approved."
+#: ../../mod/install.php:130
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/item.php:37
-msgid "Unable to locate original post."
+#: ../../mod/install.php:148
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/item.php:126
-msgid "Empty post discarded."
+#: ../../mod/install.php:149
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
 msgstr ""
 
-#: ../../mod/item.php:212 ../../mod/message.php:93
-#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95
-msgid "Wall Photos"
+#: ../../mod/install.php:156
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/item.php:474
-#, php-format
-msgid "%s commented on your item at %s"
+#: ../../mod/install.php:157
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/item.php:497
-#, php-format
-msgid "%s posted on your profile wall at %s"
+#: ../../mod/install.php:179
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/item.php:523
-msgid "System error. Post not saved."
+#: ../../mod/install.php:180
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/item.php:541
-#, php-format
+#: ../../mod/install.php:189
 msgid ""
-"This message was sent to you by %s, a member of the Friendika social network."
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/item.php:543
-msgid "You may visit them online at"
+#: ../../mod/install.php:191
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/item.php:545
+#: ../../mod/install.php:193
 msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/item.php:547
-#, php-format
-msgid "%s posted an update."
+#: ../../mod/install.php:195
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:313
-msgid "Item not found."
+#: ../../mod/install.php:197
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/install.php:208
+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/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:239
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: ../../mod/install.php:209
+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/profile_photo.php:95
-msgid "Unable to process image"
+#: ../../mod/install.php:210
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
+msgstr ""
+
+#: ../../mod/install.php:211
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
+msgstr ""
+
+#: ../../mod/install.php:220
+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:235
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../mod/network.php:18
+msgid "Normal View"
 msgstr ""
 
-#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
+#: ../../mod/network.php:20
+msgid "New Item View"
+msgstr ""
+
+#: ../../mod/network.php:59
 #, php-format
-msgid "Image exceeds size limit of %d"
+msgid "%d member"
+msgid_plural "%d members"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/network.php:60
+#, php-format
+msgid "Warning: This group contains %s from an insecure network."
 msgstr ""
 
-#: ../../mod/profile_photo.php:200
-msgid "Crop Image"
+#: ../../mod/network.php:61
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/profile_photo.php:201
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/network.php:166
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/profile_photo.php:202
-msgid "Done Editing"
+#: ../../mod/network.php:177
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/profile_photo.php:230
-msgid "Image uploaded successfully."
+#: ../../mod/network.php:181
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/network.php:409
+msgid "See more posts like this"
 msgstr ""
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/message.php:18
-msgid "No recipient selected."
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/message.php:23
-msgid "[no subject]"
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
 msgstr ""
 
-#: ../../mod/message.php:34
-msgid "Unable to locate contact information."
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/message.php:102
-msgid "Message sent."
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/message.php:105
-msgid "Message could not be sent."
+#: ../../mod/notifications.php:104
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/message.php:125 ../../include/nav.php:101
-msgid "Messages"
+#: ../../mod/notifications.php:104
+msgid "yes"
 msgstr ""
 
-#: ../../mod/message.php:126
-msgid "Inbox"
+#: ../../mod/notifications.php:104
+msgid "no"
 msgstr ""
 
-#: ../../mod/message.php:127
-msgid "Outbox"
+#: ../../mod/notifications.php:110
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/message.php:128
-msgid "New Message"
+#: ../../mod/notifications.php:111
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/message.php:142
-msgid "Message deleted."
+#: ../../mod/notifications.php:112
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/message.php:158
-msgid "Conversation removed."
+#: ../../mod/notifications.php:119
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/message.php:180
-msgid "Send Private Message"
+#: ../../mod/notifications.php:120
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/message.php:181 ../../mod/message.php:315
-msgid "To:"
+#: ../../mod/notifications.php:120
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/message.php:182 ../../mod/message.php:316
-msgid "Subject:"
+#: ../../mod/notifications.php:130 ../../mod/notifications.php:153
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:59
-msgid "Your message:"
+#: ../../mod/notifications.php:139
+msgid "No notifications."
 msgstr ""
 
-#: ../../mod/message.php:224
-msgid "No messages."
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/message.php:237
-msgid "Delete conversation"
+#: ../../mod/notifications.php:154
+msgid "Deny"
 msgstr ""
 
-#: ../../mod/message.php:240
-msgid "D, d M Y - g:i A"
+#: ../../mod/notifications.php:159
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/message.php:267
-msgid "Message not available."
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/message.php:304
-msgid "Delete message"
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/message.php:314
-msgid "Send Reply"
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/profile.php:8 ../../boot.php:2221
-msgid "No profile"
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/profile.php:102
-msgid "Status"
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#, 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"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/dfrn_request.php:164
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/profile.php:103
-msgid "Profile"
+#: ../../mod/dfrn_request.php:188
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/profile.php:104
-msgid "Photos"
+#: ../../mod/dfrn_request.php:216
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
-#: ../../include/auth.php:130 ../../include/auth.php:183
-msgid "Login failed."
+#: ../../mod/dfrn_request.php:241
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/openid.php:73 ../../include/auth.php:194
-msgid "Welcome back "
+#: ../../mod/dfrn_request.php:242
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/follow.php:186
-msgid "The profile address specified does not provide adequate information."
+#: ../../mod/dfrn_request.php:243
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/follow.php:192
+#: ../../mod/dfrn_request.php:273
+msgid "Invalid locator"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:292
+msgid "Unable to resolve your name at the provided location."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:305
+msgid "You have already introduced yourself here."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:309
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:330
+msgid "Invalid profile URL."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:336
+msgid "Disallowed profile URL."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:423
+msgid "Your introduction has been sent."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:477
+msgid "Please login to confirm introduction."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:491
 msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/follow.php:243
-msgid "Unable to retrieve contact information."
+#: ../../mod/dfrn_request.php:503
+#, php-format
+msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/follow.php:289
-msgid "following"
+#: ../../mod/dfrn_request.php:504
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/display.php:306
-msgid "Item has been removed."
+#: ../../mod/dfrn_request.php:505
+msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:179
-msgid "noreply"
+#: ../../mod/dfrn_request.php:538 ../../include/items.php:1411
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:237
-msgid "New mail received at "
+#: ../../mod/dfrn_request.php:545
+msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477
+#: ../../mod/dfrn_request.php:617
+msgid "Friend/Connection Request"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:618
+msgid "Please answer the following:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:619
+msgid "Does $name know you?"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:622
+msgid "Add a personal note:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:623
+msgid ""
+"Please enter your profile address from one of the following supported social "
+"networks:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:624
+msgid "Friendika"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:625
+msgid "StatusNet/Federated Social Web"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:626
+msgid "Private (secure) network"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:627
+msgid "Public (insecure) network"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:628
+msgid "Your profile address:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:629
+msgid "Submit Request"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:630 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
+msgstr ""
+
+#: ../../mod/like.php:110
+msgid "status"
+msgstr ""
+
+#: ../../mod/like.php:127
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/apps.php:6
-msgid "Applications"
+#: ../../mod/like.php:129
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/search.php:17 ../../include/nav.php:68 ../../boot.php:2066
-msgid "Search"
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/search.php:62
-msgid "No results."
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
-#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/lostpass.php:56
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/lostpass.php:75
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/profiles.php:199
-msgid "Profile updated."
+#: ../../mod/lostpass.php:76
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/profiles.php:254
-msgid "Profile deleted."
+#: ../../mod/lostpass.php:77
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
-msgid "Profile-"
+#: ../../mod/lostpass.php:78
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
-msgid "New profile created."
+#: ../../mod/lostpass.php:79
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/profiles.php:307
-msgid "Profile unavailable to clone."
+#: ../../mod/lostpass.php:107
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/profiles.php:370
+#: ../../mod/lostpass.php:108
 msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:380 ../../mod/directory.php:91
-msgid "Age: "
+#: ../../mod/lostpass.php:109
+msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/profiles.php:422
-msgid "Profile Image"
+#: ../../mod/lostpass.php:110
+msgid "Reset"
+msgstr ""
+
+#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+msgid "Remove My Account"
+msgstr ""
+
+#: ../../mod/removeme.php:43
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr ""
+
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
+msgstr ""
+
+#: ../../mod/apps.php:6
+msgid "Applications"
 msgstr ""
 
 #: ../../mod/directory.php:32
@@ -1793,48 +2208,182 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/invite.php:28
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/friendika.php:12
+msgid "This is Friendika version"
 msgstr ""
 
-#: ../../mod/invite.php:32
+#: ../../mod/friendika.php:13
+msgid "running at web location"
+msgstr ""
+
+#: ../../mod/friendika.php:15
+msgid ""
+"Shared content within the Friendika network is provided under the <a href="
+"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
+"3.0 license</a>"
+msgstr ""
+
+#: ../../mod/friendika.php:17
+msgid ""
+"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
+"a> to learn more about the Friendika project."
+msgstr ""
+
+#: ../../mod/friendika.php:19
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../mod/friendika.php:20
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
+"dot com"
+msgstr ""
+
+#: ../../mod/friendika.php:25
+msgid "Installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/friendika.php:33
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../mod/item.php:126
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../mod/item.php:474
 #, php-format
-msgid "Please join my network on %s"
+msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/invite.php:38
+#: ../../mod/item.php:497
 #, php-format
-msgid "%s : Message delivery failed."
+msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/invite.php:42
+#: ../../mod/item.php:523
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../mod/item.php:541
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+msgid ""
+"This message was sent to you by %s, a member of the Friendika social network."
+msgstr ""
 
-#: ../../mod/invite.php:57
-msgid "Send invitations"
+#: ../../mod/item.php:543
+msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/invite.php:58
-msgid "Enter email addresses, one per line:"
+#: ../../mod/item.php:545
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/invite.php:60
+#: ../../mod/item.php:547
 #, php-format
-msgid "Please join my social network on %s"
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/invite.php:61
-msgid "To accept this invitation, please visit:"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../mod/invite.php:62
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr ""
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr ""
+
+#: ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/message.php:18
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/message.php:23
+msgid "[no subject]"
+msgstr ""
+
+#: ../../mod/message.php:34
+msgid "Unable to locate contact information."
+msgstr ""
+
+#: ../../mod/message.php:102
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/message.php:105
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/message.php:125 ../../include/nav.php:101
+msgid "Messages"
+msgstr ""
+
+#: ../../mod/message.php:126
+msgid "Inbox"
+msgstr ""
+
+#: ../../mod/message.php:127
+msgid "Outbox"
+msgstr ""
+
+#: ../../mod/message.php:128
+msgid "New Message"
+msgstr ""
+
+#: ../../mod/message.php:142
+msgid "Message deleted."
+msgstr ""
+
+#: ../../mod/message.php:158
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../mod/message.php:180
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/message.php:181 ../../mod/message.php:315
+msgid "To:"
+msgstr ""
+
+#: ../../mod/message.php:182 ../../mod/message.php:316
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/message.php:224
+msgid "No messages."
+msgstr ""
+
+#: ../../mod/message.php:237
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../mod/message.php:240
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: ../../mod/message.php:267
+msgid "Message not available."
+msgstr ""
+
+#: ../../mod/message.php:304
+msgid "Delete message"
+msgstr ""
+
+#: ../../mod/message.php:314
+msgid "Send Reply"
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:231
@@ -1906,151 +2455,123 @@ msgstr ""
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:116
-msgid "Facebook disabled"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:124
-msgid "Facebook API key is missing."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:131
-msgid "Facebook Connect"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:137
-msgid "Install Facebook post connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:144
-msgid "Remove Facebook post connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:150
-msgid "Post to Facebook by default"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:174
-msgid "Facebook"
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:175
-msgid "Facebook Connector Settings"
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:189
-msgid "Post to Facebook"
+#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:483
+#, php-format
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:230
-msgid "Image: "
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:14
-msgid "Three Dimensional Tic-Tac-Toe"
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:47
-msgid "3D Tic-Tac-Toe"
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:52
-msgid "New game"
+#: ../../mod/group.php:43 ../../mod/group.php:127
+msgid "Group not found."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:53
-msgid "New game with handicap"
+#: ../../mod/group.php:56
+msgid "Group name changed."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:54
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: ../../mod/group.php:79
+msgid "Membership list updated."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:55
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
+#: ../../mod/group.php:95
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:57
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
+#: ../../mod/group.php:96 ../../mod/group.php:153
+msgid "Group Name: "
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:176
-msgid "You go first..."
+#: ../../mod/group.php:111
+msgid "Group removed."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:181
-msgid "I'm going first this time..."
+#: ../../mod/group.php:113
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:187
-msgid "You won!"
+#: ../../mod/group.php:152
+msgid "Group Editor"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
-msgid "\"Cat\" game!"
+#: ../../mod/group.php:154
+msgid "Members:"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:216
-msgid "I won!"
+#: ../../mod/match.php:10
+msgid "Profile Match"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:171
-#: ../../wip/addon/randplace/randplace.php:170
-msgid "Randplace Settings"
+#: ../../mod/match.php:50
+msgid "No matches"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:173
-#: ../../wip/addon/randplace/randplace.php:172
-msgid "Enable Randplace Plugin"
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:33 ../../wip/photos.php:747
-#: ../../wip/photos-chris.php:794
-msgid "Select files to upload: "
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:35 ../../wip/photos.php:752
-#: ../../wip/photos-chris.php:799
+#: ../../addon/twitter/twitter.php:129
 msgid ""
-"Use the following controls only if the Java uploader [above] fails to launch."
-msgstr ""
-
-#: ../../addon/js_upload/js_upload.php:39
-msgid "Upload a file"
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:40
-msgid "Drop files here to upload"
+#: ../../addon/twitter/twitter.php:148
+msgid ""
+"At this Friendika instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:42
-msgid "Failed"
+#: ../../addon/twitter/twitter.php:149
+msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:288
-msgid "No files were uploaded."
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:294
-msgid "Uploaded file is empty"
+#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197
+msgid "Currently connected to: "
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:299
-msgid "Uploaded file is too large"
+#: ../../addon/twitter/twitter.php:166
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated Twitter account as well."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:317
-msgid "File has an invalid extension, it should be one of "
+#: ../../addon/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:328
-msgid "Upload was cancelled, or server error encountered"
+#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204
+msgid "Clear OAuth configuration"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:78
@@ -2098,10 +2619,6 @@ msgstr ""
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:197 ../../addon/twitter/twitter.php:165
-msgid "Currently connected to: "
-msgstr ""
-
 #: ../../addon/statusnet/statusnet.php:198
 msgid ""
 "If enabled all your <strong>public</strong> postings will be posted to the "
@@ -2112,49 +2629,147 @@ msgstr ""
 msgid "Send public postings to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:204 ../../addon/twitter/twitter.php:172
-msgid "Clear OAuth configuration"
+#: ../../addon/tictac/tictac.php:14
+msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:64
-msgid "Post to Twitter"
+#: ../../addon/tictac/tictac.php:47
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:122
-msgid "Twitter Posting Settings"
+#: ../../addon/tictac/tictac.php:52
+msgid "New game"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:129
+#: ../../addon/tictac/tictac.php:53
+msgid "New game with handicap"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:54
 msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/tictac/tictac.php:55
 msgid ""
-"At this Friendika instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:149
-msgid "Log in with Twitter"
+#: ../../addon/tictac/tictac.php:57
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:151
-msgid "Copy the PIN from Twitter here"
+#: ../../addon/tictac/tictac.php:176
+msgid "You go first..."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:166
+#: ../../addon/tictac/tictac.php:181
+msgid "I'm going first this time..."
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:187
+msgid "You won!"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
+msgid "\"Cat\" game!"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:216
+msgid "I won!"
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:33
+msgid "Select files to upload: "
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:35
 msgid ""
-"If enabled all your <strong>public</strong> postings will be posted to the "
-"associated Twitter account as well."
+"Use the following controls only if the Java uploader [above] fails to launch."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
-msgid "Send public postings to Twitter"
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
+msgstr ""
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
+msgstr ""
+
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:39
+msgid "Upload a file"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:40
+msgid "Drop files here to upload"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:42
+msgid "Failed"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:288
+msgid "No files were uploaded."
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:294
+msgid "Uploaded file is empty"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:299
+msgid "Uploaded file is too large"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:317
+msgid "File has an invalid extension, it should be one of "
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:328
+msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
 #: ../../include/contact_selectors.php:32
@@ -2417,56 +3032,16 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/oembed.php:57
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/group.php:145
-msgid "Create a new group"
-msgstr ""
-
-#: ../../include/group.php:146
-msgid "Everybody"
-msgstr ""
-
-#: ../../include/nav.php:39 ../../boot.php:842
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:45 ../../boot.php:822 ../../boot.php:828
-msgid "Login"
-msgstr ""
-
-#: ../../include/nav.php:57 ../../include/nav.php:92
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:65
-msgid "Apps"
-msgstr ""
-
-#: ../../include/nav.php:78
-msgid "Directory"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Network"
-msgstr ""
-
-#: ../../include/nav.php:97
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:105
-msgid "Manage"
+#: ../../include/acl_selectors.php:132
+msgid "Visible To:"
 msgstr ""
 
-#: ../../include/nav.php:108
-msgid "Settings"
+#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
+msgid "Groups"
 msgstr ""
 
-#: ../../include/nav.php:110
-msgid "Profiles"
+#: ../../include/acl_selectors.php:147
+msgid "Except For:"
 msgstr ""
 
 #: ../../include/auth.php:27
@@ -2509,10 +3084,6 @@ msgstr ""
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:154
-msgid "days"
-msgstr ""
-
 #: ../../include/datetime.php:155
 msgid "hour"
 msgstr ""
@@ -2541,297 +3112,115 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: ../../include/dba.php:31
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-
-#: ../../include/acl_selectors.php:132
-msgid "Visible To:"
-msgstr ""
-
-#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
-msgid "Groups"
-msgstr ""
-
-#: ../../include/acl_selectors.php:147
-msgid "Except For:"
-msgstr ""
-
-#: ../../include/items.php:1073
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1073
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/items.php:1418
-msgid "You have a new follower at "
-msgstr ""
-
-#: ../../boot.php:359
-msgid "Delete this item?"
+#: ../../include/profile_advanced.php:45
+msgid "j F, Y"
 msgstr ""
 
-#: ../../boot.php:360
-msgid "Comment"
+#: ../../include/profile_advanced.php:46
+msgid "j F"
 msgstr ""
 
-#: ../../boot.php:813
-msgid "Create a New Account"
+#: ../../include/profile_advanced.php:59
+msgid "Age:"
 msgstr ""
 
-#: ../../boot.php:820
-msgid "Nickname or Email address: "
+#: ../../include/profile_advanced.php:70
+msgid "<span class=\"heart\">&hearts;</span> Status:"
 msgstr ""
 
-#: ../../boot.php:821
-msgid "Password: "
+#: ../../include/profile_advanced.php:127
+msgid "Religion:"
 msgstr ""
 
-#: ../../boot.php:826
-msgid "Nickname/Email/OpenID: "
+#: ../../include/profile_advanced.php:138
+msgid "About:"
 msgstr ""
 
-#: ../../boot.php:827
-msgid "Password (if not OpenID): "
+#: ../../include/profile_advanced.php:150
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../boot.php:830
-msgid "Forgot your password?"
+#: ../../include/profile_advanced.php:162
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../boot.php:831
-msgid "Password Reset"
+#: ../../include/profile_advanced.php:174
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../boot.php:1083
-msgid "prev"
+#: ../../include/profile_advanced.php:186
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../boot.php:1085
-msgid "first"
+#: ../../include/profile_advanced.php:198
+msgid "Television:"
 msgstr ""
 
-#: ../../boot.php:1114
-msgid "last"
+#: ../../include/profile_advanced.php:210
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../boot.php:1117
-msgid "next"
+#: ../../include/profile_advanced.php:222
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../boot.php:1848
-#, php-format
-msgid "%s likes this."
+#: ../../include/profile_advanced.php:234
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../boot.php:1848
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/profile_advanced.php:246
+msgid "School/education:"
 msgstr ""
 
-#: ../../boot.php:1852
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
+#: ../../include/nav.php:57 ../../include/nav.php:92
+msgid "Home"
 msgstr ""
 
-#: ../../boot.php:1854
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
+#: ../../include/nav.php:65
+msgid "Apps"
 msgstr ""
 
-#: ../../boot.php:1860
-msgid "and"
+#: ../../include/nav.php:78
+msgid "Directory"
 msgstr ""
 
-#: ../../boot.php:1863
-#, php-format
-msgid ", and %d other people"
+#: ../../include/nav.php:88
+msgid "Network"
 msgstr ""
 
-#: ../../boot.php:1864
-#, php-format
-msgid "%s like this."
+#: ../../include/nav.php:97
+msgid "Notifications"
 msgstr ""
 
-#: ../../boot.php:1864
-#, php-format
-msgid "%s don't like this."
+#: ../../include/nav.php:105
+msgid "Manage"
 msgstr ""
 
-#: ../../boot.php:2025
-msgid "No contacts"
+#: ../../include/nav.php:108
+msgid "Settings"
 msgstr ""
 
-#: ../../boot.php:2033
+#: ../../include/dba.php:31
 #, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../boot.php:2278
-msgid "Connect"
-msgstr ""
-
-#: ../../boot.php:2288
-msgid "Location:"
-msgstr ""
-
-#: ../../boot.php:2292
-msgid ", "
-msgstr ""
-
-#: ../../boot.php:2300
-msgid "Gender:"
-msgstr ""
-
-#: ../../boot.php:2304
-msgid "Status:"
-msgstr ""
-
-#: ../../boot.php:2306
-msgid "Homepage:"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Monday"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Tuesday"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Wednesday"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Thursday"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Friday"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Saturday"
-msgstr ""
-
-#: ../../boot.php:2397
-msgid "Sunday"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "January"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "February"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "March"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "April"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "May"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "June"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "July"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "August"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "September"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "October"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "November"
-msgstr ""
-
-#: ../../boot.php:2401
-msgid "December"
-msgstr ""
-
-#: ../../boot.php:2416
-msgid "g A l F d"
-msgstr ""
-
-#: ../../boot.php:2433
-msgid "Birthday Reminders"
-msgstr ""
-
-#: ../../boot.php:2434
-msgid "Birthdays this week:"
-msgstr ""
-
-#: ../../boot.php:2435
-msgid "(Adjusted for local time)"
-msgstr ""
-
-#: ../../boot.php:2446
-msgid "[today]"
-msgstr ""
-
-#: ../../boot.php:2643
-msgid "link to source"
-msgstr ""
-
-#: ../../boot.php:2729
-msgid "View status"
-msgstr ""
-
-#: ../../boot.php:2730
-msgid "View profile"
-msgstr ""
-
-#: ../../boot.php:2731
-msgid "View photos"
-msgstr ""
-
-#: ../../boot.php:2733
-msgid "Send PM"
-msgstr ""
-
-#: ../../wip/dfrn_poll2.php:72 ../../wip/dfrn_poll2.php:376
-msgid " welcomes "
-msgstr ""
-
-#: ../../wip/addon/facebook/facebook.php:54
-msgid "Facebook status update failed."
-msgstr ""
-
-#: ../../wip/addon/js_upload/js_upload.php:213
-msgid "Could not save uploaded file."
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../wip/addon/js_upload/js_upload.php:214
-msgid "The upload was cancelled, or server error encountered"
+#: ../../include/items.php:1418
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../wip/addon/js_upload/js_upload.php:167
-msgid "Server error. Upload directory isn"
+#: ../../include/group.php:145
+msgid "Create a new group"
 msgstr ""
 
-#: ../../index.php:208
-msgid "Not Found"
+#: ../../include/group.php:146
+msgid "Everybody"
 msgstr ""
 
-#: ../../index.php:209
-msgid "Page not found."
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
 msgstr ""
diff --git a/util/strings.php b/util/strings.php
index a40f36701..835b86c70 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -71,24 +71,6 @@ $a->strings['%d Contact'] = array(
 	0 => '%d Contact',
 	1 => '%d Contacts',
 );
-$a->strings['Profile not found.'] = 'Profile not found.';
-$a->strings['Contact not found.'] = 'Contact not found.';
-$a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
-$a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: ';
-$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully.";
-$a->strings['Remote site reported: '] = 'Remote site reported: ';
-$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again.";
-$a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
-$a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
-$a->strings['is now friends with'] = 'is now friends with';
-$a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
-$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
-$a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.';
-$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
-$a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
-$a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
-$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
-$a->strings['Administrator'] = 'Administrator';
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
@@ -108,6 +90,7 @@ $a->strings['Contact has been ignored'] = 'Contact has been ignored';
 $a->strings['Contact has been unignored'] = 'Contact has been unignored';
 $a->strings['stopped following'] = 'stopped following';
 $a->strings['Contact has been removed.'] = 'Contact has been removed.';
+$a->strings['Contact not found.'] = 'Contact not found.';
 $a->strings['Mutual Friendship'] = 'Mutual Friendship';
 $a->strings['is a fan of yours'] = 'is a fan of yours';
 $a->strings['you are a fan of'] = 'you are a fan of';
@@ -117,6 +100,14 @@ $a->strings['Never'] = 'Never';
 $a->strings["\x28Update was successful\x29"] = "\x28Update was successful\x29";
 $a->strings["\x28Update was not successful\x29"] = "\x28Update was not successful\x29";
 $a->strings['Contact Editor'] = 'Contact Editor';
+$a->strings['Submit'] = 'Submit';
+$a->strings['Profile Visibility'] = 'Profile Visibility';
+$a->strings['Please choose the profile you would like to display to %s when viewing your profile securely.'] = 'Please choose the profile you would like to display to %s when viewing your profile securely.';
+$a->strings['Contact Information / Notes'] = 'Contact Information / Notes';
+$a->strings['Online Reputation'] = 'Online Reputation';
+$a->strings['Occasionally your friends may wish to inquire about this person\'s online legitimacy.'] = 'Occasionally your friends may wish to inquire about this person\'s online legitimacy.';
+$a->strings['You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.'] = 'You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.';
+$a->strings['Please take a moment to elaborate on this selection if you feel it could be helpful to others.'] = 'Please take a moment to elaborate on this selection if you feel it could be helpful to others.';
 $a->strings['Visit $name\'s profile'] = 'Visit $name\'s profile';
 $a->strings['Block/Unblock contact'] = 'Block/Unblock contact';
 $a->strings['Ignore contact'] = 'Ignore contact';
@@ -137,6 +128,23 @@ $a->strings['Finding: '] = 'Finding: ';
 $a->strings['Find'] = 'Find';
 $a->strings['Visit $username\'s profile'] = 'Visit $username\'s profile';
 $a->strings['Edit contact'] = 'Edit contact';
+$a->strings['Profile not found.'] = 'Profile not found.';
+$a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
+$a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: ';
+$a->strings["Confirmation completed successfully."] = "Confirmation completed successfully.";
+$a->strings['Remote site reported: '] = 'Remote site reported: ';
+$a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again.";
+$a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
+$a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
+$a->strings['is now friends with'] = 'is now friends with';
+$a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
+$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
+$a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.';
+$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
+$a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
+$a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
+$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
+$a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
 $a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
@@ -233,7 +241,6 @@ $a->strings['Group name changed.'] = 'Group name changed.';
 $a->strings['Membership list updated.'] = 'Membership list updated.';
 $a->strings['Create a group of contacts/friends.'] = 'Create a group of contacts/friends.';
 $a->strings['Group Name: '] = 'Group Name: ';
-$a->strings['Submit'] = 'Submit';
 $a->strings['Group removed.'] = 'Group removed.';
 $a->strings['Unable to remove group.'] = 'Unable to remove group.';
 $a->strings['Group Editor'] = 'Group Editor';
@@ -249,6 +256,16 @@ $a->strings['Proceed to registration'] = 'Proceed to registration';
 $a->strings['Database import failed.'] = 'Database import failed.';
 $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
 $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
+$a->strings['Friendika Social Network'] = 'Friendika Social Network';
+$a->strings['Installation'] = 'Installation';
+$a->strings['In order to install Friendika we need to know how to contact your database.'] = 'In order to install Friendika we need to know how to contact your database.';
+$a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Please contact your hosting provider or site administrator if you have questions about these settings.';
+$a->strings['The database you specify below must already exist. If it does not, please create it before continuing.'] = 'The database you specify below must already exist. If it does not, please create it before continuing.';
+$a->strings['Database Server Name'] = 'Database Server Name';
+$a->strings['Database Login Name'] = 'Database Login Name';
+$a->strings['Database Login Password'] = 'Database Login Password';
+$a->strings['Database Name'] = 'Database Name';
+$a->strings['Please select a default timezone for your website'] = 'Please select a default timezone for your website';
 $a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.';
 $a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.';
 $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.';
@@ -296,6 +313,11 @@ $a->strings['Visible to:'] = 'Visible to:';
 $a->strings['Password reset request issued. Check your email.'] = 'Password reset request issued. Check your email.';
 $a->strings['Password reset requested at %s'] = 'Password reset requested at %s';
 $a->strings["Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."] = "Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.";
+$a->strings['Your password has been reset as requested.'] = 'Your password has been reset as requested.';
+$a->strings['Your new password is'] = 'Your new password is';
+$a->strings['Save or copy your new password - and then'] = 'Save or copy your new password - and then';
+$a->strings['click here to login'] = 'click here to login';
+$a->strings['Your password may be changed from the <em>Settings</em> page after successful login.'] = 'Your password may be changed from the <em>Settings</em> page after successful login.';
 $a->strings['Forgot your Password?'] = 'Forgot your Password?';
 $a->strings['Enter your email address and submit to have your password reset. Then check your email for further instructions.'] = 'Enter your email address and submit to have your password reset. Then check your email for further instructions.';
 $a->strings['Nickname or Email: '] = 'Nickname or Email: ';
@@ -365,6 +387,7 @@ $a->strings['New Follower'] = 'New Follower';
 $a->strings['Approve'] = 'Approve';
 $a->strings['No notifications.'] = 'No notifications.';
 $a->strings['User registrations waiting for confirm'] = 'User registrations waiting for confirm';
+$a->strings['Deny'] = 'Deny';
 $a->strings['No registrations.'] = 'No registrations.';
 $a->strings['Post successful.'] = 'Post successful.';
 $a->strings['Login failed.'] = 'Login failed.';
@@ -407,6 +430,11 @@ $a->strings['Profile'] = 'Profile';
 $a->strings['Photos'] = 'Photos';
 $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
 $a->strings['Unable to process image'] = 'Unable to process image';
+$a->strings['Upload File:'] = 'Upload File:';
+$a->strings['Upload Profile Photo'] = 'Upload Profile Photo';
+$a->strings['Upload'] = 'Upload';
+$a->strings['or'] = 'or';
+$a->strings['select a photo from your photo albums'] = 'select a photo from your photo albums';
 $a->strings['Crop Image'] = 'Crop Image';
 $a->strings['Please adjust the image cropping for optimum viewing.'] = 'Please adjust the image cropping for optimum viewing.';
 $a->strings['Done Editing'] = 'Done Editing';
@@ -417,7 +445,48 @@ $a->strings['Profile deleted.'] = 'Profile deleted.';
 $a->strings['Profile-'] = 'Profile-';
 $a->strings['New profile created.'] = 'New profile created.';
 $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.';
+$a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?';
+$a->strings['Edit Profile Details'] = 'Edit Profile Details';
+$a->strings['View this profile'] = 'View this profile';
+$a->strings['Create a new profile using these settings'] = 'Create a new profile using these settings';
+$a->strings['Clone this profile'] = 'Clone this profile';
+$a->strings['Delete this profile'] = 'Delete this profile';
+$a->strings['Profile Name:'] = 'Profile Name:';
+$a->strings['Your Full Name:'] = 'Your Full Name:';
+$a->strings['Title/Description:'] = 'Title/Description:';
+$a->strings['Your Gender:'] = 'Your Gender:';
+$a->strings["Birthday \x28y/m/d\x29:"] = "Birthday \x28y/m/d\x29:";
+$a->strings['Street Address:'] = 'Street Address:';
+$a->strings['Locality/City:'] = 'Locality/City:';
+$a->strings['Postal/Zip Code:'] = 'Postal/Zip Code:';
+$a->strings['Country:'] = 'Country:';
+$a->strings['Region/State:'] = 'Region/State:';
+$a->strings['<span class="heart">&hearts;</span> Marital Status:'] = '<span class="heart">&hearts;</span> Marital Status:';
+$a->strings["Who: \x28if applicable\x29"] = "Who: \x28if applicable\x29";
+$a->strings['Examples: cathy123, Cathy Williams, cathy@example.com'] = 'Examples: cathy123, Cathy Williams, cathy@example.com';
+$a->strings['Sexual Preference:'] = 'Sexual Preference:';
+$a->strings['Homepage URL:'] = 'Homepage URL:';
+$a->strings['Political Views:'] = 'Political Views:';
+$a->strings['Religious Views:'] = 'Religious Views:';
+$a->strings['Public Keywords:'] = 'Public Keywords:';
+$a->strings['Private Keywords:'] = 'Private Keywords:';
+$a->strings['Example: fishing photography software'] = 'Example: fishing photography software';
+$a->strings["\x28Used for suggesting potential friends, can be seen by others\x29"] = "\x28Used for suggesting potential friends, can be seen by others\x29";
+$a->strings["\x28Used for searching profiles, never shown to others\x29"] = "\x28Used for searching profiles, never shown to others\x29";
+$a->strings['Tell us about yourself...'] = 'Tell us about yourself...';
+$a->strings['Hobbies/Interests'] = 'Hobbies/Interests';
+$a->strings['Contact information and Social Networks'] = 'Contact information and Social Networks';
+$a->strings['Musical interests'] = 'Musical interests';
+$a->strings['Books, literature'] = 'Books, literature';
+$a->strings['Television'] = 'Television';
+$a->strings['Film/dance/culture/entertainment'] = 'Film/dance/culture/entertainment';
+$a->strings['Love/romance'] = 'Love/romance';
+$a->strings['Work/employment'] = 'Work/employment';
+$a->strings['School/education'] = 'School/education';
 $a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.';
+$a->strings['Profiles'] = 'Profiles';
+$a->strings['Change profile photo'] = 'Change profile photo';
+$a->strings['Create New Profile'] = 'Create New Profile';
 $a->strings['Profile Image'] = 'Profile Image';
 $a->strings['Invalid OpenID url'] = 'Invalid OpenID url';
 $a->strings['Please enter the required information.'] = 'Please enter the required information.';
@@ -474,8 +543,36 @@ $a->strings['Automatic Friend Account'] = 'Automatic Friend Account';
 $a->strings['Automatically approve all connection/friend requests as friends'] = 'Automatically approve all connection/friend requests as friends';
 $a->strings['OpenID: '] = 'OpenID: ';
 $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
+$a->strings['Publish your default profile in site directory?'] = 'Publish your default profile in site directory?';
+$a->strings['Publish your default profile in global social directory?'] = 'Publish your default profile in global social directory?';
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
+$a->strings['Your profile address is'] = 'Your profile address is';
 $a->strings['Export Personal Data'] = 'Export Personal Data';
+$a->strings['Basic Settings'] = 'Basic Settings';
+$a->strings['Full Name:'] = 'Full Name:';
+$a->strings['Email Address:'] = 'Email Address:';
+$a->strings['Your Timezone:'] = 'Your Timezone:';
+$a->strings['Default Post Location:'] = 'Default Post Location:';
+$a->strings['Use Browser Location:'] = 'Use Browser Location:';
+$a->strings['Display Theme:'] = 'Display Theme:';
+$a->strings['Security and Privacy Settings'] = 'Security and Privacy Settings';
+$a->strings['Maximum Friend Requests/Day:'] = 'Maximum Friend Requests/Day:';
+$a->strings["\x28to prevent spam abuse\x29"] = "\x28to prevent spam abuse\x29";
+$a->strings['Allow friends to post to your profile page:'] = 'Allow friends to post to your profile page:';
+$a->strings["Automatically expire \x28delete\x29 posts older than"] = "Automatically expire \x28delete\x29 posts older than";
+$a->strings['days'] = 'days';
+$a->strings['Notification Settings'] = 'Notification Settings';
+$a->strings['Send a notification email when:'] = 'Send a notification email when:';
+$a->strings['You receive an introduction'] = 'You receive an introduction';
+$a->strings['Your introductions are confirmed'] = 'Your introductions are confirmed';
+$a->strings['Someone writes on your profile wall'] = 'Someone writes on your profile wall';
+$a->strings['Someone writes a followup comment'] = 'Someone writes a followup comment';
+$a->strings['You receive a private message'] = 'You receive a private message';
+$a->strings['Password Settings'] = 'Password Settings';
+$a->strings['Leave password fields blank unless changing'] = 'Leave password fields blank unless changing';
+$a->strings['New Password:'] = 'New Password:';
+$a->strings['Confirm:'] = 'Confirm:';
+$a->strings['Advanced Page Settings'] = 'Advanced Page Settings';
 $a->strings['Default Post Permissions'] = 'Default Post Permissions';
 $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
@@ -507,7 +604,6 @@ $a->strings['months'] = 'months';
 $a->strings['week'] = 'week';
 $a->strings['weeks'] = 'weeks';
 $a->strings['day'] = 'day';
-$a->strings['days'] = 'days';
 $a->strings['hour'] = 'hour';
 $a->strings['hours'] = 'hours';
 $a->strings['minute'] = 'minute';
@@ -526,8 +622,22 @@ $a->strings['Network'] = 'Network';
 $a->strings['Notifications'] = 'Notifications';
 $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
-$a->strings['Profiles'] = 'Profiles';
 $a->strings['Embedding disabled'] = 'Embedding disabled';
+$a->strings['j F, Y'] = 'j F, Y';
+$a->strings['j F'] = 'j F';
+$a->strings['Age:'] = 'Age:';
+$a->strings['<span class="heart">&hearts;</span> Status:'] = '<span class="heart">&hearts;</span> Status:';
+$a->strings['Religion:'] = 'Religion:';
+$a->strings['About:'] = 'About:';
+$a->strings['Hobbies/Interests:'] = 'Hobbies/Interests:';
+$a->strings['Contact information and Social Networks:'] = 'Contact information and Social Networks:';
+$a->strings['Musical interests:'] = 'Musical interests:';
+$a->strings['Books, literature:'] = 'Books, literature:';
+$a->strings['Television:'] = 'Television:';
+$a->strings['Film/dance/culture/entertainment:'] = 'Film/dance/culture/entertainment:';
+$a->strings['Love/Romance:'] = 'Love/Romance:';
+$a->strings['Work/employment:'] = 'Work/employment:';
+$a->strings['School/education:'] = 'School/education:';
 $a->strings['Male'] = 'Male';
 $a->strings['Female'] = 'Female';
 $a->strings['Currently Male'] = 'Currently Male';
@@ -783,7 +893,6 @@ $a->strings['America/Managua'] = 'America/Managua';
 $a->strings['America/Manaus'] = 'America/Manaus';
 $a->strings['America/Marigot'] = 'America/Marigot';
 $a->strings['America/Martinique'] = 'America/Martinique';
-$a->strings['America/Matamoros'] = 'America/Matamoros';
 $a->strings['America/Mazatlan'] = 'America/Mazatlan';
 $a->strings['America/Mendoza'] = 'America/Mendoza';
 $a->strings['America/Menominee'] = 'America/Menominee';
@@ -802,7 +911,6 @@ $a->strings['America/Nome'] = 'America/Nome';
 $a->strings['America/Noronha'] = 'America/Noronha';
 $a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
 $a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
-$a->strings['America/Ojinaga'] = 'America/Ojinaga';
 $a->strings['America/Panama'] = 'America/Panama';
 $a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
 $a->strings['America/Paramaribo'] = 'America/Paramaribo';
@@ -819,7 +927,6 @@ $a->strings['America/Regina'] = 'America/Regina';
 $a->strings['America/Resolute'] = 'America/Resolute';
 $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
 $a->strings['America/Rosario'] = 'America/Rosario';
-$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
 $a->strings['America/Santarem'] = 'America/Santarem';
 $a->strings['America/Santiago'] = 'America/Santiago';
 $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
@@ -848,7 +955,6 @@ $a->strings['America/Yellowknife'] = 'America/Yellowknife';
 $a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
 $a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
 $a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
-$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
 $a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
 $a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
 $a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
@@ -911,7 +1017,6 @@ $a->strings['Asia/Makassar'] = 'Asia/Makassar';
 $a->strings['Asia/Manila'] = 'Asia/Manila';
 $a->strings['Asia/Muscat'] = 'Asia/Muscat';
 $a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
-$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
 $a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
 $a->strings['Asia/Omsk'] = 'Asia/Omsk';
 $a->strings['Asia/Oral'] = 'Asia/Oral';
diff --git a/view/comment_item.tpl b/view/comment_item.tpl
index dabbd6e87..0216e31d3 100644
--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@@ -10,11 +10,11 @@
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
 				</div>
 				<div class="comment-edit-photo-end"></div>
-				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea>
+				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
 				</div>
 
 				<div class="comment-edit-end"></div>
diff --git a/view/en/contact_edit.tpl b/view/contact_edit.tpl
index 9aca60188..4c2c6c6f8 100644
--- a/view/en/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -28,7 +28,7 @@
 
 
 		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
+			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
 			<div id="contact-edit-poll-text">$updpub</div>
 			$poll_interval
 			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
@@ -41,41 +41,41 @@ $blocked
 $ignored
 
 <div id="contact-edit-info-wrapper">
-<h4>Contact Information / Notes</h4>
+<h4>$lbl_info1</h4>
 <textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
 </div>
 <div id="contact-edit-info-end"></div>
 
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 
 <div id="contact-edit-profile-select-text">
-<h4>Profile Visibility</h4>
-<p>Please choose the profile you would like to display to $name when viewing your profile securely.
+<h4>$lbl_vis1</h4>
+<p>$lbl_vis2
 </p> 
 </div>
 $profile_select
 <div id="contact-edit-profile-select-end"></div>
 
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 
 
 <div id="contact-edit-rating-wrapper">
-<h4>Online Reputation</h4>
+<h4>$lbl_rep1</h4>
 <p>
-Occasionally your friends may wish to inquire about this person's online legitimacy. You may help them choose whether or not to interact with this person by providing a 'reputation' to guide them.
+$lbl_rep2 $lbl_rep3
 </p>
 <div id="contact-edit-rating-select-wrapper">
 $rating
 </div>
 <div id="contact-edit-rating-explain">
 <p>
-Please take a moment to elaborate on this selection if you feel it could be helpful to others.
+$lbl_rep4
 </p>
 <textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
 </div>
 </div>
 $groups
 
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
+<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
 </form>
 </div>
diff --git a/view/de/contact_edit.tpl b/view/de/contact_edit.tpl
deleted file mode 100644
index 0b32bdd66..000000000
--- a/view/de/contact_edit.tpl
+++ /dev/null
@@ -1,86 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
-	<div id="contact-edit-photo-wrapper" >
-		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-		<div id="contact-edit-photo" >
-			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
-		</div>
-		<div id="contact-edit-photo-end" ></div>
-	</div>
-	<div id="contact-edit-nav-wrapper" >
-
-		<div id="contact-edit-links" >
-			<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
-			<a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
-		</div>
-		<div id="contact-drop-links" >
-			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
-		</div>
-		<div id="contact-edit-nav-end"></div>
-
-
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
-			<div id="contact-edit-poll-text">$updpub</div>
-			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
-		</div>
-	</div>
-	<div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-
-<div id="contact-edit-info-wrapper">
-<h4>Kontaktinformation / Notizen</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Profil Sichtbarkeit</h4>
-<p>Bitte wähle das Profil, das du $name gezeigt werden soll, wenn er sich dein
-Profil in Friendika betrachtet.
-</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Online Reputation</h4>
-<p>
-Gelegentlich werden sich deine Freunde nach der online Legitimität dieser
-Person erkundigen. Du kannst ihnen helfen bei der Entscheidung ob sie mit
-dieser Person interagieren wollen indem du den "Ruf" der Person bewertest.
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Bitte nimm dir einen Moment um deine Auswahl zu kommentieren wenn du meinst das
-könnte anderen weiter helfen.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-</form>
-</div>
diff --git a/view/de/install_db.tpl b/view/de/install_db.tpl
deleted file mode 100644
index 804ce17f3..000000000
--- a/view/de/install_db.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installation</h3>
-
-<p>
-Um Friendika installieren zu können müssen wir wissen wie wir die Datenbank erreichen könne. Bitte kontaktire deinen Hosting Anbieter oder Seitenadministrator wenn du Fragen zu diesen Einstellungen hast. Die Datenbank die du weiter unten angibst muss bereits existieren. Sollte dies nicht der Fall sein erzeuge sie bitte bevor du mit der Installation fortfährst.
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Datenbank Servername</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Datenbank Anmeldename</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Datenbank Anmeldepassword</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Datenbankname</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Bitte wähle die Standard-Zeitzone deiner Webseite
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-<div id="install-end" ></div>
-
diff --git a/view/de/messages.po b/view/de/messages.po
new file mode 100644
index 000000000..d476381d3
--- /dev/null
+++ b/view/de/messages.po
@@ -0,0 +1,3520 @@
+# FRIENDIKA Distributed Social Network
+# Copyright (C) 2010, 2011 Mike Macgirvin
+# This file is distributed under the same license as the Friendika package.
+# Mike Macgirvin, 2010
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.1.942\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-08 08:57+0200\n"
+"PO-Revision-Date: 2011-04-08 10:31:00+0200\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de_DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=0);\n"
+"X-Language: de_DE\n"
+
+#: ../../index.php:187 ../../index.php:208
+msgid "Not Found"
+msgstr "Nicht gefunden"
+
+#: ../../index.php:188 ../../index.php:209
+msgid "Page not found."
+msgstr "Seite nicht gefunden."
+
+#: ../../index.php:243 ../../mod/group.php:88 ../../index.php:264
+msgid "Permission denied"
+msgstr "Zugriff verweigert"
+
+#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
+#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:224
+#: ../../mod/settings.php:14 ../../mod/settings.php:19
+#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772
+#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50
+#: ../../mod/contacts.php:101 ../../mod/register.php:25 ../../mod/network.php:6
+#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:616
+#: ../../mod/message.php:8 ../../mod/message.php:116
+#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
+#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
+#: ../../mod/profiles.php:227 ../../mod/install.php:93 ../../mod/photos.php:773
+#: ../../mod/settings.php:15 ../../mod/settings.php:20
+#: ../../mod/settings.php:211 ../../mod/contacts.php:106
+#: ../../mod/display.php:309 ../../mod/item.php:668 ../../mod/editpost.php:10
+#: ../../index.php:265 ../../mod/display.php:311
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: ../../boot.php:808 ../../boot.php:813
+msgid "Create a New Account"
+msgstr "Neuen Account erstellen"
+
+#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
+#: ../../include/nav.php:62 ../../mod/register.php:463 ../../boot.php:814
+msgid "Register"
+msgstr "Registrieren"
+
+#: ../../boot.php:815 ../../boot.php:820
+msgid "Nickname or Email address: "
+msgstr "Spitzname oder Email-Adresse: "
+
+#: ../../boot.php:816 ../../boot.php:821
+msgid "Password: "
+msgstr "Passwort: "
+
+#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
+#: ../../include/nav.php:45 ../../boot.php:822 ../../boot.php:828
+msgid "Login"
+msgstr "Anmeldung"
+
+#: ../../boot.php:821 ../../boot.php:826
+msgid "Nickname/Email/OpenID: "
+msgstr "Spitzname/Email/OpenID: "
+
+#: ../../boot.php:822 ../../boot.php:827
+msgid "Password (if not OpenID): "
+msgstr "Passwort (falls nicht OpenID): "
+
+#: ../../boot.php:825 ../../boot.php:830
+msgid "Forgot your password?"
+msgstr "Passwort vergessen?"
+
+#: ../../boot.php:826 ../../boot.php:831 ../../mod/lostpass.php:74
+msgid "Password Reset"
+msgstr "Passwort zurücksetzen"
+
+#: ../../boot.php:837 ../../include/nav.php:38 ../../include/nav.php:39
+#: ../../boot.php:842
+msgid "Logout"
+msgstr "Abmelden"
+
+#: ../../boot.php:1077 ../../boot.php:1083
+msgid "prev"
+msgstr "vorige"
+
+#: ../../boot.php:1079 ../../boot.php:1085
+msgid "first"
+msgstr "erste"
+
+#: ../../boot.php:1108 ../../boot.php:1114
+msgid "last"
+msgstr "letzte"
+
+#: ../../boot.php:1111 ../../boot.php:1117
+msgid "next"
+msgstr "nächste"
+
+#: ../../boot.php:1831 ../../boot.php:1848
+#, php-format
+msgid "%s likes this."
+msgstr "%s mag das."
+
+#: ../../boot.php:1831 ../../boot.php:1848
+#, php-format
+msgid "%s doesn't like this."
+msgstr "%s mag das nicht."
+
+#: ../../boot.php:1835 ../../boot.php:1852
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr "<span  %1$s>%2$d Personen</span> mögen das."
+
+#: ../../boot.php:1837 ../../boot.php:1854
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr "<span  %1$s>%2$d Personen</span> mögen das nicht."
+
+#: ../../boot.php:1843 ../../boot.php:1860
+msgid "and"
+msgstr "und"
+
+#: ../../boot.php:1846 ../../boot.php:1863
+#, php-format
+msgid ", and %d other people"
+msgstr " und %d andere"
+
+#: ../../boot.php:1847 ../../boot.php:1864
+#, php-format
+msgid "%s like this."
+msgstr "%s mag das."
+
+#: ../../boot.php:1847 ../../boot.php:1864
+#, php-format
+msgid "%s don't like this."
+msgstr "%s mag das nicht."
+
+#: ../../boot.php:2008 ../../boot.php:2025
+msgid "No contacts"
+msgstr "Keine Kontakte"
+
+#: ../../boot.php:2016 ../../mod/contacts.php:303
+#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
+#: ../../include/nav.php:111 ../../include/nav.php:112
+#: ../../mod/contacts.php:311 ../../mod/contacts.php:319
+msgid "Contacts"
+msgstr "Kontakte"
+
+#: ../../boot.php:2032 ../../mod/viewcontacts.php:17 ../../boot.php:2049
+msgid "View Contacts"
+msgstr "Kontakte anzeigen"
+
+#: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67
+#: ../../include/nav.php:68 ../../boot.php:2066
+msgid "Search"
+msgstr "Suche"
+
+#: ../../boot.php:2204 ../../mod/profile.php:8 ../../boot.php:2221
+msgid "No profile"
+msgstr "Kein Profil"
+
+#: ../../boot.php:2261 ../../boot.php:2278
+msgid "Connect"
+msgstr "Verbinden"
+
+#: ../../boot.php:2271 ../../boot.php:2288
+msgid "Location:"
+msgstr "Ort:"
+
+#: ../../boot.php:2275 ../../boot.php:2292
+msgid ", "
+msgstr ", "
+
+#: ../../boot.php:2283 ../../boot.php:2300 ../../include/profile_advanced.php:23
+msgid "Gender:"
+msgstr "Geschlecht:"
+
+#: ../../boot.php:2287 ../../boot.php:2304
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../boot.php:2289 ../../boot.php:2306
+#: ../../include/profile_advanced.php:103
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../boot.php:2380 ../../boot.php:2397
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "January"
+msgstr "Januar"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "February"
+msgstr "Februar"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "March"
+msgstr "März"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "April"
+msgstr "April"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "May"
+msgstr "Mai"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "June"
+msgstr "Juni"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "July"
+msgstr "Juli"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "August"
+msgstr "August"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "September"
+msgstr "September"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "October"
+msgstr "Oktober"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "November"
+msgstr "November"
+
+#: ../../boot.php:2384 ../../boot.php:2401
+msgid "December"
+msgstr "Dezember"
+
+#: ../../boot.php:2413 ../../boot.php:2434
+msgid "Birthdays this week:"
+msgstr "Geburtstage diese Woche:"
+
+#: ../../boot.php:2414 ../../boot.php:2435
+msgid "(Adjusted for local time)"
+msgstr "(an die lokale Zeit angepasst)"
+
+#: ../../boot.php:2423 ../../boot.php:2446
+msgid "[today]"
+msgstr "[heute]"
+
+#: ../../boot.php:2620 ../../boot.php:2643
+msgid "link to source"
+msgstr "Link zum original Posting"
+
+#: ../../mod/manage.php:37
+#, php-format
+msgid "Welcome back %s"
+msgstr "Willkommen zurück %s"
+
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
+msgstr "Verwalte Identitäten und/oder Seiten"
+
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
+msgstr ""
+"(Wähle zwischen verschiedenen Identitäten oder Gemeinschafts/Gruppen Seiten "
+"die deine Accountdetails teilen.)"
+
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
+msgstr "Wähle eine Identität zum Verwalten:"
+
+#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857
+#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109
+#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
+#: ../../addon/statusnet/statusnet.php:163
+#: ../../addon/statusnet/statusnet.php:189
+#: ../../addon/statusnet/statusnet.php:207
+#: ../../addon/facebook/facebook.php:151
+#: ../../addon/randplace/randplace.php:179 ../../mod/install.php:123
+#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
+#: ../../mod/group.php:97 ../../mod/group.php:155 ../../mod/profile.php:388
+#: ../../mod/profiles.php:370 ../../mod/install.php:133
+#: ../../mod/photos.php:1109 ../../mod/settings.php:364
+#: ../../mod/contacts.php:264 ../../mod/display.php:174
+#: ../../mod/network.php:506
+msgid "Submit"
+msgstr "Senden"
+
+#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr "Bildgröße überschreitet das Limit von %d"
+
+#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
+#: ../../mod/photos.php:570 ../../mod/photos.php:571
+msgid "Unable to process image."
+msgstr "Konnte das Bild nicht bearbeiten."
+
+#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:95 ../../mod/item.php:184 ../../mod/message.php:93
+#: ../../mod/item.php:212
+msgid "Wall Photos"
+msgstr "Wall Photos"
+
+#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
+#: ../../mod/photos.php:588 ../../mod/photos.php:589
+#: ../../mod/profile_photo.php:232 ../../mod/profile_photo.php:236
+msgid "Image upload failed."
+msgstr "Hochladen des Bildes gescheitert."
+
+#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389
+#: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93
+#: ../../mod/register.php:311 ../../mod/register.php:348
+#: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39
+#: ../../mod/item.php:423 ../../mod/item.php:446 ../../mod/dfrn_confirm.php:649
+#: ../../include/items.php:1350 ../../include/items.php:1420
+#: ../../mod/register.php:329 ../../mod/register.php:366
+#: ../../mod/dfrn_notify.php:392 ../../mod/dfrn_notify.php:478
+#: ../../mod/item.php:475 ../../mod/item.php:498 ../../mod/dfrn_request.php:547
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../../mod/dfrn_notify.php:179
+msgid "noreply"
+msgstr "noreply"
+
+#: ../../mod/dfrn_notify.php:237
+msgid "New mail received at "
+msgstr "New mail received at "
+
+#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477
+#, php-format
+msgid "%s commented on an item at %s"
+msgstr "%s hat einen Beitrag auf %s kommentiert"
+
+#: ../../mod/profile.php:151 ../../mod/network.php:91 ../../mod/profile.php:165
+#: ../../mod/profile.php:379 ../../mod/photos.php:1086
+#: ../../mod/display.php:158 ../../mod/network.php:105
+#: ../../mod/network.php:489 ../../mod/profile.php:158 ../../mod/profile.php:372
+msgid "Share"
+msgstr "Teilen"
+
+#: ../../mod/profile.php:152 ../../mod/network.php:92 ../../mod/message.php:185
+#: ../../mod/message.php:319 ../../mod/profile.php:166
+#: ../../mod/network.php:106 ../../mod/message.php:188
+#: ../../mod/message.php:322 ../../mod/editpost.php:63 ../../mod/profile.php:159
+msgid "Upload photo"
+msgstr "Foto hochladen"
+
+#: ../../mod/profile.php:153 ../../mod/network.php:93 ../../mod/message.php:186
+#: ../../mod/message.php:320 ../../mod/profile.php:167
+#: ../../mod/network.php:107 ../../mod/message.php:189
+#: ../../mod/message.php:323 ../../mod/editpost.php:64 ../../mod/profile.php:160
+msgid "Insert web link"
+msgstr "Weblink einfügen"
+
+#: ../../mod/profile.php:154 ../../mod/network.php:94 ../../mod/profile.php:168
+#: ../../mod/network.php:108 ../../mod/editpost.php:65 ../../mod/profile.php:161
+msgid "Insert YouTube video"
+msgstr "YouTube Video einfügen"
+
+#: ../../mod/profile.php:155 ../../mod/network.php:95 ../../mod/profile.php:171
+#: ../../mod/network.php:111 ../../mod/editpost.php:68 ../../mod/profile.php:164
+msgid "Set your location"
+msgstr "Deinen Standort festlegen"
+
+#: ../../mod/profile.php:156 ../../mod/network.php:96 ../../mod/profile.php:172
+#: ../../mod/network.php:112 ../../mod/editpost.php:69 ../../mod/profile.php:165
+msgid "Clear browser location"
+msgstr "Browser Standort leeren"
+
+#: ../../mod/profile.php:157 ../../mod/profile.php:309
+#: ../../mod/photos.php:1052 ../../mod/display.php:158 ../../mod/network.php:97
+#: ../../mod/network.php:367 ../../mod/message.php:187
+#: ../../mod/message.php:321 ../../mod/profile.php:174
+#: ../../mod/profile.php:380 ../../mod/photos.php:1087
+#: ../../mod/display.php:159 ../../mod/network.php:114
+#: ../../mod/network.php:490 ../../mod/message.php:190
+#: ../../mod/message.php:324 ../../mod/editpost.php:70
+#: ../../mod/profile.php:167 ../../mod/profile.php:373
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../../mod/profile.php:158 ../../mod/network.php:98 ../../mod/profile.php:175
+#: ../../mod/network.php:115 ../../mod/editpost.php:71 ../../mod/profile.php:168
+msgid "Permission settings"
+msgstr "Berechtigungseinstellungen"
+
+#: ../../mod/profile.php:165 ../../mod/network.php:104
+#: ../../mod/profile.php:182 ../../mod/network.php:121
+#: ../../mod/editpost.php:77 ../../mod/profile.php:175
+msgid "CC: email addresses"
+msgstr "CC: EMail Addresse"
+
+#: ../../mod/profile.php:167 ../../mod/network.php:106
+#: ../../mod/profile.php:184 ../../mod/network.php:123
+#: ../../mod/editpost.php:79 ../../mod/profile.php:177
+msgid "Example: bob@example.com, mary@example.com"
+msgstr "Z.B.: bob@example.com, mary@example.com"
+
+#: ../../mod/profile.php:300 ../../mod/photos.php:935 ../../mod/display.php:149
+#: ../../mod/network.php:321 ../../mod/profile.php:370 ../../mod/photos.php:962
+#: ../../mod/network.php:443 ../../mod/profile.php:363
+msgid "Private Message"
+msgstr "Private Nachricht"
+
+#: ../../mod/profile.php:307 ../../mod/photos.php:1050
+#: ../../mod/display.php:156 ../../mod/network.php:365
+#: ../../mod/profile.php:377 ../../mod/photos.php:1084
+#: ../../mod/network.php:487 ../../mod/profile.php:370
+msgid "I like this (toggle)"
+msgstr "Ich mag das (toggle)"
+
+#: ../../mod/profile.php:308 ../../mod/photos.php:1051
+#: ../../mod/display.php:157 ../../mod/network.php:366
+#: ../../mod/profile.php:378 ../../mod/photos.php:1085
+#: ../../mod/network.php:488 ../../mod/profile.php:371
+msgid "I don't like this (toggle)"
+msgstr "Ich mag das nicht (toggle)"
+
+#: ../../mod/profile.php:321 ../../mod/photos.php:1071
+#: ../../mod/photos.php:1111 ../../mod/photos.php:1140
+#: ../../mod/display.php:170 ../../mod/network.php:380
+#: ../../mod/profile.php:392 ../../mod/photos.php:1106
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
+#: ../../mod/display.php:171 ../../mod/network.php:503
+#: ../../mod/profile.php:385 ../../mod/photos.php:1148 ../../mod/photos.php:1177
+msgid "This is you"
+msgstr "Das bist du"
+
+#: ../../mod/profile.php:361 ../../mod/photos.php:1168
+#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137
+#: ../../mod/profile.php:438 ../../mod/photos.php:1203 ../../mod/group.php:141
+#: ../../mod/display.php:238 ../../mod/network.php:512
+#: ../../mod/profile.php:433 ../../mod/photos.php:1205
+#: ../../mod/display.php:240 ../../mod/network.php:514
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../../mod/profile.php:382 ../../mod/search.php:116 ../../mod/display.php:258
+#: ../../mod/network.php:272 ../../mod/network.php:434
+#: ../../mod/profile.php:460 ../../mod/search.php:124 ../../mod/display.php:262
+#: ../../mod/network.php:330 ../../mod/network.php:561
+#: ../../mod/profile.php:455 ../../mod/display.php:264 ../../mod/network.php:563
+msgid "View $name's profile"
+msgstr "Betrachte das Profil von $name"
+
+#: ../../mod/profile.php:414 ../../mod/display.php:312
+#: ../../mod/register.php:422 ../../mod/network.php:471
+#: ../../mod/profile.php:494 ../../mod/register.php:442
+#: ../../mod/display.php:318 ../../mod/network.php:607
+#: ../../mod/profile.php:489 ../../mod/display.php:320 ../../mod/network.php:609
+msgid ""
+"Shared content is covered by the <a "
+"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
+"Attribution 3.0</a> license."
+msgstr ""
+"Shared content is covered by the <a "
+"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
+"Attribution 3.0</a> license."
+
+#: ../../mod/follow.php:167 ../../mod/follow.php:186
+msgid "The profile address specified does not provide adequate information."
+msgstr "Die angegebene Profiladresse liefert unzureichende Informationen."
+
+#: ../../mod/follow.php:173 ../../mod/follow.php:192
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr ""
+"Eingeschränktes Profil. Diese Person wird keine direkten/privaten "
+"Nachrichten von dir erhalten können."
+
+#: ../../mod/follow.php:224 ../../mod/follow.php:243
+msgid "Unable to retrieve contact information."
+msgstr "Konnte die Kontaktinformationen nicht empfangen."
+
+#: ../../mod/follow.php:270 ../../mod/follow.php:289
+msgid "following"
+msgstr "folgen"
+
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
+msgstr "Bilder hochgeladen aber das Zuschneiden ist fehlgeschlagen."
+
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
+#: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234
+#: ../../mod/photos.php:106 ../../mod/photos.php:530 ../../mod/photos.php:849
+#: ../../mod/photos.php:864 ../../mod/register.php:267
+#: ../../mod/register.php:274 ../../mod/register.php:281
+#: ../../mod/register.php:285 ../../mod/register.php:292
+#: ../../mod/register.php:299 ../../mod/photos.php:531 ../../mod/photos.php:850
+#: ../../mod/photos.php:865 ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:231
+#: ../../mod/profile_photo.php:240
+msgid "Profile Photos"
+msgstr "Profilbilder"
+
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
+#: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:243
+#, php-format
+msgid "Image size reduction [%s] failed."
+msgstr "Verkleinern der Bildgröße von [%s] ist gescheitert."
+
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
+msgstr "Bild konnte nicht verarbeitet werden"
+
+#: ../../mod/profile_photo.php:228 ../../mod/profile_photo.php:230
+#: ../../mod/profile_photo.php:234
+msgid "Image uploaded successfully."
+msgstr "Bild erfolgreich auf den Server geladen."
+
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen zu %s"
+
+#: ../../mod/regmod.php:10
+msgid "Please login."
+msgstr "Bitte melde dich an."
+
+#: ../../mod/regmod.php:54
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registration für %s wurde zurück gezogen"
+
+#: ../../mod/regmod.php:92 ../../mod/register.php:310 ../../mod/register.php:328
+#, php-format
+msgid "Registration details for %s"
+msgstr "Details der Registration von %s"
+
+#: ../../mod/regmod.php:96
+msgid "Account approved."
+msgstr "Account freigegeben."
+
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:234
+#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:237 ../../mod/profiles.php:342
+msgid "Profile not found."
+msgstr "Profil nicht gefunden."
+
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
+msgstr "Profilname ist erforderlich."
+
+#: ../../mod/profiles.php:196 ../../mod/profiles.php:199
+msgid "Profile updated."
+msgstr "Profil aktualisiert."
+
+#: ../../mod/profiles.php:251 ../../mod/profiles.php:254
+msgid "Profile deleted."
+msgstr "Profil gelöscht."
+
+#: ../../mod/profiles.php:267 ../../mod/profiles.php:298
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
+msgstr "Profil-"
+
+#: ../../mod/profiles.php:286 ../../mod/profiles.php:325
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
+msgstr "Neues Profil angelegt."
+
+#: ../../mod/profiles.php:304 ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
+msgstr "Profil nicht zum Duplizieren verfügbar."
+
+#: ../../mod/profiles.php:367 ../../mod/profiles.php:370
+#: ../../mod/profiles.php:411
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr ""
+"Dies ist dein <strong>öffentliches</strong> Profil.<br />Es "
+"<strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein."
+
+#: ../../mod/profiles.php:377 ../../mod/profiles.php:380
+#: ../../mod/directory.php:91 ../../mod/profiles.php:421
+msgid "Age: "
+msgstr "Alter: "
+
+#: ../../mod/profiles.php:418 ../../mod/profiles.php:422
+#: ../../mod/profiles.php:470
+msgid "Profile Image"
+msgstr "Profilbild"
+
+#: ../../mod/settings.php:37 ../../mod/settings.php:38
+msgid "Passwords do not match. Password unchanged."
+msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."
+
+#: ../../mod/settings.php:42 ../../mod/settings.php:43
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."
+
+#: ../../mod/settings.php:53 ../../mod/settings.php:54
+msgid "Password changed."
+msgstr "Passwort ändern."
+
+#: ../../mod/settings.php:55 ../../mod/settings.php:56
+msgid "Password update failed. Please try again."
+msgstr ""
+"Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal."
+
+#: ../../mod/settings.php:95 ../../mod/settings.php:98
+msgid " Please use a shorter name."
+msgstr " Bitte verwende einen kürzeren Namen."
+
+#: ../../mod/settings.php:97 ../../mod/settings.php:100
+msgid " Name too short."
+msgstr " Name ist zu kurz."
+
+#: ../../mod/settings.php:103 ../../mod/settings.php:106
+msgid " Not valid email."
+msgstr " Keine gültige EMail."
+
+#: ../../mod/settings.php:105 ../../mod/settings.php:108
+msgid " Cannot change to that email."
+msgstr " Cannot change to that email."
+
+#: ../../mod/settings.php:161 ../../mod/settings.php:166
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: ../../mod/settings.php:211 ../../mod/settings.php:216
+#: ../../mod/settings.php:356
+msgid "Plugin Settings"
+msgstr "Plugin Einstellungen"
+
+#: ../../mod/settings.php:212 ../../mod/settings.php:217
+#: ../../mod/settings.php:355
+msgid "Account Settings"
+msgstr "Account Einstellungen"
+
+#: ../../mod/settings.php:218 ../../mod/settings.php:223
+msgid "No Plugin settings configured"
+msgstr "Keine Erweiterungen konfiguriert"
+
+#: ../../mod/settings.php:263 ../../mod/settings.php:278
+msgid "OpenID: "
+msgstr "OpenID: "
+
+#: ../../mod/settings.php:263 ../../mod/settings.php:278
+msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
+msgstr ""
+"&nbsp;(Optional) Erlaube dieser OpenID sich für diesen Account anzumelden."
+
+#: ../../mod/settings.php:295 ../../mod/settings.php:310
+#: ../../mod/settings.php:316
+msgid "Profile is <strong>not published</strong>."
+msgstr "Profil ist <strong>nicht veröffentlicht</strong>."
+
+#: ../../mod/settings.php:352 ../../mod/settings.php:371
+#: ../../mod/settings.php:397
+msgid "Default Post Permissions"
+msgstr "Grundeinstellung für Veröffentlichungen"
+
+#: ../../mod/search.php:131 ../../mod/network.php:287 ../../mod/search.php:140
+#: ../../mod/network.php:346
+msgid "View in context"
+msgstr "Im Zusammenhang betrachten"
+
+#: ../../mod/photos.php:30
+msgid "Photo Albums"
+msgstr "Fotoalben"
+
+#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780
+#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198
+#: ../../mod/photos.php:1209 ../../include/Photo.php:225
+#: ../../include/Photo.php:232 ../../include/Photo.php:239
+#: ../../include/items.php:959 ../../include/items.php:962
+#: ../../include/items.php:965 ../../include/items.php:1028
+#: ../../include/items.php:1031 ../../include/items.php:1034
+#: ../../mod/photos.php:781 ../../mod/photos.php:850 ../../mod/photos.php:865
+#: ../../mod/photos.php:1233 ../../mod/photos.php:1244
+#: ../../mod/photos.php:1235 ../../mod/photos.php:1246
+msgid "Contact Photos"
+msgstr "Kontaktbilder"
+
+#: ../../mod/photos.php:95
+msgid "Contact information unavailable"
+msgstr "Kontakt Informationen nicht verfügbar"
+
+#: ../../mod/photos.php:116
+msgid "Album not found."
+msgstr "Album nicht gefunden."
+
+#: ../../mod/photos.php:134 ../../mod/photos.php:858 ../../mod/photos.php:859
+msgid "Delete Album"
+msgstr "Album löschen"
+
+#: ../../mod/photos.php:197 ../../mod/photos.php:1033 ../../mod/photos.php:1067
+msgid "Delete Photo"
+msgstr "Foto löschen"
+
+#: ../../mod/photos.php:468 ../../mod/photos.php:469
+msgid "was tagged in a"
+msgstr "was tagged in a"
+
+#: ../../mod/photos.php:468 ../../mod/like.php:110 ../../mod/photos.php:469
+msgid "photo"
+msgstr "Foto"
+
+#: ../../mod/photos.php:468 ../../mod/photos.php:469
+msgid "by"
+msgstr "von"
+
+#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306
+#: ../../mod/photos.php:559
+msgid "Image exceeds size limit of "
+msgstr "Die Bildgröße übersteigt das Limit von "
+
+#: ../../mod/photos.php:660 ../../mod/photos.php:661
+msgid "No photos selected"
+msgstr "Keine Bilder ausgewählt"
+
+#: ../../mod/photos.php:807 ../../mod/photos.php:808
+msgid "Upload Photos"
+msgstr "Bilder hochladen"
+
+#: ../../mod/photos.php:810 ../../mod/photos.php:853 ../../mod/photos.php:811
+#: ../../mod/photos.php:854
+msgid "New album name: "
+msgstr "Name des neuen Albums: "
+
+#: ../../mod/photos.php:811 ../../mod/photos.php:812
+msgid "or existing album name: "
+msgstr "oder existierender Albumname: "
+
+#: ../../mod/photos.php:813 ../../mod/photos.php:1028 ../../mod/photos.php:814
+#: ../../mod/photos.php:1062
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: ../../mod/photos.php:868 ../../mod/photos.php:869
+msgid "Edit Album"
+msgstr "Album bearbeiten"
+
+#: ../../mod/photos.php:878 ../../mod/photos.php:1228 ../../mod/photos.php:879
+#: ../../mod/photos.php:1263 ../../mod/photos.php:1265
+msgid "View Photo"
+msgstr "Fotos betrachten"
+
+#: ../../mod/photos.php:908 ../../mod/photos.php:909
+msgid "Photo not available"
+msgstr "Foto nicht verfügbar"
+
+#: ../../mod/photos.php:929 ../../mod/photos.php:956
+msgid "Edit photo"
+msgstr "Foto bearbeiten"
+
+#: ../../mod/photos.php:931 ../../mod/photos.php:958
+msgid "Use as profile photo"
+msgstr "Als Profilbild verwenden"
+
+#: ../../mod/photos.php:944 ../../mod/photos.php:973
+msgid "View Full Size"
+msgstr "Betrachte Originalgröße"
+
+#: ../../mod/photos.php:1002 ../../mod/photos.php:1036
+msgid "Tags: "
+msgstr "Tags: "
+
+#: ../../mod/photos.php:1012 ../../mod/photos.php:1046
+msgid "[Remove any tag]"
+msgstr "[Tag entfernen]"
+
+#: ../../mod/photos.php:1021 ../../mod/photos.php:1055
+msgid "New album name"
+msgstr "Name des neuen Albums"
+
+#: ../../mod/photos.php:1024 ../../mod/photos.php:1058
+msgid "Caption"
+msgstr "Bildunterschrift"
+
+#: ../../mod/photos.php:1026 ../../mod/photos.php:1060
+msgid "Add a Tag"
+msgstr "Tag hinzufügen"
+
+#: ../../mod/photos.php:1030 ../../mod/photos.php:1064
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+msgstr ""
+"Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+
+#: ../../mod/photos.php:1214 ../../mod/photos.php:1249 ../../mod/photos.php:1251
+msgid "Recent Photos"
+msgstr "Neuste Fotos"
+
+#: ../../mod/photos.php:1218 ../../mod/photos.php:1253 ../../mod/photos.php:1255
+msgid "Upload New Photos"
+msgstr "Weitere Fotos hochladen"
+
+#: ../../mod/photos.php:1234 ../../mod/photos.php:1269 ../../mod/photos.php:1271
+msgid "View Album"
+msgstr "Album betrachten"
+
+#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
+#: ../../mod/display.php:313 ../../mod/item.php:598 ../../mod/display.php:315
+msgid "Item not found."
+msgstr "Beitrag nicht gefunden."
+
+#: ../../mod/display.php:259 ../../mod/network.php:435
+#: ../../mod/display.php:263 ../../mod/network.php:562
+#: ../../mod/display.php:265 ../../mod/network.php:564
+msgid "View $owner_name's profile"
+msgstr "Betrachte das Profil von $owner_name"
+
+#: ../../mod/display.php:260 ../../mod/network.php:436
+#: ../../mod/display.php:264 ../../mod/network.php:563
+#: ../../mod/display.php:266 ../../mod/network.php:565
+msgid "to"
+msgstr "to"
+
+#: ../../mod/display.php:261 ../../mod/network.php:437
+#: ../../mod/display.php:265 ../../mod/network.php:564
+#: ../../mod/display.php:267 ../../mod/network.php:566
+msgid "Wall-to-Wall"
+msgstr "Wall-to-Wall"
+
+#: ../../mod/display.php:262 ../../mod/network.php:438
+#: ../../mod/display.php:266 ../../mod/network.php:565
+#: ../../mod/display.php:268 ../../mod/network.php:567
+msgid "via Wall-To-Wall:"
+msgstr "via Wall-To-Wall:"
+
+#: ../../mod/display.php:300 ../../mod/display.php:306 ../../mod/display.php:308
+msgid "Item has been removed."
+msgstr "Eintrag wurde entfernt."
+
+#: ../../mod/invite.php:28
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: Keine gültige Email Adresse."
+
+#: ../../mod/invite.php:32
+#, php-format
+msgid "Please join my network on %s"
+msgstr "Bitte trete meinem Netzwerk auf %s bei"
+
+#: ../../mod/invite.php:38
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s: Zustellung der Nachricht fehlgeschlagen."
+
+#: ../../mod/invite.php:42
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d Nachricht gesendet."
+msgstr[1] "%d Nachrichten gesendet."
+
+#: ../../mod/invite.php:57
+msgid "Send invitations"
+msgstr "Einladungen senden"
+
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
+msgstr "Email Adressen eingeben, eine pro Zeile:"
+
+#: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316
+#: ../../mod/message.php:185 ../../mod/message.php:319
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
+#: ../../mod/invite.php:60
+#, php-format
+msgid "Please join my social network on %s"
+msgstr "Bitte trete meinem Sozialen Netzwerk auf %s bei"
+
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
+msgstr "Um diese Einladung anzunehmen beuche bitte:"
+
+#: ../../mod/invite.php:62
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr ""
+"Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:"
+
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
+msgstr "Freunde einladen"
+
+#: ../../mod/contacts.php:16 ../../mod/contacts.php:19
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
+
+#: ../../mod/contacts.php:17 ../../mod/contacts.php:20
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr "Beispiel: bob@example.com, http://example.com/barbara"
+
+#: ../../mod/contacts.php:18 ../../mod/contacts.php:21
+msgid "Follow"
+msgstr "Folge"
+
+#: ../../mod/contacts.php:38 ../../mod/contacts.php:119
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
+msgid "Could not access contact record."
+msgstr "Konnte nicht auf die Kontaktdaten zugreifen."
+
+#: ../../mod/contacts.php:52 ../../mod/contacts.php:57
+msgid "Could not locate selected profile."
+msgstr "Konnte das ausgewählte Profiel nicht finden."
+
+#: ../../mod/contacts.php:83 ../../mod/contacts.php:88
+msgid "Contact updated."
+msgstr "Kontakt aktualisiert."
+
+#: ../../mod/contacts.php:85 ../../mod/dfrn_request.php:402
+#: ../../mod/contacts.php:90
+msgid "Failed to update contact record."
+msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen."
+
+#: ../../mod/contacts.php:141 ../../mod/contacts.php:146
+msgid "Contact has been blocked"
+msgstr "Kontakt wurde blockiert"
+
+#: ../../mod/contacts.php:141 ../../mod/contacts.php:146
+msgid "Contact has been unblocked"
+msgstr "Kontakt wurde wieder frei gegeben"
+
+#: ../../mod/contacts.php:155 ../../mod/contacts.php:160
+msgid "Contact has been ignored"
+msgstr "Der Kontakt wurde ignoriert"
+
+#: ../../mod/contacts.php:155 ../../mod/contacts.php:160
+msgid "Contact has been unignored"
+msgstr "Kontakt wurde ignoriert"
+
+#: ../../mod/contacts.php:176 ../../mod/contacts.php:181
+msgid "stopped following"
+msgstr "wird nicht mehr gefolgt"
+
+#: ../../mod/contacts.php:195 ../../mod/contacts.php:200
+msgid "Contact has been removed."
+msgstr "Kontakt wurde entfernt."
+
+#: ../../mod/contacts.php:209 ../../mod/dfrn_confirm.php:114
+#: ../../mod/contacts.php:214
+msgid "Contact not found."
+msgstr "Kontakt nicht gefunden."
+
+#: ../../mod/contacts.php:223 ../../mod/contacts.php:344
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:352
+#: ../../mod/contacts.php:360
+msgid "Mutual Friendship"
+msgstr "Beidseitige Freundschaft"
+
+#: ../../mod/contacts.php:227 ../../mod/contacts.php:348
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
+#: ../../mod/contacts.php:364
+msgid "is a fan of yours"
+msgstr "ist ein Fan von dir"
+
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:352
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:368
+msgid "you are a fan of"
+msgstr "du bist Fan von"
+
+#: ../../mod/contacts.php:248 ../../mod/contacts.php:256
+msgid "Never"
+msgstr "Niemals"
+
+#: ../../mod/contacts.php:252 ../../mod/contacts.php:260
+msgid "(Update was successful)"
+msgstr "(Aktualisierung war erfolgreich)"
+
+#: ../../mod/contacts.php:252 ../../mod/contacts.php:260
+msgid "(Update was not successful)"
+msgstr "(Aktualisierung war nicht erfolgreich)"
+
+#: ../../mod/contacts.php:255 ../../mod/contacts.php:263
+msgid "Contact Editor"
+msgstr "Kontakt Editor"
+
+#: ../../mod/contacts.php:256 ../../mod/contacts.php:264
+#: ../../mod/contacts.php:272
+msgid "Visit $name's profile"
+msgstr "Besuche das Profil von $name"
+
+#: ../../mod/contacts.php:257 ../../mod/contacts.php:265
+#: ../../mod/contacts.php:273
+msgid "Block/Unblock contact"
+msgstr "Kontakt blockieren/freischalten"
+
+#: ../../mod/contacts.php:258 ../../mod/contacts.php:266
+#: ../../mod/contacts.php:274
+msgid "Ignore contact"
+msgstr "Ignoriere den Kontakt"
+
+#: ../../mod/contacts.php:259 ../../mod/contacts.php:267
+#: ../../mod/contacts.php:275
+msgid "Delete contact"
+msgstr "Lösche den Kontakt"
+
+#: ../../mod/contacts.php:261 ../../mod/contacts.php:269
+#: ../../mod/contacts.php:277
+msgid "Last updated: "
+msgstr "Letzte Aktualisierung: "
+
+#: ../../mod/contacts.php:262 ../../mod/contacts.php:270
+#: ../../mod/contacts.php:278
+msgid "Update public posts: "
+msgstr "Aktualisierung öffentlicher Nachrichten: "
+
+#: ../../mod/contacts.php:264 ../../mod/contacts.php:272
+#: ../../mod/contacts.php:280
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
+
+#: ../../mod/contacts.php:267 ../../mod/contacts.php:275
+#: ../../mod/contacts.php:283
+msgid "Unblock this contact"
+msgstr "Blockade dieses Kontakts aufheben"
+
+#: ../../mod/contacts.php:267 ../../mod/contacts.php:275
+#: ../../mod/contacts.php:283
+msgid "Block this contact"
+msgstr "Diesen Kontakt blockieren"
+
+#: ../../mod/contacts.php:268 ../../mod/contacts.php:276
+#: ../../mod/contacts.php:284
+msgid "Unignore this contact"
+msgstr "Diesen Kontakt nicht mehr ignorieren"
+
+#: ../../mod/contacts.php:268 ../../mod/contacts.php:276
+#: ../../mod/contacts.php:284
+msgid "Ignore this contact"
+msgstr "Diesen Kontakt ignorieren"
+
+#: ../../mod/contacts.php:271 ../../mod/contacts.php:279
+#: ../../mod/contacts.php:287
+msgid "Currently blocked"
+msgstr "Derzeit geblockt"
+
+#: ../../mod/contacts.php:272 ../../mod/contacts.php:280
+#: ../../mod/contacts.php:288
+msgid "Currently ignored"
+msgstr "Derzeit ignoriert"
+
+#: ../../mod/contacts.php:305 ../../mod/contacts.php:313
+#: ../../mod/contacts.php:321
+msgid "Show Blocked Connections"
+msgstr "Zeige geblockte Verbindungen"
+
+#: ../../mod/contacts.php:305 ../../mod/contacts.php:313
+#: ../../mod/contacts.php:321
+msgid "Hide Blocked Connections"
+msgstr "Verstecke geblockte Verbindungen"
+
+#: ../../mod/contacts.php:307 ../../mod/directory.php:38
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:323
+msgid "Finding: "
+msgstr "Funde: "
+
+#: ../../mod/contacts.php:308 ../../mod/directory.php:40
+#: ../../mod/contacts.php:316 ../../mod/contacts.php:324
+msgid "Find"
+msgstr "Finde"
+
+#: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44
+#: ../../mod/contacts.php:376 ../../mod/contacts.php:384
+msgid "Visit $username's profile"
+msgstr "Besuche das Profil von $username"
+
+#: ../../mod/contacts.php:369 ../../mod/contacts.php:377 ../../boot.php:2732
+#: ../../mod/contacts.php:385
+msgid "Edit contact"
+msgstr "Kontakt bearbeiten"
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr "Entfernte Privatsphäreneinstellungen nicht verfügbar."
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr "Sichtbar für:"
+
+#: ../../mod/register.php:47
+msgid "Invalid OpenID url"
+msgstr "Ungültige OpenID URL"
+
+#: ../../mod/register.php:62
+msgid "Please enter the required information."
+msgstr "Bitte trage die erforderlichen Informationen ein."
+
+#: ../../mod/register.php:74
+msgid "Please use a shorter name."
+msgstr "Bitte verwende einen kürzeren Namen."
+
+#: ../../mod/register.php:76
+msgid "Name too short."
+msgstr "Der Name ist zu kurz."
+
+#: ../../mod/register.php:89
+msgid "That doesn\\'t appear to be your full (First Last) name."
+msgstr "Das scheint kein vollständiger Name (Vor und Zuname) zu sein."
+
+#: ../../mod/register.php:92
+msgid "Your email domain is not among those allowed on this site."
+msgstr "Die Domain deiner EMail Adresse ist nicht erlaubt auf dieser Seite."
+
+#: ../../mod/register.php:95
+msgid "Not a valid email address."
+msgstr "Keine gültige EMail Adresse."
+
+#: ../../mod/register.php:101
+msgid "Cannot use that email."
+msgstr "Konnte diese EMail Adresse nicht verwenden."
+
+#: ../../mod/register.php:106
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
+msgstr ""
+"Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" "
+"und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen."
+
+#: ../../mod/register.php:112 ../../mod/register.php:212
+msgid "Nickname is already registered. Please choose another."
+msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."
+
+#: ../../mod/register.php:131
+msgid "SERIOUS ERROR: Generation of security keys failed."
+msgstr "SERIOUS ERROR: Generation of security keys failed."
+
+#: ../../mod/register.php:198
+msgid "An error occurred during registration. Please try again."
+msgstr ""
+"Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch "
+"einmal."
+
+#: ../../mod/register.php:216 ../../mod/register.php:234
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+"Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte "
+"versuche es noch einmal."
+
+#: ../../mod/register.php:315 ../../mod/register.php:333
+msgid ""
+"Registration successful. Please check your email for further instructions."
+msgstr ""
+"Registration erfolgreich. Eine EMail mit weiteren Anweisungen wurde an dich "
+"gesendet."
+
+#: ../../mod/register.php:319 ../../mod/register.php:337
+msgid "Failed to send email message. Here is the message that failed."
+msgstr ""
+"Konnte die EMail nicht versenden. Hier ist die Nachricht die nicht gesendet "
+"werden konnte."
+
+#: ../../mod/register.php:324 ../../mod/register.php:342
+msgid "Your registration can not be processed."
+msgstr "Deine Registration konnte nicht verarbeitet werden."
+
+#: ../../mod/register.php:347 ../../mod/register.php:365
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registrationsanfrage auf %s"
+
+#: ../../mod/register.php:351 ../../mod/register.php:369
+msgid "Your registration is pending approval by the site owner."
+msgstr ""
+"Deine Registration muss noch vom Betreiber der Seite freigegeben werden."
+
+#: ../../mod/register.php:399 ../../mod/register.php:417
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr ""
+"Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen indem "
+"du deine OpenID angibst und 'Registrieren' klickst."
+
+#: ../../mod/register.php:400 ../../mod/register.php:418
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
+msgstr ""
+"Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und "
+"fülle die restlichen Felder aus."
+
+#: ../../mod/register.php:401 ../../mod/register.php:419
+msgid "Your OpenID (optional): "
+msgstr "Deine OpenID (optional): "
+
+#: ../../mod/register.php:404
+msgid ""
+"Members of this network prefer to communicate with real people who use their "
+"real names."
+msgstr ""
+"Die Mitglieder dieses Netzwerks ziehen es von mit echten Menschen in Kontakt "
+"zu treten die ihre echten Namen verwenden."
+
+#: ../../mod/register.php:413 ../../mod/register.php:433
+msgid "Include your profile in member directory?"
+msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
+
+#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
+#: ../../mod/register.php:436 ../../mod/dfrn_request.php:620
+#: ../../mod/profiles.php:355 ../../mod/settings.php:289
+#: ../../mod/settings.php:301
+msgid "Yes"
+msgstr "Ja"
+
+#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
+#: ../../mod/register.php:437 ../../mod/dfrn_request.php:621
+#: ../../mod/profiles.php:356 ../../mod/settings.php:290
+#: ../../mod/settings.php:302
+msgid "No"
+msgstr "Nein"
+
+#: ../../mod/register.php:429 ../../mod/register.php:449
+msgid "Registration"
+msgstr "Registration"
+
+#: ../../mod/register.php:437 ../../mod/register.php:457
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr "Vollständiger Name (z.B. Joe Smith): "
+
+#: ../../mod/register.php:438 ../../mod/register.php:458
+msgid "Your Email Address: "
+msgstr "Deine EMail Adresse: "
+
+#: ../../mod/register.php:439 ../../mod/register.php:459
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be "
+"'<strong>nickname@$sitename</strong>'."
+msgstr ""
+"Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben "
+"beginnen. Die Adresse deines Profils auf dieser Seite wird "
+"'<strong>spitzname@$sitename</strong>' sein."
+
+#: ../../mod/register.php:440 ../../mod/register.php:460
+msgid "Choose a nickname: "
+msgstr "Spitznamen wählen: "
+
+#: ../../mod/install.php:30 ../../mod/install.php:33
+msgid "Could not create/connect to database."
+msgstr ""
+"Konnte die Verbindung zur Datenbank nicht aufbauen bzw. die Datenbank "
+"anlegen."
+
+#: ../../mod/install.php:35 ../../mod/install.php:38
+msgid "Connected to database."
+msgstr "Mit der Datenbank verbunden."
+
+#: ../../mod/install.php:66
+msgid "Database import succeeded."
+msgstr "Import der Datenbank erfolgreich."
+
+#: ../../mod/install.php:67 ../../mod/install.php:75
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+"WICHTIG: Du musst [manuell] einen cron Job (o.ä.) für den Poller einrichten."
+
+#: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
+#: ../../mod/install.php:199
+msgid "Please see the file \"INSTALL.txt\"."
+msgstr "Lies bitte die \"INSTALL.txt\"."
+
+#: ../../mod/install.php:73 ../../mod/install.php:84
+msgid "Database import failed."
+msgstr "Import der Datenbank schlug fehl."
+
+#: ../../mod/install.php:74 ../../mod/install.php:85
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
+msgstr ""
+"Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin "
+"oder mysql importieren."
+
+#: ../../mod/install.php:84 ../../mod/install.php:98
+msgid "Welcome to Friendika."
+msgstr "Willkommen bei Friendika."
+
+#: ../../mod/install.php:124 ../../mod/install.php:138 ../../mod/install.php:148
+msgid "Could not find a command line version of PHP in the web server PATH."
+msgstr "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden."
+
+#: ../../mod/install.php:125 ../../mod/install.php:139 ../../mod/install.php:149
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
+msgstr ""
+"Diese wird von Friendika benötigt. Bitte passe die Konfigurationsdatei "
+".htconfig.php entsprechend an."
+
+#: ../../mod/install.php:132 ../../mod/install.php:146 ../../mod/install.php:156
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
+msgstr ""
+"Die Kommandozeilenversion von PHP auf deinem System hat "
+"\"register_argc_argv\" nicht aktiviert."
+
+#: ../../mod/install.php:133 ../../mod/install.php:147 ../../mod/install.php:157
+msgid "This is required for message delivery to work."
+msgstr "Dies wird für die Auslieferung von Nachrichten benötigt."
+
+#: ../../mod/install.php:155 ../../mod/install.php:169 ../../mod/install.php:179
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
+msgstr ""
+"Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der "
+"lage Verschlüsselungsschlüssel zu erzeugen"
+
+#: ../../mod/install.php:156 ../../mod/install.php:170 ../../mod/install.php:180
+msgid ""
+"If running under Windows, please see "
+"\"http://www.php.net/manual/en/openssl.installation.php\"."
+msgstr ""
+"Wenn der Server unter Windows läuft, schau dir bitte "
+"\"http://www.php.net/manual/en/openssl.installation.php\" an."
+
+#: ../../mod/install.php:165 ../../mod/install.php:179 ../../mod/install.php:189
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
+msgstr ""
+"Fehler: Das Apache Modul mod-rewrite wird benötigt, es ist allerdings nicht "
+"installiert."
+
+#: ../../mod/install.php:167 ../../mod/install.php:181 ../../mod/install.php:191
+msgid "Error: libCURL PHP module required but not installed."
+msgstr ""
+"Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert."
+
+#: ../../mod/install.php:169 ../../mod/install.php:183 ../../mod/install.php:193
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
+msgstr ""
+"Fehler: Das GD Graphikmodul für PHP mit JPEG Unterstützung ist nicht "
+"installiert."
+
+#: ../../mod/install.php:171 ../../mod/install.php:185 ../../mod/install.php:195
+msgid "Error: openssl PHP module required but not installed."
+msgstr "Fehler: Das openssl Modul von PHP ist nict installiert."
+
+#: ../../mod/install.php:173 ../../mod/install.php:187 ../../mod/install.php:197
+msgid "Error: mysqli PHP module required but not installed."
+msgstr "Fehler: Das mysqli Modul von PHP ist nicht installiert."
+
+#: ../../mod/install.php:184 ../../mod/install.php:198 ../../mod/install.php:208
+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 ""
+"Der Installationswizzard muss in der Lage sein eine Datei im "
+"Stammverzeichnis deines Webservers anzuliegen ist allerdings derzeit nicht "
+"in der Lage dies zu tun."
+
+#: ../../mod/install.php:185 ../../mod/install.php:199 ../../mod/install.php:209
+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 ""
+"In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der "
+"Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast."
+
+#: ../../mod/install.php:186 ../../mod/install.php:200 ../../mod/install.php:210
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
+msgstr ""
+"Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support "
+"Team um diese Situations zu beheben."
+
+#: ../../mod/install.php:187 ../../mod/install.php:201 ../../mod/install.php:211
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
+msgstr ""
+"Sollte dies nicht möglich sein musst du die Installation manuell "
+"durchführen. Lies dazu bitte in der Datei \"INSTALL.txt\"."
+
+#: ../../mod/install.php:196 ../../mod/install.php:210 ../../mod/install.php:220
+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 ""
+"Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. "
+"Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner "
+"Friendika Installation zu erzeugen."
+
+#: ../../mod/install.php:211 ../../mod/install.php:225 ../../mod/install.php:235
+msgid "Errors encountered creating database tables."
+msgstr "Fehler aufgetreten wärend der Erzeugung der Datenbank Tabellen."
+
+#: ../../mod/network.php:18
+msgid "Normal View"
+msgstr "Normale Ansicht"
+
+#: ../../mod/network.php:20
+msgid "New Item View"
+msgstr "Neue Einträge"
+
+#: ../../mod/network.php:149 ../../mod/network.php:166
+msgid "No such group"
+msgstr "Es gibt keine solche Gruppe"
+
+#: ../../mod/network.php:160 ../../mod/network.php:177
+msgid "Group is empty"
+msgstr "Gruppe ist leer"
+
+#: ../../mod/network.php:164 ../../mod/network.php:181
+msgid "Group: "
+msgstr "Gruppe: "
+
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
+msgstr "Invalid request identifier."
+
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
+#: ../../mod/notifications.php:133
+msgid "Discard"
+msgstr "Verwerfen"
+
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
+#: ../../mod/notifications.php:132
+msgid "Ignore"
+msgstr "Ignorieren"
+
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
+msgstr "Zeige ignorierte Anfragen"
+
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
+msgstr "Verberge ignorierte Anfragen"
+
+#: ../../mod/notifications.php:105 ../../mod/notifications.php:104
+msgid "Claims to be known to you: "
+msgstr "Behauptet dich zu kennen: "
+
+#: ../../mod/notifications.php:105 ../../mod/notifications.php:104
+msgid "yes"
+msgstr "ja"
+
+#: ../../mod/notifications.php:105 ../../mod/notifications.php:104
+msgid "no"
+msgstr "nein"
+
+#: ../../mod/notifications.php:111 ../../mod/notifications.php:110
+msgid "Approve as: "
+msgstr "Genehmigen als: "
+
+#: ../../mod/notifications.php:112 ../../mod/notifications.php:111
+msgid "Friend"
+msgstr "Freund"
+
+#: ../../mod/notifications.php:113 ../../mod/notifications.php:112
+msgid "Fan/Admirer"
+msgstr "Fan/Verehrer"
+
+#: ../../mod/notifications.php:120 ../../mod/notifications.php:119
+msgid "Notification type: "
+msgstr "Benachrichtigungs Typ: "
+
+#: ../../mod/notifications.php:121 ../../mod/notifications.php:120
+msgid "Friend/Connect Request"
+msgstr "Kontakt-/Freundschaftsanfrage"
+
+#: ../../mod/notifications.php:121 ../../mod/notifications.php:120
+msgid "New Follower"
+msgstr "Neuer Bewunderer"
+
+#: ../../mod/notifications.php:131 ../../mod/notifications.php:130
+#: ../../mod/notifications.php:153
+msgid "Approve"
+msgstr "Genehmigen"
+
+#: ../../mod/notifications.php:140 ../../mod/notifications.php:139
+msgid "No notifications."
+msgstr "Keine Benachrichtigungen."
+
+#: ../../mod/notifications.php:164 ../../mod/notifications.php:163
+#: ../../mod/notifications.php:159
+msgid "No registrations."
+msgstr "Keine Neuanmeldungen."
+
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
+msgstr "Diese Vorstellung wurde bereits abgeschlossen."
+
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
+msgid "Profile location is not valid or does not contain profile information."
+msgstr ""
+"Profil Adresse ist ungültig oder stellt einige Profildaten nicht zur "
+"Verfügung."
+
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+msgid "Warning: profile location has no identifiable owner name."
+msgstr "Warning: profile location has no identifiable owner name."
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+msgid "Warning: profile location has no profile photo."
+msgstr "Warning: profile location has no profile photo."
+
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#, 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"
+msgstr[0] ""
+
+#: ../../mod/dfrn_request.php:164
+msgid "Introduction complete."
+msgstr "Vorstellung abgeschlossen."
+
+#: ../../mod/dfrn_request.php:188
+msgid "Unrecoverable protocol error."
+msgstr "Nicht behebbarer Protokollfehler."
+
+#: ../../mod/dfrn_request.php:216
+msgid "Profile unavailable."
+msgstr "Profil nicht verfügbar."
+
+#: ../../mod/dfrn_request.php:241
+#, php-format
+msgid "%s has received too many connection requests today."
+msgstr "%s hat heute zu viele Freundschaftsanfragen erhalten."
+
+#: ../../mod/dfrn_request.php:242
+msgid "Spam protection measures have been invoked."
+msgstr "Maßnahmen zum Spamschutz wurden ergriffen."
+
+#: ../../mod/dfrn_request.php:243
+msgid "Friends are advised to please try again in 24 hours."
+msgstr "Freunde sind angehalten es in 24 Stunden erneut zu versuchen."
+
+#: ../../mod/dfrn_request.php:273
+msgid "Invalid locator"
+msgstr "Ungültiger Locator"
+
+#: ../../mod/dfrn_request.php:292
+msgid "Unable to resolve your name at the provided location."
+msgstr "Unable to resolve your name at the provided location."
+
+#: ../../mod/dfrn_request.php:305
+msgid "You have already introduced yourself here."
+msgstr "Du hast dich hier bereits vorgestellt."
+
+#: ../../mod/dfrn_request.php:309
+#, php-format
+msgid "Apparently you are already friends with %s."
+msgstr "Es scheint so, als ob du bereits ein Freund von %s bist."
+
+#: ../../mod/dfrn_request.php:330
+msgid "Invalid profile URL."
+msgstr "Ungültige Profil URL."
+
+#: ../../mod/dfrn_request.php:336
+msgid "Disallowed profile URL."
+msgstr "Nicht erlaubte Profil URL."
+
+#: ../../mod/dfrn_request.php:423
+msgid "Your introduction has been sent."
+msgstr "Deine Vorstellung wurde abgeschickt."
+
+#: ../../mod/dfrn_request.php:477
+msgid "Please login to confirm introduction."
+msgstr "Bitte melde dich an um die Vorstellung zu bestätigen."
+
+#: ../../mod/dfrn_request.php:491
+msgid ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+msgstr ""
+"Incorrect identity currently logged in. Please login to "
+"<strong>this</strong> profile."
+
+#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341
+#: ../../include/items.php:1411 ../../mod/dfrn_request.php:538
+msgid "[Name Withheld]"
+msgstr "[Name Zurückgehalten]"
+
+#: ../../mod/dfrn_request.php:543 ../../mod/dfrn_request.php:545
+msgid "Introduction received at "
+msgstr "Vorstellung erhalten auf"
+
+#: ../../mod/dfrn_request.php:615 ../../mod/dfrn_request.php:617
+msgid "Friend/Connection Request"
+msgstr "Freundschafts/Kontakt Anfrage"
+
+#: ../../mod/dfrn_request.php:616 ../../mod/dfrn_request.php:618
+msgid "Please answer the following:"
+msgstr "Bitte beantworte folgende Fragen:"
+
+#: ../../mod/dfrn_request.php:617 ../../mod/dfrn_request.php:619
+msgid "Does $name know you?"
+msgstr "Kennt $name dich?"
+
+#: ../../mod/dfrn_request.php:620 ../../mod/dfrn_request.php:622
+msgid "Add a personal note:"
+msgstr "Eine persönliche Notiz anfügen:"
+
+#: ../../mod/dfrn_request.php:621 ../../mod/dfrn_request.php:623
+msgid ""
+"Please enter your profile address from one of the following supported social "
+"networks:"
+msgstr ""
+"Bitte gib deine Profil Adresse von einem der unterstützten Sozialen "
+"Netzwerken an:"
+
+#: ../../mod/dfrn_request.php:622 ../../mod/dfrn_request.php:624
+msgid "Friendika"
+msgstr "Friendika"
+
+#: ../../mod/dfrn_request.php:623 ../../mod/dfrn_request.php:625
+msgid "StatusNet/Federated Social Web"
+msgstr "StatusNet/Federated Social Web"
+
+#: ../../mod/dfrn_request.php:624 ../../mod/dfrn_request.php:626
+msgid "Private (secure) network"
+msgstr "Privates (sicheres) Netzwerk"
+
+#: ../../mod/dfrn_request.php:625 ../../mod/dfrn_request.php:627
+msgid "Public (insecure) network"
+msgstr "Öffentliches (unsicheres) Netzwerk"
+
+#: ../../mod/dfrn_request.php:626 ../../mod/dfrn_request.php:628
+msgid "Your profile address:"
+msgstr "Deine Profiladresse:"
+
+#: ../../mod/dfrn_request.php:627 ../../mod/dfrn_request.php:629
+msgid "Submit Request"
+msgstr "Anfrage abschicken"
+
+#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../addon/js_upload/js_upload.php:41 ../../mod/dfrn_request.php:630
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: ../../mod/like.php:110
+msgid "status"
+msgstr "Status"
+
+#: ../../mod/like.php:127
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s"
+
+#: ../../mod/like.php:129
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr "%1$s mag %2$s's %3$s nicht"
+
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"
+
+#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+msgid "Remove My Account"
+msgstr "Account löschen"
+
+#: ../../mod/removeme.php:43
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
+msgstr ""
+"Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit ihn "
+"wiederherzustellen."
+
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
+msgstr "Bitte gib dein Passwort zur Verifikation ein:"
+
+#: ../../mod/apps.php:6
+msgid "Applications"
+msgstr "Anwendungen"
+
+#: ../../mod/directory.php:32
+msgid "Global Directory"
+msgstr "Weltweites Verzeichnis"
+
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
+msgstr "Konnte das original Posting nicht finden."
+
+#: ../../mod/item.php:98 ../../mod/item.php:126
+msgid "Empty post discarded."
+msgstr "Leere Nachricht wurde verworfen."
+
+#: ../../mod/item.php:422 ../../mod/item.php:474
+#, php-format
+msgid "%s commented on your item at %s"
+msgstr "%s hat einen deiner Beiträge auf %s kommentiert"
+
+#: ../../mod/item.php:445 ../../mod/item.php:497
+#, php-format
+msgid "%s posted on your profile wall at %s"
+msgstr "%s hat etwas auf deiner Pinnwand bei %s gepostet"
+
+#: ../../mod/item.php:471 ../../mod/item.php:523
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Nachricht konnte nicht gespeichert werden."
+
+#: ../../mod/item.php:489 ../../mod/item.php:541
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendika social network."
+msgstr ""
+"Diese Nachricht wurde dir von %s gesendet, einem Mitglied des Sozialen "
+"Netzwerks Friendika"
+
+#: ../../mod/item.php:491 ../../mod/item.php:543
+msgid "You may visit them online at"
+msgstr "Du kannst sie online besuchen unter "
+
+#: ../../mod/item.php:493 ../../mod/item.php:545
+msgid ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+msgstr ""
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
+
+#: ../../mod/item.php:495 ../../mod/item.php:547
+#, php-format
+msgid "%s posted an update."
+msgstr "%s hat ein Update gepostet."
+
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr "Tag entfernt"
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr "Gegenstands Tag entfernen"
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr "Wähle ein Tag zum Entfernen aus: "
+
+#: ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../../mod/message.php:18
+msgid "No recipient selected."
+msgstr "Kein Empfänger gewählt."
+
+#: ../../mod/message.php:23
+msgid "[no subject]"
+msgstr "[kein Betreff]"
+
+#: ../../mod/message.php:34
+msgid "Unable to locate contact information."
+msgstr "Konnte die Kontaktinformationen nicht finden."
+
+#: ../../mod/message.php:102
+msgid "Message sent."
+msgstr "Nachricht gesendet."
+
+#: ../../mod/message.php:105
+msgid "Message could not be sent."
+msgstr "Nachricht konnte nicht gesendet werden."
+
+#: ../../mod/message.php:125 ../../include/nav.php:100 ../../include/nav.php:101
+msgid "Messages"
+msgstr "Nachrichten"
+
+#: ../../mod/message.php:126
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../../mod/message.php:127
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: ../../mod/message.php:128
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../mod/message.php:142
+msgid "Message deleted."
+msgstr "Nachricht gelöscht."
+
+#: ../../mod/message.php:158
+msgid "Conversation removed."
+msgstr "Unterhaltung gelöscht."
+
+#: ../../mod/message.php:177 ../../mod/message.php:180
+msgid "Send Private Message"
+msgstr "Private Nachricht senden"
+
+#: ../../mod/message.php:178 ../../mod/message.php:312
+#: ../../mod/message.php:181 ../../mod/message.php:315
+msgid "To:"
+msgstr "An:"
+
+#: ../../mod/message.php:179 ../../mod/message.php:313
+#: ../../mod/message.php:182 ../../mod/message.php:316
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: ../../mod/message.php:221 ../../mod/message.php:224
+msgid "No messages."
+msgstr "Keine Nachrichten."
+
+#: ../../mod/message.php:234 ../../mod/message.php:237
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
+
+#: ../../mod/message.php:264 ../../mod/message.php:267
+msgid "Message not available."
+msgstr "Nachricht nicht verfügbar."
+
+#: ../../mod/message.php:301 ../../mod/message.php:304
+msgid "Delete message"
+msgstr "Nachricht löschen"
+
+#: ../../mod/message.php:311 ../../mod/message.php:314
+msgid "Send Reply"
+msgstr "Antwort senden"
+
+#: ../../mod/dfrn_confirm.php:231
+msgid "Response from remote site was not understood."
+msgstr "Antwort der entfernten Gegenstelle unverständlich."
+
+#: ../../mod/dfrn_confirm.php:240
+msgid "Unexpected response from remote site: "
+msgstr "Unerwartete Antwort der Gegenstelle: "
+
+#: ../../mod/dfrn_confirm.php:248
+msgid "Confirmation completed successfully."
+msgstr "Bestätigung erfolgreich abgeschlossen."
+
+#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
+#: ../../mod/dfrn_confirm.php:271
+msgid "Remote site reported: "
+msgstr "Entfernte Seite meldet: "
+
+#: ../../mod/dfrn_confirm.php:262
+msgid "Temporary failure. Please wait and try again."
+msgstr ""
+"Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch "
+"einmal."
+
+#: ../../mod/dfrn_confirm.php:269
+msgid "Introduction failed or was revoked."
+msgstr "Vorstellung schlug fehl oder wurde zurück gezogen."
+
+#: ../../mod/dfrn_confirm.php:387
+msgid "Unable to set contact photo."
+msgstr "Konnte das Bild des Kontakts nicht speichern."
+
+#: ../../mod/dfrn_confirm.php:426
+msgid "is now friends with"
+msgstr "ist jetzt ein(e) Freund(in) von"
+
+#: ../../mod/dfrn_confirm.php:494
+#, php-format
+msgid "No user record found for '%s' "
+msgstr "Für '%s' wurde kein Nutzer gefunden"
+
+#: ../../mod/dfrn_confirm.php:504
+msgid "Our site encryption key is apparently messed up."
+msgstr "Der Verschlüsslungsschlüssel unserer Seite ist anscheinend im Arsch."
+
+#: ../../mod/dfrn_confirm.php:515
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr ""
+"Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt "
+"werden."
+
+#: ../../mod/dfrn_confirm.php:527
+msgid "Contact record was not found for you on our site."
+msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
+
+#: ../../mod/dfrn_confirm.php:555
+msgid ""
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
+msgstr ""
+"Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte "
+"versuche es noch einmal."
+
+#: ../../mod/dfrn_confirm.php:566
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+"Deine Kontaktreferenzen konnten nicht in unserm System gespeichert werden."
+
+#: ../../mod/dfrn_confirm.php:619
+msgid "Unable to update your contact profile details on our system"
+msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
+
+#: ../../mod/dfrn_confirm.php:648
+#, php-format
+msgid "Connection accepted at %s"
+msgstr "Auf %s wurde die Verbindung akzeptiert"
+
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
+msgstr "Annmeldung fehlgeschlagen."
+
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
+msgstr "Willkommen zurück "
+
+#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
+#: ../../mod/dfrn_poll.php:483
+#, php-format
+msgid "%s welcomes %s"
+msgstr "%s heist %s herzlich willkommen"
+
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
+msgstr "Keine Kontakte."
+
+#: ../../mod/group.php:27
+msgid "Group created."
+msgstr "Gruppe erstellt."
+
+#: ../../mod/group.php:33
+msgid "Could not create group."
+msgstr "Konnte die Gruppe nicht erstellen."
+
+#: ../../mod/group.php:43 ../../mod/group.php:123 ../../mod/group.php:127
+msgid "Group not found."
+msgstr "Gruppe nicht gefunden."
+
+#: ../../mod/group.php:56
+msgid "Group name changed."
+msgstr "Gruppenname geändert."
+
+#: ../../mod/group.php:79
+msgid "Membership list updated."
+msgstr "Mitgliedsliste aktualisiert."
+
+#: ../../mod/group.php:107 ../../mod/group.php:111
+msgid "Group removed."
+msgstr "Gruppe entfernt."
+
+#: ../../mod/group.php:109 ../../mod/group.php:113
+msgid "Unable to remove group."
+msgstr "Konnte die Gruppe nicht entfernen."
+
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
+msgstr "Nach Twitter senden"
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
+msgstr "Twitter Posting Einstellungen"
+
+#: ../../addon/twitter/twitter.php:129
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+"Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den "
+"Administrator der Seite."
+
+#: ../../addon/twitter/twitter.php:148
+msgid ""
+"At this Friendika instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
+msgstr ""
+"Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account "
+"ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen "
+"Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib "
+"die PIN die du auf Twitter erhälst hier ein. Es werden ausschließlich deine "
+"<strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht."
+
+#: ../../addon/twitter/twitter.php:149
+msgid "Log in with Twitter"
+msgstr "bei Twitter anmelden"
+
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
+msgstr "Kopiere die Twitter PIN hier her"
+
+#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197
+msgid "Currently connected to: "
+msgstr "Momentan verbunden mit: "
+
+#: ../../addon/twitter/twitter.php:166
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated Twitter account as well."
+msgstr ""
+"Wenn dies aktiviert ist, werden alle deine <strong>öffentlichen</strong> "
+"Nachricten auch auf dem verbundenen Twitter Account veröffentlicht."
+
+#: ../../addon/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
+msgstr "Veröffentliche öffentliche Nachrichten auf Twitter"
+
+#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204
+msgid "Clear OAuth configuration"
+msgstr "OAuth Konfiguration löschen"
+
+#: ../../addon/statusnet/statusnet.php:78
+msgid "Post to StatusNet"
+msgstr "Nach StatusNet senden"
+
+#: ../../addon/statusnet/statusnet.php:146
+msgid "StatusNet Posting Settings"
+msgstr "StatusNet Posting Einstellungen"
+
+#: ../../addon/statusnet/statusnet.php:152
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendika Account as "
+"an desktop client on your StatusNet account, copy the consumer key pair here "
+"and enter the API base root.<br />Before you register your own OAuth key "
+"pair ask the administrator if there is already a key pair for this Friendika "
+"installation at your favorited StatusNet installation."
+msgstr ""
+"Kein OAuth Consumer Schlüsselpaar für StatusNet gefunden. Registriere deinen "
+"Friendika Account als Desktopapplikation und trage hier den OAuth Consumer "
+"Schlüssel, das Geheimnis und die Basis-URL der StatusNet API ein.<br />Bevor "
+"du eine neue Anwendung registrierst, kannst du auch erstmal den Admin deiner "
+"Friendika Seite fragen, ob es für deine bevorzugte StatusNet Instanz "
+"eventuell bereits ein OAuth Schlüsselpaar gibt."
+
+#: ../../addon/statusnet/statusnet.php:154
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Schlüssel"
+
+#: ../../addon/statusnet/statusnet.php:157
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Geheimnis"
+
+#: ../../addon/statusnet/statusnet.php:160
+msgid "Base API Path (remember the trailing /)"
+msgstr "Basis-URL der StatusNet API (vergiss den abschließenden / nicht)"
+
+#: ../../addon/statusnet/statusnet.php:181
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below "
+"and submit the form. Only your <strong>public</strong> posts will be posted "
+"to StatusNet."
+msgstr ""
+"Um deinen Account mit einem StatusNet Account zu verknüpfen klicke den "
+"Button an um einen Sicherheitscode von StatusNet zu erhalten und kopiere "
+"diesen in die Eingabebox weiter unten. Es werden ausschließlich deine "
+"<strong>öffentlichen</strong> Nachrichten bei StatusNet veröffentllicht."
+
+#: ../../addon/statusnet/statusnet.php:182
+msgid "Log in with StatusNet"
+msgstr "Bei StatusNet anmelden"
+
+#: ../../addon/statusnet/statusnet.php:184
+msgid "Copy the security code from StatusNet here"
+msgstr "Kopiere den Sicherheitscode von StatusNet hier her"
+
+#: ../../addon/statusnet/statusnet.php:198
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated StatusNet account as well."
+msgstr ""
+"Wenn dies aktiviert ist, werden alle deine <strong>öffentlichen</strong> "
+"Nachricten auch auf dem verbundenen StatusNet Account veröffentlicht."
+
+#: ../../addon/statusnet/statusnet.php:200
+msgid "Send public postings to StatusNet"
+msgstr "Veröffentliche öffentliche Nachrichten auf StatusNet"
+
+#: ../../addon/tictac/tictac.php:14
+msgid "Three Dimensional Tic-Tac-Toe"
+msgstr "Dreidimensionales Tic-Tac-Toe"
+
+#: ../../addon/tictac/tictac.php:47
+msgid "3D Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
+
+#: ../../addon/tictac/tictac.php:52
+msgid "New game"
+msgstr "Neues Spiel"
+
+#: ../../addon/tictac/tictac.php:53
+msgid "New game with handicap"
+msgstr "Neues Handicap Spiel"
+
+#: ../../addon/tictac/tictac.php:54
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
+msgstr ""
+"Drei dimensionales Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur "
+"das man es auf mehreren Ebenen gleichzeitig spielt."
+
+#: ../../addon/tictac/tictac.php:55
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
+msgstr ""
+"In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer "
+"Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder "
+"diagonal auf verschiedenen Ebenen."
+
+#: ../../addon/tictac/tictac.php:57
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
+msgstr ""
+"Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt "
+"da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt."
+
+#: ../../addon/tictac/tictac.php:176
+msgid "You go first..."
+msgstr "Du fängst an..."
+
+#: ../../addon/tictac/tictac.php:181
+msgid "I'm going first this time..."
+msgstr "Diesmal fange ich an..."
+
+#: ../../addon/tictac/tictac.php:187
+msgid "You won!"
+msgstr "Du gewinnst!"
+
+#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
+msgid "\"Cat\" game!"
+msgstr "Unentschieden!"
+
+#: ../../addon/tictac/tictac.php:216
+msgid "I won!"
+msgstr "Ich gewinne!"
+
+#: ../../addon/java_upload/java_upload.php:33
+msgid "Select files to upload: "
+msgstr "Wähle Dateien zum Upload aus: "
+
+#: ../../addon/java_upload/java_upload.php:35
+msgid ""
+"Use the following controls only if the Java uploader [above] fails to launch."
+msgstr ""
+"Verwende die folgenden Kontrollen nur, wenn der Java Uploader [oben] nicht "
+"funktioniert."
+
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
+msgstr "Facebook deaktiviert"
+
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
+msgstr "Facebook API Schlüssel nicht gefunden"
+
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
+msgstr "Mit Facebook verbinden"
+
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
+msgstr "Facebook Versnd installieren"
+
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
+msgstr "Facebook versand deinstallieren"
+
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
+msgstr "Sende standardmäßig nach Facebook"
+
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
+msgstr "Facebook Verbindungseinstellungen"
+
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
+msgstr "Zu Facebook posten"
+
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
+msgstr "Bild"
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
+msgstr "Randplace Einstellungen"
+
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
+msgstr "Randplace Erweiterung aktivieren"
+
+#: ../../addon/js_upload/js_upload.php:39
+msgid "Upload a file"
+msgstr "Datei hochladen"
+
+#: ../../addon/js_upload/js_upload.php:40
+msgid "Drop files here to upload"
+msgstr "Ziehe die Dateien hier her die du hochladen willst"
+
+#: ../../addon/js_upload/js_upload.php:42
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: ../../addon/js_upload/js_upload.php:288
+msgid "No files were uploaded."
+msgstr "Keine Dateien hochgeladen."
+
+#: ../../addon/js_upload/js_upload.php:294
+msgid "Uploaded file is empty"
+msgstr "Hochgeladene Datei ist leer"
+
+#: ../../addon/js_upload/js_upload.php:299
+msgid "Uploaded file is too large"
+msgstr "Hochgeladene Datei ist zu groß"
+
+#: ../../addon/js_upload/js_upload.php:317
+msgid "File has an invalid extension, it should be one of "
+msgstr ""
+"Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein "
+
+#: ../../addon/js_upload/js_upload.php:328
+msgid "Upload was cancelled, or server error encountered"
+msgstr "Upload abgebrochen oder Serverfehler aufgetreten"
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr "Unbekannt | Nicht kategorisiert"
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr "Sofort blockieren"
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr "Zwielichtig, Spammer, Selbstdarsteller"
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr "Ist mir bekannt, hab aber keine Meinung"
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr "OK, wahrscheinlich harmlos"
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr "Seriös, hat mein Vertrauen"
+
+#: ../../include/contact_selectors.php:55
+msgid "Frequently"
+msgstr "Häufig"
+
+#: ../../include/contact_selectors.php:56
+msgid "Hourly"
+msgstr "Stündlich"
+
+#: ../../include/contact_selectors.php:57
+msgid "Twice daily"
+msgstr "Zweimal Täglich"
+
+#: ../../include/contact_selectors.php:58
+msgid "Daily"
+msgstr "Täglich"
+
+#: ../../include/contact_selectors.php:59
+msgid "Weekly"
+msgstr "Wöchendlich"
+
+#: ../../include/contact_selectors.php:60
+msgid "Monthly"
+msgstr "Monatlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Male"
+msgstr "Männlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Female"
+msgstr "Weiblich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
+msgstr "Momentan Männlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
+msgstr "Momentan Weiblich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
+msgstr "Hauptsächlich Männlich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
+msgstr "Hauptsächlich Weiblich"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
+msgstr "Transgender"
+
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
+msgstr "Intersex"
+
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
+msgstr "Transsexuel"
+
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
+msgstr "Hermaphrodit"
+
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
+msgstr "Neuter"
+
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
+msgstr "Nicht spezifiziert"
+
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr "Andere"
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr "Unentschieden"
+
+#: ../../include/profile_selectors.php:19
+msgid "Males"
+msgstr "Männer"
+
+#: ../../include/profile_selectors.php:19
+msgid "Females"
+msgstr "Frauen"
+
+#: ../../include/profile_selectors.php:19
+msgid "Gay"
+msgstr "Schwul"
+
+#: ../../include/profile_selectors.php:19
+msgid "Lesbian"
+msgstr "Lesbisch"
+
+#: ../../include/profile_selectors.php:19
+msgid "No Preference"
+msgstr "Keine Vorlieben"
+
+#: ../../include/profile_selectors.php:19
+msgid "Bisexual"
+msgstr "Bisexuel"
+
+#: ../../include/profile_selectors.php:19
+msgid "Autosexual"
+msgstr "Autosexual"
+
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr "Abstinent"
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr "Jungfrau"
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr "Deviant"
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr "Fetish"
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr "Oodles"
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr "Nonsexual"
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr "Single"
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr "Einsam"
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr "Verfügbar"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr "Nicht verfügbar"
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr "Dating"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr "Untreu"
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr "Sex Besessen"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr "Freunde"
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr "Friends/Benefits"
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr "Casual"
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr "Verlobt"
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr "Verheiratet"
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr "Partner"
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr "kohabitierend"
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr "Glücklich"
+
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr "Nicht auf der Suche"
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr "Swinger"
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr "Betrogen"
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr "Getrennt"
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr "Unstabil"
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr "Geschieden"
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr "Verwidwet"
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr "Unsicher"
+
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
+msgstr "Kompliziert"
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr "Ist mir nicht wichtig"
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr "Frag mich"
+
+#: ../../include/acl_selectors.php:132
+msgid "Visible To:"
+msgstr "Sichtbar für:"
+
+#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
+msgid "Groups"
+msgstr "Gruppen"
+
+#: ../../include/acl_selectors.php:147
+msgid "Except For:"
+msgstr "Abgesehen von:"
+
+#: ../../include/auth.php:27
+msgid "Logged out."
+msgstr "Abgemeldet."
+
+#: ../../include/datetime.php:44 ../../include/datetime.php:46
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#: ../../include/datetime.php:148
+msgid "less than a second ago"
+msgstr "vor weniger als einer Sekunde"
+
+#: ../../include/datetime.php:151
+msgid "year"
+msgstr "Jahr"
+
+#: ../../include/datetime.php:151
+msgid "years"
+msgstr "Jahre"
+
+#: ../../include/datetime.php:152
+msgid "month"
+msgstr "Monat"
+
+#: ../../include/datetime.php:152
+msgid "months"
+msgstr "Monate"
+
+#: ../../include/datetime.php:153
+msgid "week"
+msgstr "Woche"
+
+#: ../../include/datetime.php:153
+msgid "weeks"
+msgstr "Wochen"
+
+#: ../../include/datetime.php:154
+msgid "day"
+msgstr "Tag"
+
+#: ../../include/datetime.php:154 ../../mod/settings.php:370
+msgid "days"
+msgstr "Tage"
+
+#: ../../include/datetime.php:155
+msgid "hour"
+msgstr "Stunde"
+
+#: ../../include/datetime.php:155
+msgid "hours"
+msgstr "Stunden"
+
+#: ../../include/datetime.php:156
+msgid "minute"
+msgstr "Minute"
+
+#: ../../include/datetime.php:156
+msgid "minutes"
+msgstr "Minuten"
+
+#: ../../include/datetime.php:157
+msgid "second"
+msgstr "Sekunde"
+
+#: ../../include/datetime.php:157
+msgid "seconds"
+msgstr "Sekunden"
+
+#: ../../include/datetime.php:164
+msgid " ago"
+msgstr " her"
+
+#: ../../include/nav.php:56 ../../include/nav.php:91 ../../include/nav.php:57
+#: ../../include/nav.php:92
+msgid "Home"
+msgstr "Persönlich"
+
+#: ../../include/nav.php:64 ../../include/nav.php:65
+msgid "Apps"
+msgstr "Apps"
+
+#: ../../include/nav.php:77 ../../include/nav.php:78
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ../../include/nav.php:87 ../../include/nav.php:88
+msgid "Network"
+msgstr "Netzwerk"
+
+#: ../../include/nav.php:96 ../../include/nav.php:97
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:104 ../../include/nav.php:105
+msgid "Manage"
+msgstr "Verwalten"
+
+#: ../../include/nav.php:107 ../../include/nav.php:108
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: ../../include/nav.php:109 ../../include/nav.php:110
+#: ../../mod/profiles.php:456
+msgid "Profiles"
+msgstr "Profile"
+
+#: ../../include/items.php:1004 ../../include/items.php:1073
+#: ../../include/profile_advanced.php:36
+msgid "Birthday:"
+msgstr "Geburtstag:"
+
+#: ../../include/items.php:1348 ../../include/items.php:1418
+msgid "You have a new follower at "
+msgstr "Du hast einen neuen Kontakt auf "
+
+#: ../../include/group.php:130 ../../include/group.php:145
+msgid "Create a new group"
+msgstr "Neue Gruppe erstellen"
+
+#: ../../include/group.php:131 ../../include/group.php:146
+msgid "Everybody"
+msgstr "Alle Kontakte"
+
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
+msgstr "Einbettungen deaktiviert"
+
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr ""
+"Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln."
+
+#: ../../mod/profile.php:102
+msgid "Status"
+msgstr "Status"
+
+#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../mod/profile.php:104
+msgid "Photos"
+msgstr "Bilder"
+
+#: ../../mod/profile.php:137 ../../mod/network.php:77 ../../mod/message.php:172
+#: ../../mod/profile.php:130
+msgid "Please enter a link URL:"
+msgstr "Bitte gib die URL des Links ein:"
+
+#: ../../mod/profile.php:138 ../../mod/network.php:78 ../../mod/profile.php:131
+msgid "Please enter a YouTube link:"
+msgstr "Bitte gebe den YouTube Link ein:"
+
+#: ../../mod/profile.php:139 ../../mod/network.php:79 ../../mod/profile.php:132
+msgid "Please enter a video(.ogg) link/URL:"
+msgstr "Bitte gebe den Link zum Video(.ogg) an:"
+
+#: ../../mod/profile.php:140 ../../mod/network.php:80 ../../mod/profile.php:133
+msgid "Please enter an audio(.ogg) link/URL:"
+msgstr "Bitte gebe den Link zum Audio(.ogg) an:"
+
+#: ../../mod/profile.php:141 ../../mod/network.php:81 ../../mod/profile.php:134
+msgid "Where are you right now?"
+msgstr "Wo hälst du dich jetzt gerade auf?"
+
+#: ../../mod/profile.php:142 ../../mod/network.php:82 ../../mod/profile.php:135
+msgid "Enter a title for this item"
+msgstr "Gib den Titel für diesen Beitrag ein"
+
+#: ../../mod/profile.php:169 ../../mod/network.php:109
+#: ../../mod/editpost.php:66 ../../mod/profile.php:162
+msgid "Insert Vorbis [.ogg] video"
+msgstr "Vorbis [.ogg] Video einfügen"
+
+#: ../../mod/profile.php:170 ../../mod/network.php:110
+#: ../../mod/editpost.php:67 ../../mod/profile.php:163
+msgid "Insert Vorbis [.ogg] audio"
+msgstr "Vorbis [.ogg] Audio einfügen"
+
+#: ../../mod/profile.php:173 ../../mod/network.php:113 ../../mod/profile.php:166
+msgid "Set title"
+msgstr "Titel setzen"
+
+#: ../../mod/profile.php:359 ../../mod/network.php:428 ../../mod/profile.php:352
+#, php-format
+msgid "See all %d comments"
+msgstr "Alle %d Kommentare anzeigen"
+
+#: ../../mod/profile.php:416 ../../mod/display.php:222
+#: ../../mod/network.php:511 ../../mod/editpost.php:62
+#: ../../mod/profile.php:411 ../../mod/display.php:224 ../../mod/network.php:513
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: ../../mod/friendika.php:12
+msgid "This is Friendika version"
+msgstr "Dies ist Friendika Version"
+
+#: ../../mod/friendika.php:13
+msgid "running at web location"
+msgstr "die unter folgender Webadresse zu finden ist"
+
+#: ../../mod/friendika.php:15
+msgid ""
+"Shared content within the Friendika network is provided under the <a "
+"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
+"Attribution 3.0 license</a>"
+msgstr ""
+"Geteilte Inhalte innerhalb des Friendika Netzwerks sind unter der <a "
+"href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
+"Attribution 3.0 license</a> verfügbar"
+
+#: ../../mod/friendika.php:17
+msgid ""
+"Please visit <a "
+"href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn "
+"more about the Friendika project."
+msgstr ""
+"Bitte besuche <a "
+"href=\"http://project.friendika.com\">Project.Friendika.com</a> um mehr über "
+"Friendika zu erfahren."
+
+#: ../../mod/friendika.php:19
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+
+#: ../../mod/friendika.php:20
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
+"dot com"
+msgstr ""
+"Vorschläge, Lobeshymnen, Spenden usw. - bitte eine Email an \"Info\" at "
+"Friendika - dot com (englisch bevorzugt)"
+
+#: ../../mod/friendika.php:25
+msgid "Installed plugins/addons/apps"
+msgstr "Installierte Plugins/Erweiterungen/Apps"
+
+#: ../../mod/friendika.php:33
+msgid "No installed plugins/addons/apps"
+msgstr "Keine Plugins/Erweiterungen/Apps installiert"
+
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
+msgstr "Mit der Installation fortfahren"
+
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
+msgstr "Die Datenbank deiner Friendika Seite wurde erfolgreich installiert."
+
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
+msgstr "Mit der Registration fortfahren"
+
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine Email."
+
+#: ../../mod/lostpass.php:56
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+"Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche "
+"Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
+
+#: ../../mod/lostpass.php:100 ../../mod/lostpass.php:107
+msgid "Forgot your Password?"
+msgstr "Hast du dein Passwort vergessen?"
+
+#: ../../mod/lostpass.php:101 ../../mod/lostpass.php:108
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+"Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir "
+"dann weitere Informationen per Mail zugesand."
+
+#: ../../mod/lostpass.php:102 ../../mod/lostpass.php:109
+msgid "Nickname or Email: "
+msgstr "Spitzname oder Email:"
+
+#: ../../mod/lostpass.php:103 ../../mod/lostpass.php:110
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
+msgstr "Anstehende Freundschafts/Kontakt Benachrichtigungen"
+
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
+msgstr "Neuanmeldungen die auf deine Bestätigung warten"
+
+#: ../../mod/register.php:89
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein."
+
+#: ../../mod/photos.php:969
+msgid "<< Prev"
+msgstr "<< Vorherige"
+
+#: ../../mod/photos.php:977
+msgid "Next >>"
+msgstr "Nächste >>"
+
+#: ../../mod/directory.php:39
+msgid "Site Directory"
+msgstr "Verzeichnis"
+
+#: ../../mod/directory.php:94
+msgid "Gender: "
+msgstr "Geschlecht:"
+
+#: ../../mod/directory.php:120
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
+
+#: ../../mod/settings.php:262
+msgid "Normal Account"
+msgstr "Normaler Account"
+
+#: ../../mod/settings.php:263
+msgid "This account is a normal personal profile"
+msgstr "Dieser Account ist ein normales persönliches Profil"
+
+#: ../../mod/settings.php:264
+msgid "Soapbox Account"
+msgstr "Sandkasten Accunt"
+
+#: ../../mod/settings.php:265
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert"
+
+#: ../../mod/settings.php:266
+msgid "Community/Celebrity Account"
+msgstr "Gemeinschafts/Berühmtheiten Account"
+
+#: ../../mod/settings.php:267
+msgid "Automatically approve all connection/friend requests as read-write fans"
+msgstr ""
+"Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"
+
+#: ../../mod/settings.php:268
+msgid "Automatic Friend Account"
+msgstr "Automatischer Freundes Account"
+
+#: ../../mod/settings.php:269
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr "Freundschaftsanfragen werden automatisch als Freund akzeptiert"
+
+#: ../../mod/settings.php:353 ../../mod/settings.php:351
+msgid "Export Personal Data"
+msgstr "Perönliche Daten exportieren"
+
+#: ../../mod/search.php:62
+msgid "No results."
+msgstr "Keine Ergebnisse."
+
+#: ../../mod/profile_photo.php:200 ../../mod/profile_photo.php:204
+msgid "Crop Image"
+msgstr "Bild Zurechtschneiden"
+
+#: ../../mod/profile_photo.php:201 ../../mod/profile_photo.php:205
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+"Passe bitte den Bildausschnitt an damit das Bild optimal dargestellt werden "
+"kann."
+
+#: ../../mod/profile_photo.php:202 ../../mod/profile_photo.php:206
+msgid "Done Editing"
+msgstr "Bearbeitung abgeschlossen"
+
+#: ../../mod/match.php:10
+msgid "Profile Match"
+msgstr "Profil Übereinstimmungen"
+
+#: ../../mod/match.php:50
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
+
+#: ../../mod/group.php:95
+msgid "Create a group of contacts/friends."
+msgstr "Eine Gruppe von Kontakten/Freunden anlegen."
+
+#: ../../mod/group.php:96 ../../mod/group.php:153
+msgid "Group Name: "
+msgstr "Gruppen Name:"
+
+#: ../../mod/group.php:152
+msgid "Group Editor"
+msgstr "Gruppen Editor"
+
+#: ../../mod/group.php:154
+msgid "Members:"
+msgstr "Mitglieder:"
+
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
+msgstr "Finde Personen die deine Interessen teilen"
+
+#: ../../mod/contacts.php:252
+msgid "Privacy Unavailable"
+msgstr "Privatsphäre nicht verfügbar"
+
+#: ../../mod/contacts.php:253
+msgid "Private communications are not available for this contact."
+msgstr "Private Kommunikation ist für diesen Kontakt nicht verfügbar."
+
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
+msgstr "Erfolgreich gesendet."
+
+#: ../../mod/network.php:59
+#, php-format
+msgid "%d member"
+msgid_plural "%d members"
+msgstr[0] "%d Mitglied"
+msgstr[1] "%d Mitglieder"
+
+#: ../../mod/network.php:60
+#, php-format
+msgid "Warning: This group contains %s from an insecure network."
+msgstr "Warnung: Diese Gruppe beinhaltet %s aus einem unsicheren Netzwerk."
+
+#: ../../mod/network.php:61
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr ""
+"Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten."
+
+#: ../../mod/network.php:409
+msgid "See more posts like this"
+msgstr "Mehr Beiträge wie diesen anzeigen"
+
+#: ../../mod/message.php:240
+msgid "D, d M Y - g:i A"
+msgstr "g A l F d"
+
+#: ../../mod/dfrn_request.php:503
+#, php-format
+msgid "Welcome home %s."
+msgstr "Willkommen zurück %s."
+
+#: ../../mod/dfrn_request.php:504
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Bitte bestätige deine Vorstellung/Verbindungs Anfrage bei %s."
+
+#: ../../mod/dfrn_request.php:505
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
+msgstr "Beitrag nicht gefunden"
+
+#: ../../mod/editpost.php:32
+msgid "Edit post"
+msgstr "Beitrag bearbeiten"
+
+#: ../../boot.php:359
+msgid "Delete this item?"
+msgstr "Diesen Beitrag löschen?"
+
+#: ../../boot.php:360 ../../mod/profile.php:387 ../../mod/photos.php:1108
+#: ../../mod/display.php:173 ../../mod/network.php:505
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../../boot.php:2033
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Kontakt"
+msgstr[1] "%d Kontakte"
+
+#: ../../boot.php:2416
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../boot.php:2433
+msgid "Birthday Reminders"
+msgstr "Geburtstagserinnerungen"
+
+#: ../../boot.php:2729
+msgid "View status"
+msgstr "Status anzeigen"
+
+#: ../../boot.php:2730
+msgid "View profile"
+msgstr "Profil anzeigen"
+
+#: ../../boot.php:2731
+msgid "View photos"
+msgstr "Fotos ansehen"
+
+#: ../../boot.php:2733
+msgid "Send PM"
+msgstr "Private Nachricht senden"
+
+#: ../../include/profile_advanced.php:10 ../../mod/settings.php:358
+msgid "Full Name:"
+msgstr "Kompletter Name:"
+
+#: ../../include/profile_advanced.php:45
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/profile_advanced.php:46
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/profile_advanced.php:59
+msgid "Age:"
+msgstr "Alter:"
+
+#: ../../include/profile_advanced.php:70
+msgid "<span class=\"heart\">&hearts;</span> Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Bezieungsstatus:"
+
+#: ../../include/profile_advanced.php:90 ../../mod/profiles.php:388
+msgid "Sexual Preference:"
+msgstr "Sexuelle Vorlieben:"
+
+#: ../../include/profile_advanced.php:115
+msgid "Policial Views:"
+msgstr "Politische Ansichten:"
+
+#: ../../include/profile_advanced.php:127
+msgid "Religion:"
+msgstr "Religion:"
+
+#: ../../include/profile_advanced.php:138
+msgid "About:"
+msgstr "Über:"
+
+#: ../../include/profile_advanced.php:150
+msgid "Hobbies/Interests:"
+msgstr "Hobbies/Interessen:"
+
+#: ../../include/profile_advanced.php:162
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformationen und Soziale Netzwerke:"
+
+#: ../../include/profile_advanced.php:174
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
+
+#: ../../include/profile_advanced.php:186
+msgid "Books, literature:"
+msgstr "Literatur/Bücher:"
+
+#: ../../include/profile_advanced.php:198
+msgid "Television:"
+msgstr "Fernsehen:"
+
+#: ../../include/profile_advanced.php:210
+msgid "Film/dance/culture/entertainment:"
+msgstr "Filme/Tänze/Kultur/Unterhaltung:"
+
+#: ../../include/profile_advanced.php:222
+msgid "Love/Romance:"
+msgstr "Liebesleben:"
+
+#: ../../include/profile_advanced.php:234
+msgid "Work/employment:"
+msgstr "Arbeit/Beschäftigung:"
+
+#: ../../include/profile_advanced.php:246
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
+
+#: ../../mod/profiles.php:354
+msgid "Hide my contact/friend list from viewers of this profile?"
+msgstr "Verberge meine Kontakte/Freunde von Betrachtern dieses Profils?"
+
+#: ../../mod/profiles.php:369
+msgid "Edit Profile Details"
+msgstr "Profil bearbeiten"
+
+#: ../../mod/profiles.php:371
+msgid "View this profile"
+msgstr "Dieses Profil anzeigen"
+
+#: ../../mod/profiles.php:372
+msgid "Create a new profile using these settings"
+msgstr "Neues Profil anlegen und diese Einstellungen verwenden"
+
+#: ../../mod/profiles.php:373
+msgid "Clone this profile"
+msgstr "Dieses Profil dublizieren"
+
+#: ../../mod/profiles.php:374
+msgid "Delete this profile"
+msgstr "Dieses Profil löschen"
+
+#: ../../mod/profiles.php:375
+msgid "Profile Name:"
+msgstr "Profilname:"
+
+#: ../../mod/profiles.php:376
+msgid "Your Full Name:"
+msgstr "Dein kompletter Name:"
+
+#: ../../mod/profiles.php:377
+msgid "Title/Description:"
+msgstr "Titel/Beschreibung:"
+
+#: ../../mod/profiles.php:378
+msgid "Your Gender:"
+msgstr "Dein Geschlecht:"
+
+#: ../../mod/profiles.php:379
+msgid "Birthday (y/m/d):"
+msgstr "Geburtstag (y/m/d):"
+
+#: ../../mod/profiles.php:380
+msgid "Street Address:"
+msgstr "Adresse:"
+
+#: ../../mod/profiles.php:381
+msgid "Locality/City:"
+msgstr "Wohnort/Stadt:"
+
+#: ../../mod/profiles.php:382
+msgid "Postal/Zip Code:"
+msgstr "Postleitzahl:"
+
+#: ../../mod/profiles.php:383
+msgid "Country:"
+msgstr "Land:"
+
+#: ../../mod/profiles.php:384
+msgid "Region/State:"
+msgstr "Region/Bundesstaat:"
+
+#: ../../mod/profiles.php:385
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Beziehungs Status:"
+
+#: ../../mod/profiles.php:386
+msgid "Who: (if applicable)"
+msgstr "Wer: (falls anwendbar)"
+
+#: ../../mod/profiles.php:387
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Beispiel: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:389
+msgid "Homepage URL:"
+msgstr "Adresse der Homepage:"
+
+#: ../../mod/profiles.php:390
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
+
+#: ../../mod/profiles.php:391
+msgid "Religious Views:"
+msgstr "Religiöse Ansichten:"
+
+#: ../../mod/profiles.php:392
+msgid "Public Keywords:"
+msgstr "Öffentliche Schlüsselwörter:"
+
+#: ../../mod/profiles.php:393
+msgid "Private Keywords:"
+msgstr "Private Schlüsselwörter:"
+
+#: ../../mod/profiles.php:394
+msgid "Example: fishing photography software"
+msgstr "Beispiel: Fischen Photographie Software"
+
+#: ../../mod/profiles.php:395
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr ""
+"(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden "
+"eingesehen werden)"
+
+#: ../../mod/profiles.php:396
+msgid "(Used for searching profiles, never shown to others)"
+msgstr ""
+"(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"
+
+#: ../../mod/profiles.php:397
+msgid "Tell us about yourself..."
+msgstr "Erzähle und ein bisschen von dir..."
+
+#: ../../mod/profiles.php:398
+msgid "Hobbies/Interests"
+msgstr "Hobbies/Interessen"
+
+#: ../../mod/profiles.php:399
+msgid "Contact information and Social Networks"
+msgstr "Kontaktinformationen und Soziale Netzwerke"
+
+#: ../../mod/profiles.php:400
+msgid "Musical interests"
+msgstr "Musikalische Interessen"
+
+#: ../../mod/profiles.php:401
+msgid "Books, literature"
+msgstr "Literatur/Bücher"
+
+#: ../../mod/profiles.php:402
+msgid "Television"
+msgstr "Fernsehen"
+
+#: ../../mod/profiles.php:403
+msgid "Film/dance/culture/entertainment"
+msgstr "Filme/Tänze/Kultur/Unterhaltung"
+
+#: ../../mod/profiles.php:404
+msgid "Love/romance"
+msgstr "Liebesleben"
+
+#: ../../mod/profiles.php:405
+msgid "Work/employment"
+msgstr "Arbeit/Beschäftigung"
+
+#: ../../mod/profiles.php:406
+msgid "School/education"
+msgstr "Schule/Ausbildung"
+
+#: ../../mod/profiles.php:457
+msgid "Change profile photo"
+msgstr "Profilbild ändern"
+
+#: ../../mod/profiles.php:458
+msgid "Create New Profile"
+msgstr "Neues Profil anlegen"
+
+#: ../../mod/install.php:121
+msgid "Friendika Social Network"
+msgstr "Friendika Soziales Netzwerk"
+
+#: ../../mod/install.php:122
+msgid "Installation"
+msgstr "Installation"
+
+#: ../../mod/install.php:123
+msgid ""
+"In order to install Friendika we need to know how to contact your database."
+msgstr ""
+"Um Friendika installieren zu können müssen wir wissen, wie wir die Datenbank "
+"erreichen können."
+
+#: ../../mod/install.php:124
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+"Bitte kontaktiere den Hosting Provider oder den Administrator der Seite "
+"falls du Fragen zu diesen Einstellungen haben solltest."
+
+#: ../../mod/install.php:125
+msgid ""
+"The database you specify below must already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+"Die Datenbank die du hier angibst muss bereits existieren. Wenn dies noch "
+"nicht der Fall ist lege sie bitte an bevor du fortfährst."
+
+#: ../../mod/install.php:126
+msgid "Database Server Name"
+msgstr "Datenbank Server"
+
+#: ../../mod/install.php:127
+msgid "Database Login Name"
+msgstr "Datenbank Nutzer"
+
+#: ../../mod/install.php:128
+msgid "Database Login Password"
+msgstr "Datenbank Passwort"
+
+#: ../../mod/install.php:129
+msgid "Database Name"
+msgstr "Datenbank Name"
+
+#: ../../mod/install.php:130
+msgid "Please select a default timezone for your website"
+msgstr "Bitte wähle die standard Zeitzone deiner Webseite"
+
+#: ../../mod/lostpass.php:75
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie gewünscht zurück gesetzt."
+
+#: ../../mod/lostpass.php:76
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
+
+#: ../../mod/lostpass.php:77
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere dein neues Passwort - und dann"
+
+#: ../../mod/lostpass.php:78
+msgid "click here to login"
+msgstr "hier klicken um dich anzumelden"
+
+#: ../../mod/lostpass.php:79
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+"Du kannst das Passwort unter den <em>Einstellungen</em> ändern sobald du "
+"dich erfolgreich angemeldet hast."
+
+#: ../../mod/notifications.php:154
+msgid "Deny"
+msgstr "Verwehren"
+
+#: ../../mod/settings.php:288
+msgid "Publish your default profile in site directory?"
+msgstr "Dein Standard-Profil im Verzeichnis dieser Seite veröffentliche?"
+
+#: ../../mod/settings.php:300
+msgid "Publish your default profile in global social directory?"
+msgstr "Dein Standard-Profil im weltweiten Verzeichnis veröffentlichen?"
+
+#: ../../mod/settings.php:336 ../../mod/profile_photo.php:191
+msgid "or"
+msgstr " oder "
+
+#: ../../mod/settings.php:341
+msgid "Your profile address is"
+msgstr "Deine Profiladresse lautet"
+
+#: ../../mod/settings.php:357
+msgid "Basic Settings"
+msgstr "Grundeinstellungen"
+
+#: ../../mod/settings.php:359
+msgid "Email Address:"
+msgstr "Email Adresse:"
+
+#: ../../mod/settings.php:360
+msgid "Your Timezone:"
+msgstr "Deine Zeitzone:"
+
+#: ../../mod/settings.php:361
+msgid "Default Post Location:"
+msgstr "Standardstandort:"
+
+#: ../../mod/settings.php:362
+msgid "Use Browser Location:"
+msgstr "Verwende den Standort des Browsers:"
+
+#: ../../mod/settings.php:363
+msgid "Display Theme:"
+msgstr "Theme:"
+
+#: ../../mod/settings.php:365
+msgid "Security and Privacy Settings"
+msgstr "Sicherheits und Privatsphären Einstellungen"
+
+#: ../../mod/settings.php:366
+msgid "Maximum Friend Requests/Day:"
+msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:"
+
+#: ../../mod/settings.php:367
+msgid "(to prevent spam abuse)"
+msgstr "(um SPAM zu vermeiden)"
+
+#: ../../mod/settings.php:368
+msgid "Allow friends to post to your profile page:"
+msgstr "Erlaube es Freunden Beiträge auf deiner Pinnwand zu posten:"
+
+#: ../../mod/settings.php:369
+msgid "Automatically expire (delete) posts older than"
+msgstr "Automatisch Beiträge verfallen lassen (löschen) die älter sind als"
+
+#: ../../mod/settings.php:371
+msgid "Notification Settings"
+msgstr "Benachrichtigungs Einstellungen"
+
+#: ../../mod/settings.php:372
+msgid "Send a notification email when:"
+msgstr "Benachrichtigungs-Email senden wenn:"
+
+#: ../../mod/settings.php:373
+msgid "You receive an introduction"
+msgstr "Du eine Vorstellung erhälst"
+
+#: ../../mod/settings.php:374
+msgid "Your introductions are confirmed"
+msgstr "Eine deiner Vorstellungen angenommen wurde"
+
+#: ../../mod/settings.php:375
+msgid "Someone writes on your profile wall"
+msgstr "Jemand etwas auf deiner Pinnwand postet"
+
+#: ../../mod/settings.php:376
+msgid "Someone writes a followup comment"
+msgstr "Jemand einen Kommentar verfasst"
+
+#: ../../mod/settings.php:377
+msgid "You receive a private message"
+msgstr "Du eine private Nachricht erhälst"
+
+#: ../../mod/settings.php:378
+msgid "Password Settings"
+msgstr "Passwort Einstellungen"
+
+#: ../../mod/settings.php:379
+msgid "Leave password fields blank unless changing"
+msgstr "Lass die Passwort-Felder leer außer du willst das Passwort ändern"
+
+#: ../../mod/settings.php:380
+msgid "New Password:"
+msgstr "Neues Passwort:"
+
+#: ../../mod/settings.php:381
+msgid "Confirm:"
+msgstr "Bestätigen:"
+
+#: ../../mod/settings.php:382
+msgid "Advanced Page Settings"
+msgstr "Erweiterte Seiten Einstellungen"
+
+#: ../../mod/profile_photo.php:188
+msgid "Upload File:"
+msgstr "Datei hochladen:"
+
+#: ../../mod/profile_photo.php:189
+msgid "Upload Profile Photo"
+msgstr "Profilbild hochladen"
+
+#: ../../mod/profile_photo.php:190
+msgid "Upload"
+msgstr "Hochladen"
+
+#: ../../mod/profile_photo.php:191
+msgid "select a photo from your photo albums"
+msgstr "wähle ein Foto von deinen Fotoalben"
+
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
+msgstr "Profil Anzeige"
+
+#: ../../mod/contacts.php:266
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+"Bitte wähle eines deiner Profile das angezeitgt werden soll, wenn %s dein "
+"Profil aufruft."
+
+#: ../../mod/contacts.php:267
+msgid "Contact Information / Notes"
+msgstr "Kontakt Informationen / Notizen"
+
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
+msgstr "Online Ruf"
+
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
+msgstr ""
+"Es könnte sein, dass deine Freunde etwas über den Ruf einer Peron erfahren "
+"möchten."
+
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> to guide them."
+msgstr ""
+"Du kannst ihnen bei der Entscheidung helfen ob sie mit einer Person "
+"interagieren sollten oder nicht indem du Informationen über den <em>Ruf</em> "
+" der Person anbietest."
+
+#: ../../mod/contacts.php:271
+msgid ""
+"Please take a moment to elaborate on this selection if you feel it could be "
+"helpful to others."
+msgstr ""
+"Bitte nimm dir einen Moment und fülle diesen Punkt aus wenn du denkst das es "
+"anderen helfen könnte."
diff --git a/view/de/profile-hide-friends.tpl b/view/de/profile-hide-friends.tpl
deleted file mode 100644
index 1d6903825..000000000
--- a/view/de/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-Verberge meine Kontaktliste von Leuten die dieses Profil ansehen?
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Ja</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">Nein</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/de/profile-in-directory.tpl b/view/de/profile-in-directory.tpl
deleted file mode 100644
index 9cc62fc69..000000000
--- a/view/de/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Soll dein Standard-Profil im Verzeichnis dieser Seite veröffentlich werden?
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Ja</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">Nein</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/de/profile-in-netdir.tpl b/view/de/profile-in-netdir.tpl
deleted file mode 100644
index 26f45ac90..000000000
--- a/view/de/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Soll dein Standard-Profil im globalen Verzeichnis veröffentlicht werden?
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Ja</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Nein</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/de/profile_advanced.php b/view/de/profile_advanced.php
deleted file mode 100644
index ec6eb6e3a..000000000
--- a/view/de/profile_advanced.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Full Name:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Gender:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Birthday:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">' 
-	. ((intval($a->profile['dob'])) 
-		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
-		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
-	. "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
-	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexual Preference:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
-	$homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Political Views:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">About:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musical interests:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Books, literature:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Television:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Love/romance:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Work/employment:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">School/education:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-EOT;
-}
-
-
diff --git a/view/de/profile_entry_default.tpl b/view/de/profile_entry_default.tpl
deleted file mode 100644
index dff6b53f7..000000000
--- a/view/de/profile_entry_default.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profilbild" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
diff --git a/view/de/profile_listing_header.tpl b/view/de/profile_listing_header.tpl
deleted file mode 100644
index 3be77ba0d..000000000
--- a/view/de/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>Profile</h1>
-<p id="profile-listing-desc" >
-<a href="profile_photo" >Profilbild ändern</a>
-</p>
-<div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Neues Profil anlegen" >Neues Profil anlegen</a>
-</div>
-
diff --git a/view/de/profile_photo.tpl b/view/de/profile_photo.tpl
deleted file mode 100644
index 10d7d7b97..000000000
--- a/view/de/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h1>Profilbild Hochladen</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Datei hochladen: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-oder <a href='photos/$user'>wähle ein Bild aus einem Album</a>
-</div>
diff --git a/view/de/pwdreset.tpl b/view/de/pwdreset.tpl
deleted file mode 100644
index 30aca0748..000000000
--- a/view/de/pwdreset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>Zurücksetzen des Passworts</h3>
-
-<p>
-Dein Passwort wurde wie gewünscht zurück gesetzt.
-</p>
-<p>
-Dein neues Passwort lautet:
-</p>
-<p>
-$newpass
-</p>
-<p>
-Sichere oder kopiere dein neues Passwort und melde dich <a href="$baseurl" >dann hier an</a>.
-</p>
-<p>
-Nachdem du dich angemeldet hast kannst du dein Passwort auf der "Einstellungen" Seite ändern.
\ No newline at end of file
diff --git a/view/de/settings.tpl b/view/de/settings.tpl
deleted file mode 100644
index 1924fc8e1..000000000
--- a/view/de/settings.tpl
+++ /dev/null
@@ -1,177 +0,0 @@
-<h1>Account Einstellungen</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Plugin Einstellungen</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Grundeinstellungen</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Kompletter Name: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >EMail Adresse: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Deine Zeitzone: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Standardwert Sendestandort: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Browser Standort verwenden: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Anzeige Thema: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Sicherheits und Privatsphären Einstellungen</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximale Anzahl an Freundschaftsanfragen pro Tagy</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(um SPAM zu verhindern)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
-<div id="settings-expire-end"></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-
-<h3 class="settings-heading">Benachrichtigungs Einstellungen</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Benachrichtigungsemail senden wenn: </div>
-<label for="notify1" id="settings-label-notify1">Du eine Vorstellung empfängst</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Deine Vorstellung bestätigt wurde</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Jemand etwas auf deiner Profilwand postet</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Jemand einen Folgebeitrag schreibt</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Du eine private Nachricht erhälst</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Passwort Einstellungen</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Lass die Passwortfelder frei außer du willst das Passwort ändern.
-</p>
-<label id="settings-password-label" for="settings-password" >Neues Passwort: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Bestätigen: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Erweiterte Seiteneinstellungen</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
diff --git a/view/de/settings_nick_set.tpl b/view/de/settings_nick_set.tpl
deleted file mode 100644
index 9336951d4..000000000
--- a/view/de/settings_nick_set.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">Deine Profiladresse lautet <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/de/settings_nick_subdir.tpl b/view/de/settings_nick_subdir.tpl
deleted file mode 100644
index fa189a769..000000000
--- a/view/de/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>
-Es scheint so als ob deine Friendika Installation in einem Unterverzeichnis von $hostname
-liegt, es könnte deshalb unzuverlässig arbeiten.
-</p>
-<p>
-Solltest du irgendwelche Probleme haben versuche bitte folgende Profil Adresse
-'<strong>$baseurl/profile/$nickname</strong>' eventuell funktioniert es damit
-besser.
-</p>
diff --git a/view/de/strings.php b/view/de/strings.php
index 2d8fe7006..2fbaa4a44 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -1,1124 +1,763 @@
 <?php
-$a->strings['Not Found'] = 'Nicht gefunden';
-$a->strings['Page not found.'] = 'Seite nicht gefunden.';
-$a->strings['Permission denied'] = 'Zugriff verweigert';
-$a->strings['Permission denied.'] = 'Zugriff verweigert.';
-$a->strings['Nickname or Email address: '] = 'Spitzname oder Email-Adresse: ';
-$a->strings['Password: '] = 'Passwort: ';
-$a->strings['Login'] = 'Anmeldung';
-$a->strings['Nickname/Email/OpenID: '] = 'Spitzname/Email/OpenID: ';
-$a->strings['Password (if not OpenID): '] = 'Passwort (falls nicht OpenID): ';
-$a->strings['Forgot your password?'] = 'Passwort vergessen?';
-$a->strings['Password Reset'] = 'Passwort zurücksetzen';
-$a->strings['prev'] = 'vorige';
-$a->strings['first'] = 'erste';
-$a->strings['last'] = 'letzte';
-$a->strings['next'] = 'nächste';
-$a->strings[' likes this.'] = ' mag dies.';
-$a->strings[' doesn\'t like this.'] = ' mag dies nicht.';
-$a->strings['people'] = 'Leute';
-$a->strings['like this.'] = 'mögen dies.';
-$a->strings['don\'t like this.'] = 'mögen dies nicht.';
-$a->strings['and'] = 'und';
-$a->strings[', and '] = ' und ';
-$a->strings[' other people'] = ' andere Leute';
-$a->strings[' like this.'] = ' mögen dies.';
-$a->strings[' don\'t like this.'] = ' mögen dies nicht.';
-$a->strings['No contacts'] = 'Keine Kontakte';
-$a->strings['Contacts'] = 'Kontakte';
-$a->strings['View Contacts'] = 'Kontakte anzeigen';
-$a->strings['Search'] = 'Suche';
-$a->strings['No profile'] = 'Kein Profil';
-$a->strings['Connect'] = 'Verbinden';
-$a->strings['Location:'] = 'Ort:';
-$a->strings[', '] = ', ';
-$a->strings['Gender:'] = 'Geschlecht:';
-$a->strings['Status:'] = 'Status:';
-$a->strings['Homepage:'] = 'Homepage:';
-$a->strings['Monday'] = 'Montag';
-$a->strings['Tuesday'] = 'Dienstag';
-$a->strings['Wednesday'] = 'Mittwoch';
-$a->strings['Thursday'] = 'Donnerstag';
-$a->strings['Friday'] = 'Freitag';
-$a->strings['Saturday'] = 'Samstag';
-$a->strings['Sunday'] = 'Sonntag';
-$a->strings['January'] = 'Januar';
-$a->strings['February'] = 'Februar';
-$a->strings['March'] = 'März';
-$a->strings['April'] = 'April';
-$a->strings['May'] = 'Mai';
-$a->strings['June'] = 'Juni';
-$a->strings['July'] = 'Juli';
-$a->strings['August'] = 'August';
-$a->strings['September'] = 'September';
-$a->strings['October'] = 'Oktober';
-$a->strings['November'] = 'November';
-$a->strings['December'] = 'Dezember';
-$a->strings['Birthdays this week:'] = 'Geburtstage diese Woche:';
-$a->strings['(Adjusted for local time)'] = '(an die lokale Zeit angepasst)';
-$a->strings['[today]'] = '[heute]';
-$a->strings['Unable to locate original post.'] = 'Konnte das original Posting nicht finden.';
-$a->strings['Empty post discarded.'] = 'Leere Nachricht wurde verworfen';
-$a->strings['Wall Photos'] = 'Wall Photos';
-$a->strings[' commented on your item at '] = ' commented on your item at ';
-$a->strings[' posted on your profile wall at '] = ' posted on your profile wall at ';
-$a->strings['System error. Post not saved.'] = 'Systemfehler. Nachricht konnte nicht gespeichert werden.';
-$a->strings['This message was sent to you by '] = 'Diese Nachricht wurde dir von ';
-$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
-$a->strings['You may visit them online at'] = 'Du kannst sie online besuchen unter ';
-$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
-$a->strings['posted an update.'] = 'posted an update.';
-$a->strings['Item not found.'] = 'Item not found.';
-$a->strings['Invite Friends'] = 'Freunde einladen';
-$a->strings['Connect/Follow [profile address]'] = 'Kontaktiere/Folge [Profil Adresse]';
-$a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Beispiel: bob@example.com, http://example.com/barbara';
-$a->strings['Follow'] = 'Folge';
-$a->strings['Could not access contact record.'] = 'Konnte nicht auf die Kontaktdaten zugreifen.';
-$a->strings['Could not locate selected profile.'] = 'Konnte das ausgewählte Profiel nicht finden.';
-$a->strings['Contact updated.'] = 'Kontakt aktualisiert.';
-$a->strings['Failed to update contact record.'] = 'Aktualisierung der Kontaktdaten fehlgeschlagen.';
-$a->strings['Contact has been '] = 'Kontakt ';
-$a->strings['blocked'] = 'wurde blockiert';
-$a->strings['unblocked'] = 'ist nicht mehr blockiert';
-$a->strings['ignored'] = 'wurde ignoriert';
-$a->strings['unignored'] = 'wird nicht mehr ignoriert';
-$a->strings['stopped following'] = 'wird nicht mehr gefolgt';
-$a->strings['Contact has been removed.'] = 'Kontakt wurde entfernt.';
-$a->strings['Contact not found.'] = 'Kontakt nicht gefunden.';
-$a->strings['Mutual Friendship'] = 'Beidseitige Freundschaft';
-$a->strings['is a fan of yours'] = 'ist ein Fan von dir';
-$a->strings['you are a fan of'] = 'du bist Fan von';
-$a->strings['Never'] = 'Niemals';
-$a->strings['(Update was successful)'] = '(Aktualisierung war erfolgreich)';
-$a->strings['(Update was not successful)'] = '(Aktualisierung war nicht erfolgreich)';
-$a->strings['Contact Editor'] = 'Kontakt Editor';
-$a->strings['Visit $name\'s profile'] = 'Besuche das Profil von $name';
-$a->strings['Block/Unblock contact'] = 'Kontakt blockieren/freischalten';
-$a->strings['Ignore contact'] = 'Ignoriere den Kontakt';
-$a->strings['Delete contact'] = 'Lösche den Kontakt';
-$a->strings['Last updated: '] = 'Letzte Aktualisierung: ';
-$a->strings['Update public posts: '] = 'Aktualisierung öffentlicher Nachrichten: ';
-$a->strings['Update now'] = 'Jetzt aktualisieren';
-$a->strings['Unblock this contact'] = 'Blockade dieses Kontakts aufheben';
-$a->strings['Block this contact'] = 'Diesen Kontakt blockieren';
-$a->strings['Unignore this contact'] = 'Diesen Kontakt nicht mehr ignorieren';
-$a->strings['Ignore this contact'] = 'Diesen Kontakt ignorieren';
-$a->strings['Currently blocked'] = 'Derzeit geblockt';
-$a->strings['Currently ignored'] = 'Derzeit ignoriert';
-$a->strings['Show Blocked Connections'] = 'Zeige geblockte Verbindungen';
-$a->strings['Hide Blocked Connections'] = 'Verstecke geblockte Verbindungen';
-$a->strings['Finding: '] = 'Funde: ';
-$a->strings['Find'] = 'Finde';
-$a->strings['Visit '] = 'Besuche ';
-$a->strings['\'s profile'] = 's Profile';
-$a->strings['Edit contact'] = 'Kontakt bearbeiten';
-$a->strings['Profile not found.'] = 'Profil nicht gefunden.';
-$a->strings['Response from remote site was not understood.'] = 'Antwort der entfernten Gegenstelle unverständlich.';
-$a->strings['Unexpected response from remote site: '] = 'Unerwartete Antwort der Gegenstelle: ';
-$a->strings['Confirmation completed successfully.'] = 'Bestätigung erfolgreich abgeschlossen.';
-$a->strings['Remote site reported: '] = 'Entfernte Seite meldet: ';
-$a->strings['Temporary failure. Please wait and try again.'] = 'Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.';
-$a->strings['Introduction failed or was revoked.'] = 'Vorstellung schlug fehl oder wurde zurück gezogen.';
-$a->strings['Unable to set contact photo.'] = 'Konnte das Bild des Kontakts nicht speichern.';
-$a->strings['is now friends with'] = 'ist jetzt ein(e) Freund(in) von';
-$a->strings['No user record found for '] = 'Kein Nutzereintrag gefunden für ';
-$a->strings['Our site encryption key is apparently messed up.'] = 'Der Verschlüsslungsschlüssel unserer Seite ist anscheinend im Arsch.';
-$a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.';
-$a->strings['Contact record was not found for you on our site.'] = 'Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.';
-$a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal.';
-$a->strings['Unable to set your contact credentials on our system.'] = 'Deine Kontaktreferenzen konnten nicht in unserm System gespeichert werden.';
-$a->strings['Unable to update your contact profile details on our system'] = 'Die Updates für dein Profil konnten nicht gespeichert werden';
-$a->strings['Connection accepted at '] = 'Connection accepted at ';
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['New mail received at '] = 'New mail received at ';
-$a->strings[' commented on an item at '] = ' commented on an item at ';
-$a->strings[' welcomes '] = ' welcomes ';
-$a->strings['This introduction has already been accepted.'] = 'Diese Vorstellung wurde bereits abgeschlossen.';
-$a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.';
-$a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.';
-$a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.';
-$a->strings[' required parameter'] = ' required parameter';
-$a->strings[' was '] = ' was ';
-$a->strings['s were '] = 's were ';
-$a->strings['not found at the given location.'] = 'not found at the given location.';
-$a->strings['Introduction complete.'] = 'Vorstellung abgeschlossen.';
-$a->strings['Unrecoverable protocol error.'] = 'Nicht behebbarer Protokollfehler.';
-$a->strings['Profile unavailable.'] = 'Profil nicht verfügbar.';
-$a->strings[' has received too many connection requests today.'] = ' hat heute zu viele Nachfragen zwecks Kontaktaufnahme erhalten.';
-$a->strings['Spam protection measures have been invoked.'] = 'Maßnahmen zum Spamschutz wurden ergriffen.';
-$a->strings['Friends are advised to please try again in 24 hours.'] = 'Freunde sind angehalten es in 24 Stunden erneut zu versuchen.';
-$a->strings['Invalid locator'] = 'Invalid locator';
-$a->strings['Unable to resolve your name at the provided location.'] = 'Unable to resolve your name at the provided location.';
-$a->strings['You have already introduced yourself here.'] = 'Du hast dich hier bereits vorgestellt.';
-$a->strings['Apparently you are already friends with .'] = 'Offenbar bist du bereits ein Freund von ';
-$a->strings['Invalid profile URL.'] = 'Ungültige Profil URL.';
-$a->strings['Disallowed profile URL.'] = 'Nicht erlaubte Profil URL.';
-$a->strings['Your introduction has been sent.'] = 'Deine Vorstellung wurde abgeschickt.';
-$a->strings['Please login to confirm introduction.'] = 'Bitte melde dich an um die Vorstellung zu bestätigen.';
-$a->strings['Incorrect identity currently logged in. Please login to <strong>this</strong> profile.'] = 'Incorrect identity currently logged in. Please login to <strong>this</strong> profile.';
-$a->strings['[Name Withheld]'] = '[Name Zurückgehalten]';
-$a->strings['Friend/Connection Request'] = 'Freundschafts/Kontakt Anfrage';
-$a->strings['Please answer the following:'] = 'Bitte beantworte folgende Fragen:';
-$a->strings['Does $name know you?'] = 'Kennt $name dich?';
-$a->strings['Yes'] = 'Ja';
-$a->strings['No'] = 'Nein';
-$a->strings['Add a personal note:'] = 'Eine persönliche Notiz anfügen:';
-$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Bitte gib deine Profil Adresse von einem der unterstützten Sozialen Netzwerken an:';
-$a->strings['Friendika'] = 'Friendika';
-$a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
-$a->strings['Private (secure) network'] = 'Privates (sicheres) Netzwerk';
-$a->strings['Public (insecure) network'] = 'Öffentliches (unsicheres) Netzwerk';
-$a->strings['Your profile address:'] = 'Deine Profiladresse:';
-$a->strings['Submit Request'] = 'Anfrage abschicken';
-$a->strings['Cancel'] = 'Abbrechen';
-$a->strings['Global Directory'] = 'Weltweites Verzeichnis';
-$a->strings['Private Message'] = 'Private Nachricht';
-$a->strings["I like this \x28toggle\x29"] = "Ich mag das \x28toggle\x29";
-$a->strings["I don't like this \x28toggle\x29"] = "Ich mag das nicht \x28toggle\x29";
-$a->strings['This is you'] = 'Das bist du';
-$a->strings['View $name\'s profile'] = 'Betrachte das Profil von $name';
-$a->strings['View $owner_name\'s profile'] = 'Betrachte das Profil von $owner_name';
-$a->strings['to'] = 'to';
-$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
-$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
-$a->strings['Item has been removed.'] = 'Eintrag wurde entfernt.';
-$a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
-$a->strings['The profile address specified does not provide adequate information.'] = 'Die angegebene Profiladresse liefert unzureichende Informationen.';
-$a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.';
-$a->strings['Unable to retrieve contact information.'] = 'Konnte die Kontaktinformationen nicht empfangen.';
-$a->strings['following'] = 'folgen';
-$a->strings['Group created.'] = 'Gruppe erstellt.';
-$a->strings['Could not create group.'] = 'Konnte die Gruppe nicht erstellen.';
-$a->strings['Group not found.'] = 'Gruppe nicht gefunden.';
-$a->strings['Group name changed.'] = 'Gruppenname geändert.';
-$a->strings['Membership list updated.'] = 'Mitgliedsliste aktualisiert.';
-$a->strings['Group removed.'] = 'Gruppe entfernt.';
-$a->strings['Unable to remove group.'] = 'Konnte die Gruppe nicht entfernen.';
-$a->strings['Delete'] = 'Löschen';
-$a->strings['Welcome to '] = 'Willkommen zu ';
-$a->strings['Could not create/connect to database.'] = 'Konnte die Verbindung zur Datenbank nicht aufbauen bzw. die Datenbank anlegen.';
-$a->strings['Connected to database.'] = 'Mit der Datenbank verbunden.';
-$a->strings['Database import succeeded.'] = 'Import der Datenbank erfolgreich.';
-$a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'WICHTIG: Du musst [manuell] einen cron Job (o.ä.) für den Poller einrichten.';
-$a->strings['Please see the file "INSTALL.txt".'] = 'Lies bitte die "INSTALL.txt".';
-$a->strings['Database import failed.'] = 'Import der Datenbank schlug fehl.';
-$a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'Möglicherweise musst du die Datei "database.sql" manuell mit phpmyadmin oder mysql importieren.';
-$a->strings['Welcome to Friendika.'] = 'Willkommen bei Friendika.';
-$a->strings['Submit'] = 'Senden';
-$a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.';
-$a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'Diese wird von Friendika benötigt. Bitte passe die Konfigurationsdatei .htconfig.php entsprechend an.';
-$a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'Die Kommandozeilenversion von PHP auf deinem System hat "register_argc_argv" nicht aktiviert.';
-$a->strings['This is required for message delivery to work.'] = 'Dies wird für die Auslieferung von Nachrichten benötigt.';
-$a->strings['Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'] = 'Fehler: Die "openssl_pkey_new" Funktion auf diesem System ist nicht in der lage Verschlüsselungsschlüssel zu erzeugen';
-$a->strings['If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'] = 'Wenn der Server unter Windows läuft, schau dir bitte "http://www.php.net/manual/en/openssl.installation.php" an.';
-$a->strings['Error: Apache webserver mod-rewrite module is required but not installed.'] = 'Fehler: Das Apache Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.';
-$a->strings['Error: libCURL PHP module required but not installed.'] = 'Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert.';
-$a->strings['Error: GD graphics PHP module with JPEG support required but not installed.'] = 'Fehler: Das GD Graphikmodul für PHP mit JPEG Unterstützung ist nicht installiert.';
-$a->strings['Error: openssl PHP module required but not installed.'] = 'Fehler: Das openssl Modul von PHP ist nict installiert.';
-$a->strings['Error: mysqli PHP module required but not installed.'] = 'Fehler: Das mysqli Modul von PHP ist nicht installiert.';
-$a->strings['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.'] = 'Der Installationswizzard muss in der Lage sein eine Datei im Stammverzeichnis deines Webservers anzuliegen ist allerdings derzeit nicht in der Lage dies zu tun.';
-$a->strings['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.'] = 'In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.';
-$a->strings['Please check with your site documentation or support people to see if this situation can be corrected.'] = 'Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support Team um diese Situations zu beheben.';
-$a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'Sollte dies nicht möglich sein musst du die Installation manuell durchführen. Lies dazu bitte in der Datei "INSTALL.txt".';
-$a->strings['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.'] = 'Die Konfigurationsdatei ".htconfig.php" konnte nicht angelegt werden. Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner Friendika Installation zu erzeugen.';
-$a->strings['Errors encountered creating database tables.'] = 'Fehler aufgetreten wärend der Erzeugung der Datenbank Tabellen.';
-$a->strings[' : '] = ' : ';
-$a->strings['Not a valid email address.'] = 'Keine gültige EMail Adresse.';
-$a->strings['Please join my network on '] = 'Bitte trete meinem Netzwerk bei ';
-$a->strings['Message delivery failed.'] = 'Zustellung der Nachricht fehlgeschlagen.';
-$a->strings[' messages sent.'] = ' Nachrichten gesendet.';
-$a->strings['Send invitations'] = 'Einladungen senden';
-$a->strings['Enter email addresses, one per line:'] = 'EMail Adressen eingeben, eine pro Zeile:';
-$a->strings['Your message:'] = 'Deine Nachricht:';
-$a->strings['Please join my social network on '] = 'Bitte trete meinem sozialen Netzwerk bei ';
-$a->strings['To accept this invitation, please visit:'] = 'Um diese Einladung anzunehmen beuche bitte:';
-$a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:';
-$a->strings['photo'] = 'Foto';
-$a->strings['status'] = 'Status';
-$a->strings['likes'] = 'mag das';
-$a->strings['doesn\'t like'] = 'mag das nicht';
-$a->strings['\'s'] = '\'s';
-$a->strings['Remote privacy information not available.'] = 'Entfernte Privatsphäreneinstellungen nicht verfügbar.';
-$a->strings['Visible to:'] = 'Sichtbar für:';
-$a->strings['Password reset requested at '] = 'Anfrage zum Zurücksetzen des Passworts erhalten ';
-$a->strings['No recipient selected.'] = 'Kein Empfänger gewählt.';
-$a->strings['[no subject]'] = '[kein Betreff]';
-$a->strings['Unable to locate contact information.'] = 'Konnte die Kontaktinformationen nicht finden.';
-$a->strings['Message sent.'] = 'Nachricht gesendet.';
-$a->strings['Message could not be sent.'] = 'Nachricht konnte nicht gesendet werden.';
-$a->strings['Messages'] = 'Nachrichten';
-$a->strings['Inbox'] = 'Eingang';
-$a->strings['Outbox'] = 'Ausgang';
-$a->strings['New Message'] = 'Neue Nachricht';
-$a->strings['Message deleted.'] = 'Nachricht gelöscht.';
-$a->strings['Conversation removed.'] = 'Unterhaltung gelöscht.';
-$a->strings['Send Private Message'] = 'Private Nachricht senden';
-$a->strings['To:'] = 'An:';
-$a->strings['Subject:'] = 'Betreff:';
-$a->strings['Upload photo'] = 'Foto hochladen';
-$a->strings['Insert web link'] = 'Weblink einfügen';
-$a->strings['Please wait'] = 'Bitte warten';
-$a->strings['No messages.'] = 'Keine Nachrichten.';
-$a->strings['Delete conversation'] = 'Unterhaltung löschen';
-$a->strings['Message not available.'] = 'Nachricht nicht verfügbar.';
-$a->strings['Delete message'] = 'Nachricht löschen';
-$a->strings['Send Reply'] = 'Antwort senden';
-$a->strings['Normal View'] = 'Normale Ansicht';
-$a->strings['New Item View'] = 'Neue Einträge';
-$a->strings['Share'] = 'Share';
-$a->strings['Insert YouTube video'] = 'YouTube Video einfügen';
-$a->strings['Set your location'] = 'Deinen Standort festlegen';
-$a->strings['Clear browser location'] = 'Browser Standort leeren';
-$a->strings['Permission settings'] = 'Berechtigungseinstellungen';
-$a->strings['CC: email addresses'] = 'CC: EMail Addresse';
-$a->strings['Example: bob@example.com, mary@example.com'] = 'Z.B.: bob@example.com, mary@example.com';
-$a->strings['Please enter a link URL:'] = 'Bitte URL des Links angeben:';
-$a->strings['Please enter a YouTube link:'] = 'Bitte den YouTube Link angeben:';
-$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
-$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
-$a->strings['Where are you right now?'] = 'Wo bist du im Moment?';
-$a->strings['No such group'] = 'Es gibt keine solche Gruppe';
-$a->strings['Group is empty'] = 'Gruppe ist leer';
-$a->strings['Group: '] = 'Gruppe: ';
-$a->strings['View in context'] = 'Im Zusammenhang betrachten';
-$a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
-$a->strings['Discard'] = 'Verwerfen';
-$a->strings['Ignore'] = 'Ignorieren';
-$a->strings['Show Ignored Requests'] = 'Zeige ignorierte Anfragen';
-$a->strings['Hide Ignored Requests'] = 'Verberge ignorierte Anfragen';
-$a->strings['Claims to be known to you: '] = 'Behauptet dich zu kennen: ';
-$a->strings['yes'] = 'ja';
-$a->strings['no'] = 'nein';
-$a->strings['Approve as: '] = 'Genehmigen als: ';
-$a->strings['Friend'] = 'Freund';
-$a->strings['Fan/Admirer'] = 'Fan/Verehrer';
-$a->strings['Notification type: '] = 'Benachrichtigungs Typ: ';
-$a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
-$a->strings['New Follower'] = 'Neuer Bewunderer';
-$a->strings['Approve'] = 'Genehmigen';
-$a->strings['No notifications.'] = 'Keine Benachrichtigungen.';
-$a->strings['No registrations.'] = 'Keine Neuanmeldungen.';
-$a->strings['Login failed.'] = 'Annmeldung fehlgeschlagen.';
-$a->strings['Welcome back '] = 'Willkommen zurück ';
-$a->strings['Photo Albums'] = 'Fotoalben';
-$a->strings['Contact Photos'] = 'Kontaktbilder';
-$a->strings['Contact information unavailable'] = 'Kontakt Informationen nicht verfügbar';
-$a->strings['Profile Photos'] = 'Profilbilder';
-$a->strings['Album not found.'] = 'Album nicht gefunden.';
-$a->strings['Delete Album'] = 'Album löschen';
-$a->strings['Delete Photo'] = 'Foto löschen';
-$a->strings['was tagged in a'] = 'was tagged in a';
-$a->strings['by'] = 'by';
-$a->strings['Image exceeds size limit of '] = 'Die Bildgröße übersteigt das Limit von ';
-$a->strings['Unable to process image.'] = 'Konnte das Bild nicht bearbeiten.';
-$a->strings['Image upload failed.'] = 'Hochladen des Bildes gescheitert.';
-$a->strings['No photos selected'] = 'Keine Bilder ausgewählt';
-$a->strings['Upload Photos'] = 'Bilder hochladen';
-$a->strings['New album name: '] = 'Name des neuen Albums: ';
-$a->strings['or existing album name: '] = 'oder existierender Albumname: ';
-$a->strings['Permissions'] = 'Berechtigungen';
-$a->strings['Edit Album'] = 'Album bearbeiten';
-$a->strings['View Photo'] = 'Fotos betrachten';
-$a->strings['Photo not available'] = 'Foto nicht verfügbar';
-$a->strings['Edit photo'] = 'Foto bearbeiten';
-$a->strings['View Full Size'] = 'Betrachte Originalgröße';
-$a->strings['Tags: '] = 'Tags: ';
-$a->strings['[Remove any tag]'] = '[Tag entfernen]';
-$a->strings['New album name'] = 'Name des neuen Albums';
-$a->strings['Caption'] = 'Bildunterschrift';
-$a->strings['Add a Tag'] = 'Tag hinzufügen';
-$a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
-$a->strings['Recent Photos'] = 'Neuste Fotos';
-$a->strings['Upload New Photos'] = 'Weitere Fotos hochladen';
-$a->strings['View Album'] = 'Album betrachten';
-$a->strings['Status'] = 'Status';
-$a->strings['Profile'] = 'Profil';
-$a->strings['Photos'] = 'Fotos';
-$a->strings['Image uploaded but image cropping failed.'] = 'Bilder hochgeladen aber das Zuschneiden ist fehlgeschlagen.';
-$a->strings['Image size reduction [175] failed.'] = 'Image size reduction [175] failed.';
-$a->strings['Image size reduction [80] failed.'] = 'Image size reduction [80] failed.';
-$a->strings['Image size reduction [48] failed.'] = 'Image size reduction [48] failed.';
-$a->strings['Unable to process image'] = 'Bild konnte nicht verarbeitet werden';
-$a->strings['Image uploaded successfully.'] = 'Bild erfolgreich auf den Server geladen.';
-$a->strings['Image size reduction [640] failed.'] = 'Image size reduction [640] failed.';
-$a->strings['Profile Name is required.'] = 'Profilname ist erforderlich.';
-$a->strings['Profile updated.'] = 'Profil aktualisiert.';
-$a->strings['Profile deleted.'] = 'Profil gelöscht.';
-$a->strings['Profile-'] = 'Profil-';
-$a->strings['New profile created.'] = 'Neues Profil angelegt';
-$a->strings['Profile unavailable to clone.'] = 'Profil nicht zum Duplizieren verfügbar.';
-$a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.';
-$a->strings['Age: '] = 'Alter: ';
-$a->strings['Profile Image'] = 'Profilbild';
-$a->strings['Invalid OpenID url'] = 'Ungültige OpenID URL';
-$a->strings['Please enter the required information.'] = 'Bitte trage die erforderlichen Informationen ein.';
-$a->strings['Please use a shorter name.'] = 'Bitte verwende einen kürzeren Namen.';
-$a->strings['Name too short.'] = 'Der Name ist zu kurz.';
-$a->strings['That doesn\'t appear to be your full (First Last) name.'] = 'Das scheint kein vollständiger Name zu sein, verwende (Vorname Nachname).';
-$a->strings['Your email domain is not among those allowed on this site.'] = 'Die Domain deiner EMail Adresse ist nicht erlaubt auf dieser Seite.';
-$a->strings['Cannot use that email.'] = 'Konnte diese EMail Adresse nicht verwenden';
-$a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.'] = 'Dein Spitzname darf nur aus Buchstaben und Zahlen ("a-z","0-9", "_" und "-") bestehen, außerdem muss er mit einem Buchstaben beginnen.';
-$a->strings['Nickname is already registered. Please choose another.'] = 'Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.';
-$a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.';
-$a->strings['An error occurred during registration. Please try again.'] = 'Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.';
-$a->strings['An error occurred creating your default profile. Please try again.'] = 'Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.';
-$a->strings['Registration details for '] = 'Details der Registrierung für ';
-$a->strings['Registration successful. Please check your email for further instructions.'] = 'Registration erfolgreich. Eine EMail mit weiteren Anweisungen wurde an dich gesendet.';
-$a->strings['Failed to send email message. Here is the message that failed.'] = 'Konnte die EMail nicht versenden. Hier ist die Nachricht die nicht gesendet werden konnte.';
-$a->strings['Your registration can not be processed.'] = 'Deine Registration konnte nicht verarbeitet werden.';
-$a->strings['Registration request at '] = 'Registrationsanfrage für ';
-$a->strings['Your registration is pending approval by the site owner.'] = 'Deine Registration muss noch vom Betreiber der Seite freigegeben werden.';
-$a->strings['You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking \'Register\'.'] = 'Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen indem du deine OpenID angibst und \'Registrieren\' klickst.';
-$a->strings['If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'] = 'Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.';
-$a->strings['Your OpenID (optional): '] = 'Deine OpenID (optional): ';
-$a->strings['Registration'] = 'Registration';
-$a->strings['Your Full Name (e.g. Joe Smith): '] = 'Vollständiger Name (z.B. Joe Smith): ';
-$a->strings['Your Email Address: '] = 'Deine EMail Adresse: ';
-$a->strings['Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'] = 'Wähle eine Spitznamen, der mit einem Buchstaben beginnt. Deine globale Profiladresse wird dann \'<strong>spitzname@$sitename</strong>\' sein.';
-$a->strings['Choose a nickname: '] = 'Spitznamen wählen: ';
-$a->strings['Register'] = 'Registrieren';
-$a->strings['Please login.'] = 'Bitte melde dich an.';
-$a->strings['Registration revoked for '] = 'Registration zurückgezogen ';
-$a->strings['Account approved.'] = 'Account freigegeben.';
-$a->strings['Remove My Account'] = 'Account löschen';
-$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.';
-$a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:';
-$a->strings['Passwords do not match. Password unchanged.'] = 'Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.';
-$a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.';
-$a->strings['Password changed.'] = 'Passwort ändern.';
-$a->strings['Password update failed. Please try again.'] = 'Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal';
-$a->strings[' Please use a shorter name.'] = ' Bitte verwende einen kürzeren Namen.';
-$a->strings[' Name too short.'] = ' Name ist zu kurz.';
-$a->strings[' Not valid email.'] = ' Keine gültige EMail.';
-$a->strings[' Cannot change to that email.'] = ' Cannot change to that email.';
-$a->strings['Settings updated.'] = 'Einstellungen aktualisiert.';
-$a->strings['Plugin Settings'] = 'Plugin Einstellungen';
-$a->strings['Account Settings'] = 'Account Einstellungen';
-$a->strings['No Plugin settings configured'] = 'Keine Erweiterungen konfiguriert';
-$a->strings['OpenID: '] = 'OpenID: ';
-$a->strings['&nbsp;(Optional) Allow this OpenID to login to this account.'] = '&nbsp;(Optional) Erlaube dieser OpenID sich für diesen Account anzumelden.';
-$a->strings['Profile is <strong>not published</strong>.'] = 'Profil ist <strong>nicht veröffentlicht</strong>.';
-$a->strings['Default Post Permissions'] = 'Grundeinstellung für Veröffentlichungen';
-$a->strings['Tag removed'] = 'Tag entfernt';
-$a->strings['Remove Item Tag'] = 'Gegenstands Tag entfernen';
-$a->strings['Select a tag to remove: '] = 'Wähle ein Tag zum Entfernen aus: ';
-$a->strings['Remove'] = 'Entfernen';
-$a->strings['No contacts.'] = 'Keine Kontakte.';
-$a->strings['Visible To:'] = 'Sichtbar für:';
-$a->strings['Groups'] = 'Gruppen';
-$a->strings['Except For:'] = 'Abgesehen von:';
-$a->strings['Logged out.'] = 'Abgemeldet.';
-$a->strings['Unknown | Not categorised'] = 'Unbekannt | Nicht kategorisiert';
-$a->strings['Block immediately'] = 'Sofort blockieren';
-$a->strings['Shady, spammer, self-marketer'] = 'Zwielichtig, Spammer, Selbstdarsteller';
-$a->strings['Known to me, but no opinion'] = 'Ist mir bekannt, hab aber keine Meinung';
-$a->strings['OK, probably harmless'] = 'OK, wahrscheinlich harmlos';
-$a->strings['Reputable, has my trust'] = 'Seriös, hat mein Vertrauen';
-$a->strings['Frequently'] = 'Häufig';
-$a->strings['Hourly'] = 'Stündlich';
-$a->strings['Twice daily'] = 'Zweimal Täglich';
-$a->strings['Daily'] = 'Täglich';
-$a->strings['Weekly'] = 'Wöchendlich';
-$a->strings['Monthly'] = 'Monatlich';
-$a->strings['Miscellaneous'] = 'Verschiedenes';
-$a->strings['less than a second ago'] = 'vor weniger als einer Sekunde';
-$a->strings['year'] = 'Jahr';
-$a->strings['years'] = 'Jahre';
-$a->strings['month'] = 'Monat';
-$a->strings['months'] = 'Monate';
-$a->strings['week'] = 'Woche';
-$a->strings['weeks'] = 'Wochen';
-$a->strings['day'] = 'Tag';
-$a->strings['days'] = 'Tage';
-$a->strings['hour'] = 'Stunde';
-$a->strings['hours'] = 'Stunden';
-$a->strings['minute'] = 'Minute';
-$a->strings['minutes'] = 'Minuten';
-$a->strings['second'] = 'Sekunde';
-$a->strings['seconds'] = 'Sekunden';
-$a->strings[' ago'] = ' her';
-$a->strings['Create a new group'] = 'Neue Gruppe erstellen';
-$a->strings['Everybody'] = 'Alle Kontakte';
-$a->strings['Birthday:'] = 'Geburtstag:';
-$a->strings['Logout'] = 'Abmelden';
-$a->strings['Home'] = 'Persönlich';
-$a->strings['Directory'] = 'Verzeichnis';
-$a->strings['Network'] = 'Netzwerk';
-$a->strings['Notifications'] = 'Benachrichtigungen';
-$a->strings['Settings'] = 'Einstellungen';
-$a->strings['Profiles'] = 'Profile';
-$a->strings['Embedding disabled'] = 'Einbettungen deaktiviert';
-$a->strings['Male'] = 'Männlich';
-$a->strings['Female'] = 'Weiblich';
-$a->strings['Currently Male'] = 'Momentan Männlich';
-$a->strings['Currently Female'] = 'Momentan Weiblich';
-$a->strings['Mostly Male'] = 'Hauptsächlich Männlich';
-$a->strings['Mostly Female'] = 'Hauptsächlich Weiblich';
-$a->strings['Transgender'] = 'Transgender';
-$a->strings['Intersex'] = 'Intersex';
-$a->strings['Transsexual'] = 'Transsexuel';
-$a->strings['Hermaphrodite'] = 'Hermaphrodit';
-$a->strings['Neuter'] = 'Neuter';
-$a->strings['Non-specific'] = 'Nicht spezifiziert';
-$a->strings['Other'] = 'Andere';
-$a->strings['Undecided'] = 'Unentschieden';
-$a->strings['Males'] = 'Männer';
-$a->strings['Females'] = 'Frauen';
-$a->strings['Gay'] = 'Schwul';
-$a->strings['Lesbian'] = 'Lesbisch';
-$a->strings['No Preference'] = 'Keine Vorlieben';
-$a->strings['Bisexual'] = 'Bisexuel';
-$a->strings['Autosexual'] = 'Autosexual';
-$a->strings['Abstinent'] = 'Abstinent';
-$a->strings['Virgin'] = 'Jungfrau';
-$a->strings['Deviant'] = 'Deviant';
-$a->strings['Fetish'] = 'Fetish';
-$a->strings['Oodles'] = 'Oodles';
-$a->strings['Nonsexual'] = 'Nonsexual';
-$a->strings['Single'] = 'Single';
-$a->strings['Lonely'] = 'Einsam';
-$a->strings['Available'] = 'Verfügbar';
-$a->strings['Unavailable'] = 'Nicht verfügbar';
-$a->strings['Dating'] = 'Dating';
-$a->strings['Unfaithful'] = 'Untreu';
-$a->strings['Sex Addict'] = 'Sex Besessen';
-$a->strings['Friends'] = 'Freunde';
-$a->strings['Friends/Benefits'] = 'Friends/Benefits';
-$a->strings['Casual'] = 'Casual';
-$a->strings['Engaged'] = 'Verlobt';
-$a->strings['Married'] = 'Verheiratet';
-$a->strings['Partners'] = 'Partner';
-$a->strings['Cohabiting'] = 'kohabitierend';
-$a->strings['Happy'] = 'Glücklich';
-$a->strings['Not Looking'] = 'Nicht auf der Suche';
-$a->strings['Swinger'] = 'Swinger';
-$a->strings['Betrayed'] = 'Betrogen';
-$a->strings['Separated'] = 'Getrennt';
-$a->strings['Unstable'] = 'Unstabil';
-$a->strings['Divorced'] = 'Geschieden';
-$a->strings['Widowed'] = 'Verwidwet';
-$a->strings['Uncertain'] = 'Unsicher';
-$a->strings['Complicated'] = 'Kompliziert';
-$a->strings['Don\'t care'] = 'Ist mir nicht wichtig';
-$a->strings['Ask me'] = 'Frag mich';
-$a->strings['Facebook status update failed.'] = 'Konnte den Facebook Status nicht aktualisieren.';
-$a->strings['Select files to upload: '] = 'Wähle Dateien zum Upload aus: ';
-$a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Verwende die folgenden Kontrollen nur, wenn der Java Uploader [oben] nicht funktioniert.';
-$a->strings['Upload a file'] = 'Datei hochladen';
-$a->strings['Drop files here to upload'] = 'Ziehe die Dateien hier her die du hochladen willst';
-$a->strings['Failed'] = 'Fehlgeschlagen';
-$a->strings['No files were uploaded.'] = 'Keine Dateien hochgeladen.';
-$a->strings['Uploaded file is empty'] = 'Hochgeladene Datei ist leer';
-$a->strings['Uploaded file is too large'] = 'Hochgeladene Datei ist zu groß';
-$a->strings['File has an invalid extension, it should be one of '] = 'Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein ';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Upload abgebrochen oder Serverfehler aufgetreten';
-$a->strings['Randplace Settings'] = 'Randplace Einstellungen';
-$a->strings['Enable Randplace Plugin'] = 'Randplace Erweiterung aktivieren';
-$a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'Kein OAuth Consumer Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendika Account als Desktopapplikation und trage hier den OAuth Consumer Schlüssel, das Geheimnis und die Basis-URL der StatusNet API ein.<br />Bevor du eine neue Anwendung registrierst, kannst du auch erstmal den Admin deiner Friendika Seite fragen, ob es für deine bevorzugte StatusNet Instanz eventuell bereits ein OAuth Schlüsselpaar gibt.';
-$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Schlüssel';
-$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Geheimnis';
-$a->strings['Base API Path (remember the trailing /)'] = 'Basis-URL der StatusNet API (vergiss den abschließenden / nicht)';
-$a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.';
-$a->strings['Log in with StatusNet'] = 'Bei StatusNet anmelden';
-$a->strings['Copy the security code from StatusNet here'] = 'Kopiere den Sicherheitscode von StatusNet hier her';
-$a->strings['Currently connected to: '] = 'Momentan verbunden mit: ';
-$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'Wenn dies aktiviert ist, werden alle deine <strong>öffentlichen</strong> Nachricten auch auf dem verbundenen StatusNet Account veröffentlicht.';
-$a->strings['Send public postings to StatusNet'] = 'Veröffentliche öffentliche Nachrichten auf StatusNet';
-$a->strings['Clear OAuth configuration'] = 'OAuth Konfiguration löschen';
-$a->strings['Twitter Posting Settings'] = 'Twitter Posting Einstellungen';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
-$a->strings['At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhälst hier ein. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht.';
-$a->strings['Copy the PIN from Twitter here'] = 'Kopiere die Twitter PIN hier her';
-$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'Wenn dies aktiviert ist, werden alle deine <strong>öffentlichen</strong> Nachricten auch auf dem verbundenen Twitter Account veröffentlicht.';
-$a->strings['Send public postings to Twitter'] = 'Veröffentliche öffentliche Nachrichten auf Twitter';
-$a->strings['Africa/Abidjan'] = 'Africa/Abidjan';
-$a->strings['Africa/Accra'] = 'Africa/Accra';
-$a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';
-$a->strings['Africa/Algiers'] = 'Africa/Algiers';
-$a->strings['Africa/Asmara'] = 'Africa/Asmara';
-$a->strings['Africa/Asmera'] = 'Africa/Asmera';
-$a->strings['Africa/Bamako'] = 'Africa/Bamako';
-$a->strings['Africa/Bangui'] = 'Africa/Bangui';
-$a->strings['Africa/Banjul'] = 'Africa/Banjul';
-$a->strings['Africa/Bissau'] = 'Africa/Bissau';
-$a->strings['Africa/Blantyre'] = 'Africa/Blantyre';
-$a->strings['Africa/Brazzaville'] = 'Africa/Brazzaville';
-$a->strings['Africa/Bujumbura'] = 'Africa/Bujumbura';
-$a->strings['Africa/Cairo'] = 'Africa/Cairo';
-$a->strings['Africa/Casablanca'] = 'Africa/Casablanca';
-$a->strings['Africa/Ceuta'] = 'Africa/Ceuta';
-$a->strings['Africa/Conakry'] = 'Africa/Conakry';
-$a->strings['Africa/Dakar'] = 'Africa/Dakar';
-$a->strings['Africa/Dar_es_Salaam'] = 'Africa/Dar_es_Salaam';
-$a->strings['Africa/Djibouti'] = 'Africa/Djibouti';
-$a->strings['Africa/Douala'] = 'Africa/Douala';
-$a->strings['Africa/El_Aaiun'] = 'Africa/El_Aaiun';
-$a->strings['Africa/Freetown'] = 'Africa/Freetown';
-$a->strings['Africa/Gaborone'] = 'Africa/Gaborone';
-$a->strings['Africa/Harare'] = 'Africa/Harare';
-$a->strings['Africa/Johannesburg'] = 'Africa/Johannesburg';
-$a->strings['Africa/Kampala'] = 'Africa/Kampala';
-$a->strings['Africa/Khartoum'] = 'Africa/Khartoum';
-$a->strings['Africa/Kigali'] = 'Africa/Kigali';
-$a->strings['Africa/Kinshasa'] = 'Africa/Kinshasa';
-$a->strings['Africa/Lagos'] = 'Africa/Lagos';
-$a->strings['Africa/Libreville'] = 'Africa/Libreville';
-$a->strings['Africa/Lome'] = 'Africa/Lome';
-$a->strings['Africa/Luanda'] = 'Africa/Luanda';
-$a->strings['Africa/Lubumbashi'] = 'Africa/Lubumbashi';
-$a->strings['Africa/Lusaka'] = 'Africa/Lusaka';
-$a->strings['Africa/Malabo'] = 'Africa/Malabo';
-$a->strings['Africa/Maputo'] = 'Africa/Maputo';
-$a->strings['Africa/Maseru'] = 'Africa/Maseru';
-$a->strings['Africa/Mbabane'] = 'Africa/Mbabane';
-$a->strings['Africa/Mogadishu'] = 'Africa/Mogadishu';
-$a->strings['Africa/Monrovia'] = 'Africa/Monrovia';
-$a->strings['Africa/Nairobi'] = 'Africa/Nairobi';
-$a->strings['Africa/Ndjamena'] = 'Africa/Ndjamena';
-$a->strings['Africa/Niamey'] = 'Africa/Niamey';
-$a->strings['Africa/Nouakchott'] = 'Africa/Nouakchott';
-$a->strings['Africa/Ouagadougou'] = 'Africa/Ouagadougou';
-$a->strings['Africa/Porto-Novo'] = 'Africa/Porto-Novo';
-$a->strings['Africa/Sao_Tome'] = 'Africa/Sao_Tome';
-$a->strings['Africa/Timbuktu'] = 'Africa/Timbuktu';
-$a->strings['Africa/Tripoli'] = 'Africa/Tripoli';
-$a->strings['Africa/Tunis'] = 'Africa/Tunis';
-$a->strings['Africa/Windhoek'] = 'Africa/Windhoek';
-$a->strings['America/Adak'] = 'America/Adak';
-$a->strings['America/Anchorage'] = 'America/Anchorage';
-$a->strings['America/Anguilla'] = 'America/Anguilla';
-$a->strings['America/Antigua'] = 'America/Antigua';
-$a->strings['America/Araguaina'] = 'America/Araguaina';
-$a->strings['America/Argentina/Buenos_Aires'] = 'America/Argentina/Buenos_Aires';
-$a->strings['America/Argentina/Catamarca'] = 'America/Argentina/Catamarca';
-$a->strings['America/Argentina/ComodRivadavia'] = 'America/Argentina/ComodRivadavia';
-$a->strings['America/Argentina/Cordoba'] = 'America/Argentina/Cordoba';
-$a->strings['America/Argentina/Jujuy'] = 'America/Argentina/Jujuy';
-$a->strings['America/Argentina/La_Rioja'] = 'America/Argentina/La_Rioja';
-$a->strings['America/Argentina/Mendoza'] = 'America/Argentina/Mendoza';
-$a->strings['America/Argentina/Rio_Gallegos'] = 'America/Argentina/Rio_Gallegos';
-$a->strings['America/Argentina/Salta'] = 'America/Argentina/Salta';
-$a->strings['America/Argentina/San_Juan'] = 'America/Argentina/San_Juan';
-$a->strings['America/Argentina/San_Luis'] = 'America/Argentina/San_Luis';
-$a->strings['America/Argentina/Tucuman'] = 'America/Argentina/Tucuman';
-$a->strings['America/Argentina/Ushuaia'] = 'America/Argentina/Ushuaia';
-$a->strings['America/Aruba'] = 'America/Aruba';
-$a->strings['America/Asuncion'] = 'America/Asuncion';
-$a->strings['America/Atikokan'] = 'America/Atikokan';
-$a->strings['America/Atka'] = 'America/Atka';
-$a->strings['America/Bahia'] = 'America/Bahia';
-$a->strings['America/Barbados'] = 'America/Barbados';
-$a->strings['America/Belem'] = 'America/Belem';
-$a->strings['America/Belize'] = 'America/Belize';
-$a->strings['America/Blanc-Sablon'] = 'America/Blanc-Sablon';
-$a->strings['America/Boa_Vista'] = 'America/Boa_Vista';
-$a->strings['America/Bogota'] = 'America/Bogota';
-$a->strings['America/Boise'] = 'America/Boise';
-$a->strings['America/Buenos_Aires'] = 'America/Buenos_Aires';
-$a->strings['America/Cambridge_Bay'] = 'America/Cambridge_Bay';
-$a->strings['America/Campo_Grande'] = 'America/Campo_Grande';
-$a->strings['America/Cancun'] = 'America/Cancun';
-$a->strings['America/Caracas'] = 'America/Caracas';
-$a->strings['America/Catamarca'] = 'America/Catamarca';
-$a->strings['America/Cayenne'] = 'America/Cayenne';
-$a->strings['America/Cayman'] = 'America/Cayman';
-$a->strings['America/Chicago'] = 'America/Chicago';
-$a->strings['America/Chihuahua'] = 'America/Chihuahua';
-$a->strings['America/Coral_Harbour'] = 'America/Coral_Harbour';
-$a->strings['America/Cordoba'] = 'America/Cordoba';
-$a->strings['America/Costa_Rica'] = 'America/Costa_Rica';
-$a->strings['America/Cuiaba'] = 'America/Cuiaba';
-$a->strings['America/Curacao'] = 'America/Curacao';
-$a->strings['America/Danmarkshavn'] = 'America/Danmarkshavn';
-$a->strings['America/Dawson'] = 'America/Dawson';
-$a->strings['America/Dawson_Creek'] = 'America/Dawson_Creek';
-$a->strings['America/Denver'] = 'America/Denver';
-$a->strings['America/Detroit'] = 'America/Detroit';
-$a->strings['America/Dominica'] = 'America/Dominica';
-$a->strings['America/Edmonton'] = 'America/Edmonton';
-$a->strings['America/Eirunepe'] = 'America/Eirunepe';
-$a->strings['America/El_Salvador'] = 'America/El_Salvador';
-$a->strings['America/Ensenada'] = 'America/Ensenada';
-$a->strings['America/Fort_Wayne'] = 'America/Fort_Wayne';
-$a->strings['America/Fortaleza'] = 'America/Fortaleza';
-$a->strings['America/Glace_Bay'] = 'America/Glace_Bay';
-$a->strings['America/Godthab'] = 'America/Godthab';
-$a->strings['America/Goose_Bay'] = 'America/Goose_Bay';
-$a->strings['America/Grand_Turk'] = 'America/Grand_Turk';
-$a->strings['America/Grenada'] = 'America/Grenada';
-$a->strings['America/Guadeloupe'] = 'America/Guadeloupe';
-$a->strings['America/Guatemala'] = 'America/Guatemala';
-$a->strings['America/Guayaquil'] = 'America/Guayaquil';
-$a->strings['America/Guyana'] = 'America/Guyana';
-$a->strings['America/Halifax'] = 'America/Halifax';
-$a->strings['America/Havana'] = 'America/Havana';
-$a->strings['America/Hermosillo'] = 'America/Hermosillo';
-$a->strings['America/Indiana/Indianapolis'] = 'America/Indiana/Indianapolis';
-$a->strings['America/Indiana/Knox'] = 'America/Indiana/Knox';
-$a->strings['America/Indiana/Marengo'] = 'America/Indiana/Marengo';
-$a->strings['America/Indiana/Petersburg'] = 'America/Indiana/Petersburg';
-$a->strings['America/Indiana/Tell_City'] = 'America/Indiana/Tell_City';
-$a->strings['America/Indiana/Vevay'] = 'America/Indiana/Vevay';
-$a->strings['America/Indiana/Vincennes'] = 'America/Indiana/Vincennes';
-$a->strings['America/Indiana/Winamac'] = 'America/Indiana/Winamac';
-$a->strings['America/Indianapolis'] = 'America/Indianapolis';
-$a->strings['America/Inuvik'] = 'America/Inuvik';
-$a->strings['America/Iqaluit'] = 'America/Iqaluit';
-$a->strings['America/Jamaica'] = 'America/Jamaica';
-$a->strings['America/Jujuy'] = 'America/Jujuy';
-$a->strings['America/Juneau'] = 'America/Juneau';
-$a->strings['America/Kentucky/Louisville'] = 'America/Kentucky/Louisville';
-$a->strings['America/Kentucky/Monticello'] = 'America/Kentucky/Monticello';
-$a->strings['America/Knox_IN'] = 'America/Knox_IN';
-$a->strings['America/La_Paz'] = 'America/La_Paz';
-$a->strings['America/Lima'] = 'America/Lima';
-$a->strings['America/Los_Angeles'] = 'America/Los_Angeles';
-$a->strings['America/Louisville'] = 'America/Louisville';
-$a->strings['America/Maceio'] = 'America/Maceio';
-$a->strings['America/Managua'] = 'America/Managua';
-$a->strings['America/Manaus'] = 'America/Manaus';
-$a->strings['America/Marigot'] = 'America/Marigot';
-$a->strings['America/Martinique'] = 'America/Martinique';
-$a->strings['America/Matamoros'] = 'America/Matamoros';
-$a->strings['America/Mazatlan'] = 'America/Mazatlan';
-$a->strings['America/Mendoza'] = 'America/Mendoza';
-$a->strings['America/Menominee'] = 'America/Menominee';
-$a->strings['America/Merida'] = 'America/Merida';
-$a->strings['America/Mexico_City'] = 'America/Mexico_City';
-$a->strings['America/Miquelon'] = 'America/Miquelon';
-$a->strings['America/Moncton'] = 'America/Moncton';
-$a->strings['America/Monterrey'] = 'America/Monterrey';
-$a->strings['America/Montevideo'] = 'America/Montevideo';
-$a->strings['America/Montreal'] = 'America/Montreal';
-$a->strings['America/Montserrat'] = 'America/Montserrat';
-$a->strings['America/Nassau'] = 'America/Nassau';
-$a->strings['America/New_York'] = 'America/New_York';
-$a->strings['America/Nipigon'] = 'America/Nipigon';
-$a->strings['America/Nome'] = 'America/Nome';
-$a->strings['America/Noronha'] = 'America/Noronha';
-$a->strings['America/North_Dakota/Center'] = 'America/North_Dakota/Center';
-$a->strings['America/North_Dakota/New_Salem'] = 'America/North_Dakota/New_Salem';
-$a->strings['America/Ojinaga'] = 'America/Ojinaga';
-$a->strings['America/Panama'] = 'America/Panama';
-$a->strings['America/Pangnirtung'] = 'America/Pangnirtung';
-$a->strings['America/Paramaribo'] = 'America/Paramaribo';
-$a->strings['America/Phoenix'] = 'America/Phoenix';
-$a->strings['America/Port-au-Prince'] = 'America/Port-au-Prince';
-$a->strings['America/Port_of_Spain'] = 'America/Port_of_Spain';
-$a->strings['America/Porto_Acre'] = 'America/Porto_Acre';
-$a->strings['America/Porto_Velho'] = 'America/Porto_Velho';
-$a->strings['America/Puerto_Rico'] = 'America/Puerto_Rico';
-$a->strings['America/Rainy_River'] = 'America/Rainy_River';
-$a->strings['America/Rankin_Inlet'] = 'America/Rankin_Inlet';
-$a->strings['America/Recife'] = 'America/Recife';
-$a->strings['America/Regina'] = 'America/Regina';
-$a->strings['America/Resolute'] = 'America/Resolute';
-$a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
-$a->strings['America/Rosario'] = 'America/Rosario';
-$a->strings['America/Santa_Isabel'] = 'America/Santa_Isabel';
-$a->strings['America/Santarem'] = 'America/Santarem';
-$a->strings['America/Santiago'] = 'America/Santiago';
-$a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
-$a->strings['America/Sao_Paulo'] = 'America/Sao_Paulo';
-$a->strings['America/Scoresbysund'] = 'America/Scoresbysund';
-$a->strings['America/Shiprock'] = 'America/Shiprock';
-$a->strings['America/St_Barthelemy'] = 'America/St_Barthelemy';
-$a->strings['America/St_Johns'] = 'America/St_Johns';
-$a->strings['America/St_Kitts'] = 'America/St_Kitts';
-$a->strings['America/St_Lucia'] = 'America/St_Lucia';
-$a->strings['America/St_Thomas'] = 'America/St_Thomas';
-$a->strings['America/St_Vincent'] = 'America/St_Vincent';
-$a->strings['America/Swift_Current'] = 'America/Swift_Current';
-$a->strings['America/Tegucigalpa'] = 'America/Tegucigalpa';
-$a->strings['America/Thule'] = 'America/Thule';
-$a->strings['America/Thunder_Bay'] = 'America/Thunder_Bay';
-$a->strings['America/Tijuana'] = 'America/Tijuana';
-$a->strings['America/Toronto'] = 'America/Toronto';
-$a->strings['America/Tortola'] = 'America/Tortola';
-$a->strings['America/Vancouver'] = 'America/Vancouver';
-$a->strings['America/Virgin'] = 'America/Virgin';
-$a->strings['America/Whitehorse'] = 'America/Whitehorse';
-$a->strings['America/Winnipeg'] = 'America/Winnipeg';
-$a->strings['America/Yakutat'] = 'America/Yakutat';
-$a->strings['America/Yellowknife'] = 'America/Yellowknife';
-$a->strings['Antarctica/Casey'] = 'Antarctica/Casey';
-$a->strings['Antarctica/Davis'] = 'Antarctica/Davis';
-$a->strings['Antarctica/DumontDUrville'] = 'Antarctica/DumontDUrville';
-$a->strings['Antarctica/Macquarie'] = 'Antarctica/Macquarie';
-$a->strings['Antarctica/Mawson'] = 'Antarctica/Mawson';
-$a->strings['Antarctica/McMurdo'] = 'Antarctica/McMurdo';
-$a->strings['Antarctica/Palmer'] = 'Antarctica/Palmer';
-$a->strings['Antarctica/Rothera'] = 'Antarctica/Rothera';
-$a->strings['Antarctica/South_Pole'] = 'Antarctica/South_Pole';
-$a->strings['Antarctica/Syowa'] = 'Antarctica/Syowa';
-$a->strings['Antarctica/Vostok'] = 'Antarctica/Vostok';
-$a->strings['Arctic/Longyearbyen'] = 'Arctic/Longyearbyen';
-$a->strings['Asia/Aden'] = 'Asia/Aden';
-$a->strings['Asia/Almaty'] = 'Asia/Almaty';
-$a->strings['Asia/Amman'] = 'Asia/Amman';
-$a->strings['Asia/Anadyr'] = 'Asia/Anadyr';
-$a->strings['Asia/Aqtau'] = 'Asia/Aqtau';
-$a->strings['Asia/Aqtobe'] = 'Asia/Aqtobe';
-$a->strings['Asia/Ashgabat'] = 'Asia/Ashgabat';
-$a->strings['Asia/Ashkhabad'] = 'Asia/Ashkhabad';
-$a->strings['Asia/Baghdad'] = 'Asia/Baghdad';
-$a->strings['Asia/Bahrain'] = 'Asia/Bahrain';
-$a->strings['Asia/Baku'] = 'Asia/Baku';
-$a->strings['Asia/Bangkok'] = 'Asia/Bangkok';
-$a->strings['Asia/Beirut'] = 'Asia/Beirut';
-$a->strings['Asia/Bishkek'] = 'Asia/Bishkek';
-$a->strings['Asia/Brunei'] = 'Asia/Brunei';
-$a->strings['Asia/Calcutta'] = 'Asia/Calcutta';
-$a->strings['Asia/Choibalsan'] = 'Asia/Choibalsan';
-$a->strings['Asia/Chongqing'] = 'Asia/Chongqing';
-$a->strings['Asia/Chungking'] = 'Asia/Chungking';
-$a->strings['Asia/Colombo'] = 'Asia/Colombo';
-$a->strings['Asia/Dacca'] = 'Asia/Dacca';
-$a->strings['Asia/Damascus'] = 'Asia/Damascus';
-$a->strings['Asia/Dhaka'] = 'Asia/Dhaka';
-$a->strings['Asia/Dili'] = 'Asia/Dili';
-$a->strings['Asia/Dubai'] = 'Asia/Dubai';
-$a->strings['Asia/Dushanbe'] = 'Asia/Dushanbe';
-$a->strings['Asia/Gaza'] = 'Asia/Gaza';
-$a->strings['Asia/Harbin'] = 'Asia/Harbin';
-$a->strings['Asia/Ho_Chi_Minh'] = 'Asia/Ho_Chi_Minh';
-$a->strings['Asia/Hong_Kong'] = 'Asia/Hong_Kong';
-$a->strings['Asia/Hovd'] = 'Asia/Hovd';
-$a->strings['Asia/Irkutsk'] = 'Asia/Irkutsk';
-$a->strings['Asia/Istanbul'] = 'Asia/Istanbul';
-$a->strings['Asia/Jakarta'] = 'Asia/Jakarta';
-$a->strings['Asia/Jayapura'] = 'Asia/Jayapura';
-$a->strings['Asia/Jerusalem'] = 'Asia/Jerusalem';
-$a->strings['Asia/Kabul'] = 'Asia/Kabul';
-$a->strings['Asia/Kamchatka'] = 'Asia/Kamchatka';
-$a->strings['Asia/Karachi'] = 'Asia/Karachi';
-$a->strings['Asia/Kashgar'] = 'Asia/Kashgar';
-$a->strings['Asia/Kathmandu'] = 'Asia/Kathmandu';
-$a->strings['Asia/Katmandu'] = 'Asia/Katmandu';
-$a->strings['Asia/Kolkata'] = 'Asia/Kolkata';
-$a->strings['Asia/Krasnoyarsk'] = 'Asia/Krasnoyarsk';
-$a->strings['Asia/Kuala_Lumpur'] = 'Asia/Kuala_Lumpur';
-$a->strings['Asia/Kuching'] = 'Asia/Kuching';
-$a->strings['Asia/Kuwait'] = 'Asia/Kuwait';
-$a->strings['Asia/Macao'] = 'Asia/Macao';
-$a->strings['Asia/Macau'] = 'Asia/Macau';
-$a->strings['Asia/Magadan'] = 'Asia/Magadan';
-$a->strings['Asia/Makassar'] = 'Asia/Makassar';
-$a->strings['Asia/Manila'] = 'Asia/Manila';
-$a->strings['Asia/Muscat'] = 'Asia/Muscat';
-$a->strings['Asia/Nicosia'] = 'Asia/Nicosia';
-$a->strings['Asia/Novokuznetsk'] = 'Asia/Novokuznetsk';
-$a->strings['Asia/Novosibirsk'] = 'Asia/Novosibirsk';
-$a->strings['Asia/Omsk'] = 'Asia/Omsk';
-$a->strings['Asia/Oral'] = 'Asia/Oral';
-$a->strings['Asia/Phnom_Penh'] = 'Asia/Phnom_Penh';
-$a->strings['Asia/Pontianak'] = 'Asia/Pontianak';
-$a->strings['Asia/Pyongyang'] = 'Asia/Pyongyang';
-$a->strings['Asia/Qatar'] = 'Asia/Qatar';
-$a->strings['Asia/Qyzylorda'] = 'Asia/Qyzylorda';
-$a->strings['Asia/Rangoon'] = 'Asia/Rangoon';
-$a->strings['Asia/Riyadh'] = 'Asia/Riyadh';
-$a->strings['Asia/Saigon'] = 'Asia/Saigon';
-$a->strings['Asia/Sakhalin'] = 'Asia/Sakhalin';
-$a->strings['Asia/Samarkand'] = 'Asia/Samarkand';
-$a->strings['Asia/Seoul'] = 'Asia/Seoul';
-$a->strings['Asia/Shanghai'] = 'Asia/Shanghai';
-$a->strings['Asia/Singapore'] = 'Asia/Singapore';
-$a->strings['Asia/Taipei'] = 'Asia/Taipei';
-$a->strings['Asia/Tashkent'] = 'Asia/Tashkent';
-$a->strings['Asia/Tbilisi'] = 'Asia/Tbilisi';
-$a->strings['Asia/Tehran'] = 'Asia/Tehran';
-$a->strings['Asia/Tel_Aviv'] = 'Asia/Tel_Aviv';
-$a->strings['Asia/Thimbu'] = 'Asia/Thimbu';
-$a->strings['Asia/Thimphu'] = 'Asia/Thimphu';
-$a->strings['Asia/Tokyo'] = 'Asia/Tokyo';
-$a->strings['Asia/Ujung_Pandang'] = 'Asia/Ujung_Pandang';
-$a->strings['Asia/Ulaanbaatar'] = 'Asia/Ulaanbaatar';
-$a->strings['Asia/Ulan_Bator'] = 'Asia/Ulan_Bator';
-$a->strings['Asia/Urumqi'] = 'Asia/Urumqi';
-$a->strings['Asia/Vientiane'] = 'Asia/Vientiane';
-$a->strings['Asia/Vladivostok'] = 'Asia/Vladivostok';
-$a->strings['Asia/Yakutsk'] = 'Asia/Yakutsk';
-$a->strings['Asia/Yekaterinburg'] = 'Asia/Yekaterinburg';
-$a->strings['Asia/Yerevan'] = 'Asia/Yerevan';
-$a->strings['Atlantic/Azores'] = 'Atlantic/Azores';
-$a->strings['Atlantic/Bermuda'] = 'Atlantic/Bermuda';
-$a->strings['Atlantic/Canary'] = 'Atlantic/Canary';
-$a->strings['Atlantic/Cape_Verde'] = 'Atlantic/Cape_Verde';
-$a->strings['Atlantic/Faeroe'] = 'Atlantic/Faeroe';
-$a->strings['Atlantic/Faroe'] = 'Atlantic/Faroe';
-$a->strings['Atlantic/Jan_Mayen'] = 'Atlantic/Jan_Mayen';
-$a->strings['Atlantic/Madeira'] = 'Atlantic/Madeira';
-$a->strings['Atlantic/Reykjavik'] = 'Atlantic/Reykjavik';
-$a->strings['Atlantic/South_Georgia'] = 'Atlantic/South_Georgia';
-$a->strings['Atlantic/St_Helena'] = 'Atlantic/St_Helena';
-$a->strings['Atlantic/Stanley'] = 'Atlantic/Stanley';
-$a->strings['Australia/ACT'] = 'Australia/ACT';
-$a->strings['Australia/Adelaide'] = 'Australia/Adelaide';
-$a->strings['Australia/Brisbane'] = 'Australia/Brisbane';
-$a->strings['Australia/Broken_Hill'] = 'Australia/Broken_Hill';
-$a->strings['Australia/Canberra'] = 'Australia/Canberra';
-$a->strings['Australia/Currie'] = 'Australia/Currie';
-$a->strings['Australia/Darwin'] = 'Australia/Darwin';
-$a->strings['Australia/Eucla'] = 'Australia/Eucla';
-$a->strings['Australia/Hobart'] = 'Australia/Hobart';
-$a->strings['Australia/LHI'] = 'Australia/LHI';
-$a->strings['Australia/Lindeman'] = 'Australia/Lindeman';
-$a->strings['Australia/Lord_Howe'] = 'Australia/Lord_Howe';
-$a->strings['Australia/Melbourne'] = 'Australia/Melbourne';
-$a->strings['Australia/North'] = 'Australia/North';
-$a->strings['Australia/NSW'] = 'Australia/NSW';
-$a->strings['Australia/Perth'] = 'Australia/Perth';
-$a->strings['Australia/Queensland'] = 'Australia/Queensland';
-$a->strings['Australia/South'] = 'Australia/South';
-$a->strings['Australia/Sydney'] = 'Australia/Sydney';
-$a->strings['Australia/Tasmania'] = 'Australia/Tasmania';
-$a->strings['Australia/Victoria'] = 'Australia/Victoria';
-$a->strings['Australia/West'] = 'Australia/West';
-$a->strings['Australia/Yancowinna'] = 'Australia/Yancowinna';
-$a->strings['Brazil/Acre'] = 'Brazil/Acre';
-$a->strings['Brazil/DeNoronha'] = 'Brazil/DeNoronha';
-$a->strings['Brazil/East'] = 'Brazil/East';
-$a->strings['Brazil/West'] = 'Brazil/West';
-$a->strings['Canada/Atlantic'] = 'Canada/Atlantic';
-$a->strings['Canada/Central'] = 'Canada/Central';
-$a->strings['Canada/East-Saskatchewan'] = 'Canada/East-Saskatchewan';
-$a->strings['Canada/Eastern'] = 'Canada/Eastern';
-$a->strings['Canada/Mountain'] = 'Canada/Mountain';
-$a->strings['Canada/Newfoundland'] = 'Canada/Newfoundland';
-$a->strings['Canada/Pacific'] = 'Canada/Pacific';
-$a->strings['Canada/Saskatchewan'] = 'Canada/Saskatchewan';
-$a->strings['Canada/Yukon'] = 'Canada/Yukon';
-$a->strings['CET'] = 'CET';
-$a->strings['Chile/Continental'] = 'Chile/Continental';
-$a->strings['Chile/EasterIsland'] = 'Chile/EasterIsland';
-$a->strings['CST6CDT'] = 'CST6CDT';
-$a->strings['Cuba'] = 'Cuba';
-$a->strings['EET'] = 'EET';
-$a->strings['Egypt'] = 'Egypt';
-$a->strings['Eire'] = 'Eire';
-$a->strings['EST'] = 'EST';
-$a->strings['EST5EDT'] = 'EST5EDT';
-$a->strings['Etc/GMT'] = 'Etc/GMT';
-$a->strings['Etc/GMT+0'] = 'Etc/GMT+0';
-$a->strings['Etc/GMT+1'] = 'Etc/GMT+1';
-$a->strings['Etc/GMT+10'] = 'Etc/GMT+10';
-$a->strings['Etc/GMT+11'] = 'Etc/GMT+11';
-$a->strings['Etc/GMT+12'] = 'Etc/GMT+12';
-$a->strings['Etc/GMT+2'] = 'Etc/GMT+2';
-$a->strings['Etc/GMT+3'] = 'Etc/GMT+3';
-$a->strings['Etc/GMT+4'] = 'Etc/GMT+4';
-$a->strings['Etc/GMT+5'] = 'Etc/GMT+5';
-$a->strings['Etc/GMT+6'] = 'Etc/GMT+6';
-$a->strings['Etc/GMT+7'] = 'Etc/GMT+7';
-$a->strings['Etc/GMT+8'] = 'Etc/GMT+8';
-$a->strings['Etc/GMT+9'] = 'Etc/GMT+9';
-$a->strings['Etc/GMT-0'] = 'Etc/GMT-0';
-$a->strings['Etc/GMT-1'] = 'Etc/GMT-1';
-$a->strings['Etc/GMT-10'] = 'Etc/GMT-10';
-$a->strings['Etc/GMT-11'] = 'Etc/GMT-11';
-$a->strings['Etc/GMT-12'] = 'Etc/GMT-12';
-$a->strings['Etc/GMT-13'] = 'Etc/GMT-13';
-$a->strings['Etc/GMT-14'] = 'Etc/GMT-14';
-$a->strings['Etc/GMT-2'] = 'Etc/GMT-2';
-$a->strings['Etc/GMT-3'] = 'Etc/GMT-3';
-$a->strings['Etc/GMT-4'] = 'Etc/GMT-4';
-$a->strings['Etc/GMT-5'] = 'Etc/GMT-5';
-$a->strings['Etc/GMT-6'] = 'Etc/GMT-6';
-$a->strings['Etc/GMT-7'] = 'Etc/GMT-7';
-$a->strings['Etc/GMT-8'] = 'Etc/GMT-8';
-$a->strings['Etc/GMT-9'] = 'Etc/GMT-9';
-$a->strings['Etc/GMT0'] = 'Etc/GMT0';
-$a->strings['Etc/Greenwich'] = 'Etc/Greenwich';
-$a->strings['Etc/UCT'] = 'Etc/UCT';
-$a->strings['Etc/Universal'] = 'Etc/Universal';
-$a->strings['Etc/UTC'] = 'Etc/UTC';
-$a->strings['Etc/Zulu'] = 'Etc/Zulu';
-$a->strings['Europe/Amsterdam'] = 'Europe/Amsterdam';
-$a->strings['Europe/Andorra'] = 'Europe/Andorra';
-$a->strings['Europe/Athens'] = 'Europe/Athens';
-$a->strings['Europe/Belfast'] = 'Europe/Belfast';
-$a->strings['Europe/Belgrade'] = 'Europe/Belgrade';
-$a->strings['Europe/Berlin'] = 'Europe/Berlin';
-$a->strings['Europe/Bratislava'] = 'Europe/Bratislava';
-$a->strings['Europe/Brussels'] = 'Europe/Brussels';
-$a->strings['Europe/Bucharest'] = 'Europe/Bucharest';
-$a->strings['Europe/Budapest'] = 'Europe/Budapest';
-$a->strings['Europe/Chisinau'] = 'Europe/Chisinau';
-$a->strings['Europe/Copenhagen'] = 'Europe/Copenhagen';
-$a->strings['Europe/Dublin'] = 'Europe/Dublin';
-$a->strings['Europe/Gibraltar'] = 'Europe/Gibraltar';
-$a->strings['Europe/Guernsey'] = 'Europe/Guernsey';
-$a->strings['Europe/Helsinki'] = 'Europe/Helsinki';
-$a->strings['Europe/Isle_of_Man'] = 'Europe/Isle_of_Man';
-$a->strings['Europe/Istanbul'] = 'Europe/Istanbul';
-$a->strings['Europe/Jersey'] = 'Europe/Jersey';
-$a->strings['Europe/Kaliningrad'] = 'Europe/Kaliningrad';
-$a->strings['Europe/Kiev'] = 'Europe/Kiev';
-$a->strings['Europe/Lisbon'] = 'Europe/Lisbon';
-$a->strings['Europe/Ljubljana'] = 'Europe/Ljubljana';
-$a->strings['Europe/London'] = 'Europe/London';
-$a->strings['Europe/Luxembourg'] = 'Europe/Luxembourg';
-$a->strings['Europe/Madrid'] = 'Europe/Madrid';
-$a->strings['Europe/Malta'] = 'Europe/Malta';
-$a->strings['Europe/Mariehamn'] = 'Europe/Mariehamn';
-$a->strings['Europe/Minsk'] = 'Europe/Minsk';
-$a->strings['Europe/Monaco'] = 'Europe/Monaco';
-$a->strings['Europe/Moscow'] = 'Europe/Moscow';
-$a->strings['Europe/Nicosia'] = 'Europe/Nicosia';
-$a->strings['Europe/Oslo'] = 'Europe/Oslo';
-$a->strings['Europe/Paris'] = 'Europe/Paris';
-$a->strings['Europe/Podgorica'] = 'Europe/Podgorica';
-$a->strings['Europe/Prague'] = 'Europe/Prague';
-$a->strings['Europe/Riga'] = 'Europe/Riga';
-$a->strings['Europe/Rome'] = 'Europe/Rome';
-$a->strings['Europe/Samara'] = 'Europe/Samara';
-$a->strings['Europe/San_Marino'] = 'Europe/San_Marino';
-$a->strings['Europe/Sarajevo'] = 'Europe/Sarajevo';
-$a->strings['Europe/Simferopol'] = 'Europe/Simferopol';
-$a->strings['Europe/Skopje'] = 'Europe/Skopje';
-$a->strings['Europe/Sofia'] = 'Europe/Sofia';
-$a->strings['Europe/Stockholm'] = 'Europe/Stockholm';
-$a->strings['Europe/Tallinn'] = 'Europe/Tallinn';
-$a->strings['Europe/Tirane'] = 'Europe/Tirane';
-$a->strings['Europe/Tiraspol'] = 'Europe/Tiraspol';
-$a->strings['Europe/Uzhgorod'] = 'Europe/Uzhgorod';
-$a->strings['Europe/Vaduz'] = 'Europe/Vaduz';
-$a->strings['Europe/Vatican'] = 'Europe/Vatican';
-$a->strings['Europe/Vienna'] = 'Europe/Vienna';
-$a->strings['Europe/Vilnius'] = 'Europe/Vilnius';
-$a->strings['Europe/Volgograd'] = 'Europe/Volgograd';
-$a->strings['Europe/Warsaw'] = 'Europe/Warsaw';
-$a->strings['Europe/Zagreb'] = 'Europe/Zagreb';
-$a->strings['Europe/Zaporozhye'] = 'Europe/Zaporozhye';
-$a->strings['Europe/Zurich'] = 'Europe/Zurich';
-$a->strings['Factory'] = 'Factory';
-$a->strings['GB'] = 'GB';
-$a->strings['GB-Eire'] = 'GB-Eire';
-$a->strings['GMT'] = 'GMT';
-$a->strings['GMT+0'] = 'GMT+0';
-$a->strings['GMT-0'] = 'GMT-0';
-$a->strings['GMT0'] = 'GMT0';
-$a->strings['Greenwich'] = 'Greenwich';
-$a->strings['Hongkong'] = 'Hongkong';
-$a->strings['HST'] = 'HST';
-$a->strings['Iceland'] = 'Iceland';
-$a->strings['Indian/Antananarivo'] = 'Indian/Antananarivo';
-$a->strings['Indian/Chagos'] = 'Indian/Chagos';
-$a->strings['Indian/Christmas'] = 'Indian/Christmas';
-$a->strings['Indian/Cocos'] = 'Indian/Cocos';
-$a->strings['Indian/Comoro'] = 'Indian/Comoro';
-$a->strings['Indian/Kerguelen'] = 'Indian/Kerguelen';
-$a->strings['Indian/Mahe'] = 'Indian/Mahe';
-$a->strings['Indian/Maldives'] = 'Indian/Maldives';
-$a->strings['Indian/Mauritius'] = 'Indian/Mauritius';
-$a->strings['Indian/Mayotte'] = 'Indian/Mayotte';
-$a->strings['Indian/Reunion'] = 'Indian/Reunion';
-$a->strings['Iran'] = 'Iran';
-$a->strings['Israel'] = 'Israel';
-$a->strings['Jamaica'] = 'Jamaica';
-$a->strings['Japan'] = 'Japan';
-$a->strings['Kwajalein'] = 'Kwajalein';
-$a->strings['Libya'] = 'Libya';
-$a->strings['MET'] = 'MET';
-$a->strings['Mexico/BajaNorte'] = 'Mexico/BajaNorte';
-$a->strings['Mexico/BajaSur'] = 'Mexico/BajaSur';
-$a->strings['Mexico/General'] = 'Mexico/General';
-$a->strings['MST'] = 'MST';
-$a->strings['MST7MDT'] = 'MST7MDT';
-$a->strings['Navajo'] = 'Navajo';
-$a->strings['NZ'] = 'NZ';
-$a->strings['NZ-CHAT'] = 'NZ-CHAT';
-$a->strings['Pacific/Apia'] = 'Pacific/Apia';
-$a->strings['Pacific/Auckland'] = 'Pacific/Auckland';
-$a->strings['Pacific/Chatham'] = 'Pacific/Chatham';
-$a->strings['Pacific/Easter'] = 'Pacific/Easter';
-$a->strings['Pacific/Efate'] = 'Pacific/Efate';
-$a->strings['Pacific/Enderbury'] = 'Pacific/Enderbury';
-$a->strings['Pacific/Fakaofo'] = 'Pacific/Fakaofo';
-$a->strings['Pacific/Fiji'] = 'Pacific/Fiji';
-$a->strings['Pacific/Funafuti'] = 'Pacific/Funafuti';
-$a->strings['Pacific/Galapagos'] = 'Pacific/Galapagos';
-$a->strings['Pacific/Gambier'] = 'Pacific/Gambier';
-$a->strings['Pacific/Guadalcanal'] = 'Pacific/Guadalcanal';
-$a->strings['Pacific/Guam'] = 'Pacific/Guam';
-$a->strings['Pacific/Honolulu'] = 'Pacific/Honolulu';
-$a->strings['Pacific/Johnston'] = 'Pacific/Johnston';
-$a->strings['Pacific/Kiritimati'] = 'Pacific/Kiritimati';
-$a->strings['Pacific/Kosrae'] = 'Pacific/Kosrae';
-$a->strings['Pacific/Kwajalein'] = 'Pacific/Kwajalein';
-$a->strings['Pacific/Majuro'] = 'Pacific/Majuro';
-$a->strings['Pacific/Marquesas'] = 'Pacific/Marquesas';
-$a->strings['Pacific/Midway'] = 'Pacific/Midway';
-$a->strings['Pacific/Nauru'] = 'Pacific/Nauru';
-$a->strings['Pacific/Niue'] = 'Pacific/Niue';
-$a->strings['Pacific/Norfolk'] = 'Pacific/Norfolk';
-$a->strings['Pacific/Noumea'] = 'Pacific/Noumea';
-$a->strings['Pacific/Pago_Pago'] = 'Pacific/Pago_Pago';
-$a->strings['Pacific/Palau'] = 'Pacific/Palau';
-$a->strings['Pacific/Pitcairn'] = 'Pacific/Pitcairn';
-$a->strings['Pacific/Ponape'] = 'Pacific/Ponape';
-$a->strings['Pacific/Port_Moresby'] = 'Pacific/Port_Moresby';
-$a->strings['Pacific/Rarotonga'] = 'Pacific/Rarotonga';
-$a->strings['Pacific/Saipan'] = 'Pacific/Saipan';
-$a->strings['Pacific/Samoa'] = 'Pacific/Samoa';
-$a->strings['Pacific/Tahiti'] = 'Pacific/Tahiti';
-$a->strings['Pacific/Tarawa'] = 'Pacific/Tarawa';
-$a->strings['Pacific/Tongatapu'] = 'Pacific/Tongatapu';
-$a->strings['Pacific/Truk'] = 'Pacific/Truk';
-$a->strings['Pacific/Wake'] = 'Pacific/Wake';
-$a->strings['Pacific/Wallis'] = 'Pacific/Wallis';
-$a->strings['Pacific/Yap'] = 'Pacific/Yap';
-$a->strings['Poland'] = 'Poland';
-$a->strings['Portugal'] = 'Portugal';
-$a->strings['PRC'] = 'PRC';
-$a->strings['PST8PDT'] = 'PST8PDT';
-$a->strings['ROC'] = 'ROC';
-$a->strings['ROK'] = 'ROK';
-$a->strings['Singapore'] = 'Singapore';
-$a->strings['Turkey'] = 'Turkey';
-$a->strings['UCT'] = 'UCT';
-$a->strings['Universal'] = 'Universal';
-$a->strings['US/Alaska'] = 'US/Alaska';
-$a->strings['US/Aleutian'] = 'US/Aleutian';
-$a->strings['US/Arizona'] = 'US/Arizona';
-$a->strings['US/Central'] = 'US/Central';
-$a->strings['US/East-Indiana'] = 'US/East-Indiana';
-$a->strings['US/Eastern'] = 'US/Eastern';
-$a->strings['US/Hawaii'] = 'US/Hawaii';
-$a->strings['US/Indiana-Starke'] = 'US/Indiana-Starke';
-$a->strings['US/Michigan'] = 'US/Michigan';
-$a->strings['US/Mountain'] = 'US/Mountain';
-$a->strings['US/Pacific'] = 'US/Pacific';
-$a->strings['US/Pacific-New'] = 'US/Pacific-New';
-$a->strings['US/Samoa'] = 'US/Samoa';
-$a->strings['UTC'] = 'UTC';
-$a->strings['W-SU'] = 'W-SU';
-$a->strings['WET'] = 'WET';
-$a->strings['Zulu'] = 'Zulu';
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Dreidimensionales Tic-Tac-Toe';
-$a->strings['New game'] = 'Neues Spiel';
-$a->strings['New game with handicap'] = 'Neues Handicap Spiel';
-$a->strings['Create a New Account'] = 'Neuen Account erstellen';
-$a->strings['link to source'] = 'Link zum original Posting';
-$a->strings['Applications'] = 'Anwendungen';
-$a->strings['noreply'] = '';
-$a->strings['Apps'] = 'Apps';
-$a->strings['Facebook disabled'] = 'Facebook deaktiviert';
-$a->strings['Facebook API key is missing.'] = 'Facebook API Schlüssel nicht gefunden';
-$a->strings['Facebook Connect'] = 'Mit Facebook verbinden';
-$a->strings['Install Facebook post connector'] = '';
-$a->strings['Remove Facebook post connector'] = '';
-$a->strings['Facebook'] = '';
-$a->strings['Facebook Connector Settings'] = 'Facebook Verbindungseinstellungen';
-$a->strings['Post to Facebook'] = 'Zu Facebook posten';
-$a->strings['Image: '] = 'Bild';
-$a->strings['Post to StatusNet'] = 'Nach StatusNet senden';
-$a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Einstellungen';
-$a->strings['You go first...'] = 'Du fängst an...';
-$a->strings['I\'m going first this time...'] = 'Diesmal fange ich an...';
-$a->strings['You won!'] = 'Du gewinnst!';
-$a->strings['"Cat" game!'] = 'Unentschieden!';
-$a->strings['I won!'] = 'Ich gewinne!';
-$a->strings['Post to Twitter'] = '';
-?>
+
+function string_plural_select($n){
+	return ($n!=0);
+}
+;
+$a->strings["Not Found"] = "Nicht gefunden";
+$a->strings["Page not found."] = "Seite nicht gefunden.";
+$a->strings["Permission denied"] = "Zugriff verweigert";
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["Create a New Account"] = "Neuen Account erstellen";
+$a->strings["Register"] = "Registrieren";
+$a->strings["Nickname or Email address: "] = "Spitzname oder Email-Adresse: ";
+$a->strings["Password: "] = "Passwort: ";
+$a->strings["Login"] = "Anmeldung";
+$a->strings["Nickname/Email/OpenID: "] = "Spitzname/Email/OpenID: ";
+$a->strings["Password (if not OpenID): "] = "Passwort (falls nicht OpenID): ";
+$a->strings["Forgot your password?"] = "Passwort vergessen?";
+$a->strings["Password Reset"] = "Passwort zurücksetzen";
+$a->strings["Logout"] = "Abmelden";
+$a->strings["prev"] = "vorige";
+$a->strings["first"] = "erste";
+$a->strings["last"] = "letzte";
+$a->strings["next"] = "nächste";
+$a->strings["%s likes this."] = "%s mag das.";
+$a->strings["%s doesn't like this."] = "%s mag das nicht.";
+$a->strings["<span  %1\$s>%2\$d people</span> like this."] = "<span  %1\$s>%2\$d Personen</span> mögen das.";
+$a->strings["<span  %1\$s>%2\$d people</span> don't like this."] = "<span  %1\$s>%2\$d Personen</span> mögen das nicht.";
+$a->strings["and"] = "und";
+$a->strings[", and %d other people"] = " und %d andere";
+$a->strings["%s like this."] = "%s mag das.";
+$a->strings["%s don't like this."] = "%s mag das nicht.";
+$a->strings["No contacts"] = "Keine Kontakte";
+$a->strings["Contacts"] = "Kontakte";
+$a->strings["View Contacts"] = "Kontakte anzeigen";
+$a->strings["Search"] = "Suche";
+$a->strings["No profile"] = "Kein Profil";
+$a->strings["Connect"] = "Verbinden";
+$a->strings["Location:"] = "Ort:";
+$a->strings[", "] = ", ";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["January"] = "Januar";
+$a->strings["February"] = "Februar";
+$a->strings["March"] = "März";
+$a->strings["April"] = "April";
+$a->strings["May"] = "Mai";
+$a->strings["June"] = "Juni";
+$a->strings["July"] = "Juli";
+$a->strings["August"] = "August";
+$a->strings["September"] = "September";
+$a->strings["October"] = "Oktober";
+$a->strings["November"] = "November";
+$a->strings["December"] = "Dezember";
+$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
+$a->strings["(Adjusted for local time)"] = "(an die lokale Zeit angepasst)";
+$a->strings["[today]"] = "[heute]";
+$a->strings["link to source"] = "Link zum original Posting";
+$a->strings["Welcome back %s"] = "Willkommen zurück %s";
+$a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
+$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = "(Wähle zwischen verschiedenen Identitäten oder Gemeinschafts/Gruppen Seiten die deine Accountdetails teilen.)";
+$a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten:";
+$a->strings["Submit"] = "Senden";
+$a->strings["Image exceeds size limit of %d"] = "Bildgröße überschreitet das Limit von %d";
+$a->strings["Unable to process image."] = "Konnte das Bild nicht bearbeiten.";
+$a->strings["Wall Photos"] = "Wall Photos";
+$a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
+$a->strings["Administrator"] = "Administrator";
+$a->strings["noreply"] = "noreply";
+$a->strings["New mail received at "] = "New mail received at ";
+$a->strings["%s commented on an item at %s"] = "%s hat einen Beitrag auf %s kommentiert";
+$a->strings["Share"] = "Teilen";
+$a->strings["Upload photo"] = "Foto hochladen";
+$a->strings["Insert web link"] = "Weblink einfügen";
+$a->strings["Insert YouTube video"] = "YouTube Video einfügen";
+$a->strings["Set your location"] = "Deinen Standort festlegen";
+$a->strings["Clear browser location"] = "Browser Standort leeren";
+$a->strings["Please wait"] = "Bitte warten";
+$a->strings["Permission settings"] = "Berechtigungseinstellungen";
+$a->strings["CC: email addresses"] = "CC: EMail Addresse";
+$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
+$a->strings["Private Message"] = "Private Nachricht";
+$a->strings["I like this (toggle)"] = "Ich mag das (toggle)";
+$a->strings["I don't like this (toggle)"] = "Ich mag das nicht (toggle)";
+$a->strings["This is you"] = "Das bist du";
+$a->strings["Delete"] = "Löschen";
+$a->strings["View \$name's profile"] = "Betrachte das Profil von \$name";
+$a->strings["Shared content is covered by the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."] = "Shared content is covered by the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license.";
+$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
+$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.";
+$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
+$a->strings["following"] = "folgen";
+$a->strings["Image uploaded but image cropping failed."] = "Bilder hochgeladen aber das Zuschneiden ist fehlgeschlagen.";
+$a->strings["Profile Photos"] = "Profilbilder";
+$a->strings["Image size reduction [%s] failed."] = "Verkleinern der Bildgröße von [%s] ist gescheitert.";
+$a->strings["Unable to process image"] = "Bild konnte nicht verarbeitet werden";
+$a->strings["Image uploaded successfully."] = "Bild erfolgreich auf den Server geladen.";
+$a->strings["Welcome to %s"] = "Willkommen zu %s";
+$a->strings["Please login."] = "Bitte melde dich an.";
+$a->strings["Registration revoked for %s"] = "Registration für %s wurde zurück gezogen";
+$a->strings["Registration details for %s"] = "Details der Registration von %s";
+$a->strings["Account approved."] = "Account freigegeben.";
+$a->strings["Profile not found."] = "Profil nicht gefunden.";
+$a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["Profile deleted."] = "Profil gelöscht.";
+$a->strings["Profile-"] = "Profil-";
+$a->strings["New profile created."] = "Neues Profil angelegt.";
+$a->strings["Profile unavailable to clone."] = "Profil nicht zum Duplizieren verfügbar.";
+$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "Dies ist dein <strong>öffentliches</strong> Profil.<br />Es <strong>könnte</strong> für jeden Nutzer des Internets sichtbar sein.";
+$a->strings["Age: "] = "Alter: ";
+$a->strings["Profile Image"] = "Profilbild";
+$a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
+$a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
+$a->strings["Password changed."] = "Passwort ändern.";
+$a->strings["Password update failed. Please try again."] = "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal.";
+$a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Namen.";
+$a->strings[" Name too short."] = " Name ist zu kurz.";
+$a->strings[" Not valid email."] = " Keine gültige EMail.";
+$a->strings[" Cannot change to that email."] = " Cannot change to that email.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Plugin Settings"] = "Plugin Einstellungen";
+$a->strings["Account Settings"] = "Account Einstellungen";
+$a->strings["No Plugin settings configured"] = "Keine Erweiterungen konfiguriert";
+$a->strings["OpenID: "] = "OpenID: ";
+$a->strings["&nbsp;(Optional) Allow this OpenID to login to this account."] = "&nbsp;(Optional) Erlaube dieser OpenID sich für diesen Account anzumelden.";
+$a->strings["Profile is <strong>not published</strong>."] = "Profil ist <strong>nicht veröffentlicht</strong>.";
+$a->strings["Default Post Permissions"] = "Grundeinstellung für Veröffentlichungen";
+$a->strings["View in context"] = "Im Zusammenhang betrachten";
+$a->strings["Photo Albums"] = "Fotoalben";
+$a->strings["Contact Photos"] = "Kontaktbilder";
+$a->strings["Contact information unavailable"] = "Kontakt Informationen nicht verfügbar";
+$a->strings["Album not found."] = "Album nicht gefunden.";
+$a->strings["Delete Album"] = "Album löschen";
+$a->strings["Delete Photo"] = "Foto löschen";
+$a->strings["was tagged in a"] = "was tagged in a";
+$a->strings["photo"] = "Foto";
+$a->strings["by"] = "von";
+$a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von ";
+$a->strings["No photos selected"] = "Keine Bilder ausgewählt";
+$a->strings["Upload Photos"] = "Bilder hochladen";
+$a->strings["New album name: "] = "Name des neuen Albums: ";
+$a->strings["or existing album name: "] = "oder existierender Albumname: ";
+$a->strings["Permissions"] = "Berechtigungen";
+$a->strings["Edit Album"] = "Album bearbeiten";
+$a->strings["View Photo"] = "Fotos betrachten";
+$a->strings["Photo not available"] = "Foto nicht verfügbar";
+$a->strings["Edit photo"] = "Foto bearbeiten";
+$a->strings["Use as profile photo"] = "Als Profilbild verwenden";
+$a->strings["View Full Size"] = "Betrachte Originalgröße";
+$a->strings["Tags: "] = "Tags: ";
+$a->strings["[Remove any tag]"] = "[Tag entfernen]";
+$a->strings["New album name"] = "Name des neuen Albums";
+$a->strings["Caption"] = "Bildunterschrift";
+$a->strings["Add a Tag"] = "Tag hinzufügen";
+$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping";
+$a->strings["Recent Photos"] = "Neuste Fotos";
+$a->strings["Upload New Photos"] = "Weitere Fotos hochladen";
+$a->strings["View Album"] = "Album betrachten";
+$a->strings["Item not found."] = "Beitrag nicht gefunden.";
+$a->strings["View \$owner_name's profile"] = "Betrachte das Profil von \$owner_name";
+$a->strings["to"] = "to";
+$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
+$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
+$a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
+$a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
+$a->strings["Please join my network on %s"] = "Bitte trete meinem Netzwerk auf %s bei";
+$a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
+$a->strings["%d message sent."] = array(
+	0 => "%d Nachricht gesendet.",
+	1 => "%d Nachrichten gesendet.",
+);
+$a->strings["Send invitations"] = "Einladungen senden";
+$a->strings["Enter email addresses, one per line:"] = "Email Adressen eingeben, eine pro Zeile:";
+$a->strings["Your message:"] = "Deine Nachricht:";
+$a->strings["Please join my social network on %s"] = "Bitte trete meinem Sozialen Netzwerk auf %s bei";
+$a->strings["To accept this invitation, please visit:"] = "Um diese Einladung anzunehmen beuche bitte:";
+$a->strings["Once you have registered, please connect with me via my profile page at:"] = "Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:";
+$a->strings["Invite Friends"] = "Freunde einladen";
+$a->strings["Connect/Follow"] = "Verbinden/Folgen";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Beispiel: bob@example.com, http://example.com/barbara";
+$a->strings["Follow"] = "Folge";
+$a->strings["Could not access contact record."] = "Konnte nicht auf die Kontaktdaten zugreifen.";
+$a->strings["Could not locate selected profile."] = "Konnte das ausgewählte Profiel nicht finden.";
+$a->strings["Contact updated."] = "Kontakt aktualisiert.";
+$a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdaten fehlgeschlagen.";
+$a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
+$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder frei gegeben";
+$a->strings["Contact has been ignored"] = "Der Kontakt wurde ignoriert";
+$a->strings["Contact has been unignored"] = "Kontakt wurde ignoriert";
+$a->strings["stopped following"] = "wird nicht mehr gefolgt";
+$a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
+$a->strings["Contact not found."] = "Kontakt nicht gefunden.";
+$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
+$a->strings["is a fan of yours"] = "ist ein Fan von dir";
+$a->strings["you are a fan of"] = "du bist Fan von";
+$a->strings["Never"] = "Niemals";
+$a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
+$a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
+$a->strings["Contact Editor"] = "Kontakt Editor";
+$a->strings["Visit \$name's profile"] = "Besuche das Profil von \$name";
+$a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
+$a->strings["Ignore contact"] = "Ignoriere den Kontakt";
+$a->strings["Delete contact"] = "Lösche den Kontakt";
+$a->strings["Last updated: "] = "Letzte Aktualisierung: ";
+$a->strings["Update public posts: "] = "Aktualisierung öffentlicher Nachrichten: ";
+$a->strings["Update now"] = "Jetzt aktualisieren";
+$a->strings["Unblock this contact"] = "Blockade dieses Kontakts aufheben";
+$a->strings["Block this contact"] = "Diesen Kontakt blockieren";
+$a->strings["Unignore this contact"] = "Diesen Kontakt nicht mehr ignorieren";
+$a->strings["Ignore this contact"] = "Diesen Kontakt ignorieren";
+$a->strings["Currently blocked"] = "Derzeit geblockt";
+$a->strings["Currently ignored"] = "Derzeit ignoriert";
+$a->strings["Show Blocked Connections"] = "Zeige geblockte Verbindungen";
+$a->strings["Hide Blocked Connections"] = "Verstecke geblockte Verbindungen";
+$a->strings["Finding: "] = "Funde: ";
+$a->strings["Find"] = "Finde";
+$a->strings["Visit \$username's profile"] = "Besuche das Profil von \$username";
+$a->strings["Edit contact"] = "Kontakt bearbeiten";
+$a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
+$a->strings["Visible to:"] = "Sichtbar für:";
+$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
+$a->strings["Please enter the required information."] = "Bitte trage die erforderlichen Informationen ein.";
+$a->strings["Please use a shorter name."] = "Bitte verwende einen kürzeren Namen.";
+$a->strings["Name too short."] = "Der Name ist zu kurz.";
+$a->strings["That doesn\\'t appear to be your full (First Last) name."] = "Das scheint kein vollständiger Name (Vor und Zuname) zu sein.";
+$a->strings["Your email domain is not among those allowed on this site."] = "Die Domain deiner EMail Adresse ist nicht erlaubt auf dieser Seite.";
+$a->strings["Not a valid email address."] = "Keine gültige EMail Adresse.";
+$a->strings["Cannot use that email."] = "Konnte diese EMail Adresse nicht verwenden.";
+$a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and must also begin with a letter."] = "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen.";
+$a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
+$a->strings["SERIOUS ERROR: Generation of security keys failed."] = "SERIOUS ERROR: Generation of security keys failed.";
+$a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["Registration successful. Please check your email for further instructions."] = "Registration erfolgreich. Eine EMail mit weiteren Anweisungen wurde an dich gesendet.";
+$a->strings["Failed to send email message. Here is the message that failed."] = "Konnte die EMail nicht versenden. Hier ist die Nachricht die nicht gesendet werden konnte.";
+$a->strings["Your registration can not be processed."] = "Deine Registration konnte nicht verarbeitet werden.";
+$a->strings["Registration request at %s"] = "Registrationsanfrage auf %s";
+$a->strings["Your registration is pending approval by the site owner."] = "Deine Registration muss noch vom Betreiber der Seite freigegeben werden.";
+$a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen indem du deine OpenID angibst und 'Registrieren' klickst.";
+$a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus.";
+$a->strings["Your OpenID (optional): "] = "Deine OpenID (optional): ";
+$a->strings["Members of this network prefer to communicate with real people who use their real names."] = "Die Mitglieder dieses Netzwerks ziehen es von mit echten Menschen in Kontakt zu treten die ihre echten Namen verwenden.";
+$a->strings["Include your profile in member directory?"] = "Soll dein Profil im Nutzerverzeichnis angezeigt werden?";
+$a->strings["Yes"] = "Ja";
+$a->strings["No"] = "Nein";
+$a->strings["Registration"] = "Registration";
+$a->strings["Your Full Name (e.g. Joe Smith): "] = "Vollständiger Name (z.B. Joe Smith): ";
+$a->strings["Your Email Address: "] = "Deine EMail Adresse: ";
+$a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein.";
+$a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
+$a->strings["Could not create/connect to database."] = "Konnte die Verbindung zur Datenbank nicht aufbauen bzw. die Datenbank anlegen.";
+$a->strings["Connected to database."] = "Mit der Datenbank verbunden.";
+$a->strings["Database import succeeded."] = "Import der Datenbank erfolgreich.";
+$a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen cron Job (o.ä.) für den Poller einrichten.";
+$a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
+$a->strings["Database import failed."] = "Import der Datenbank schlug fehl.";
+$a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
+$a->strings["Welcome to Friendika."] = "Willkommen bei Friendika.";
+$a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
+$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "Diese wird von Friendika benötigt. Bitte passe die Konfigurationsdatei .htconfig.php entsprechend an.";
+$a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
+$a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
+$a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Fehler: Die \"openssl_pkey_new\" Funktion auf diesem System ist nicht in der lage Verschlüsselungsschlüssel zu erzeugen";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Wenn der Server unter Windows läuft, schau dir bitte \"http://www.php.net/manual/en/openssl.installation.php\" an.";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD Graphikmodul für PHP mit JPEG Unterstützung ist nicht installiert.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl Modul von PHP ist nict installiert.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli Modul von PHP ist nicht installiert.";
+$a->strings["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."] = "Der Installationswizzard muss in der Lage sein eine Datei im Stammverzeichnis deines Webservers anzuliegen ist allerdings derzeit nicht in der Lage dies zu tun.";
+$a->strings["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."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
+$a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support Team um diese Situations zu beheben.";
+$a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Sollte dies nicht möglich sein musst du die Installation manuell durchführen. Lies dazu bitte in der Datei \"INSTALL.txt\".";
+$a->strings["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."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner Friendika Installation zu erzeugen.";
+$a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten wärend der Erzeugung der Datenbank Tabellen.";
+$a->strings["Normal View"] = "Normale Ansicht";
+$a->strings["New Item View"] = "Neue Einträge";
+$a->strings["No such group"] = "Es gibt keine solche Gruppe";
+$a->strings["Group is empty"] = "Gruppe ist leer";
+$a->strings["Group: "] = "Gruppe: ";
+$a->strings["Invalid request identifier."] = "Invalid request identifier.";
+$a->strings["Discard"] = "Verwerfen";
+$a->strings["Ignore"] = "Ignorieren";
+$a->strings["Show Ignored Requests"] = "Zeige ignorierte Anfragen";
+$a->strings["Hide Ignored Requests"] = "Verberge ignorierte Anfragen";
+$a->strings["Claims to be known to you: "] = "Behauptet dich zu kennen: ";
+$a->strings["yes"] = "ja";
+$a->strings["no"] = "nein";
+$a->strings["Approve as: "] = "Genehmigen als: ";
+$a->strings["Friend"] = "Freund";
+$a->strings["Fan/Admirer"] = "Fan/Verehrer";
+$a->strings["Notification type: "] = "Benachrichtigungs Typ: ";
+$a->strings["Friend/Connect Request"] = "Kontakt-/Freundschaftsanfrage";
+$a->strings["New Follower"] = "Neuer Bewunderer";
+$a->strings["Approve"] = "Genehmigen";
+$a->strings["No notifications."] = "Keine Benachrichtigungen.";
+$a->strings["No registrations."] = "Keine Neuanmeldungen.";
+$a->strings["This introduction has already been accepted."] = "Diese Vorstellung wurde bereits abgeschlossen.";
+$a->strings["Profile location is not valid or does not contain profile information."] = "Profil Adresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
+$a->strings["Warning: profile location has no identifiable owner name."] = "Warning: profile location has no identifiable owner name.";
+$a->strings["Warning: profile location has no profile photo."] = "Warning: profile location has no profile photo.";
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "",
+);
+$a->strings["Introduction complete."] = "Vorstellung abgeschlossen.";
+$a->strings["Unrecoverable protocol error."] = "Nicht behebbarer Protokollfehler.";
+$a->strings["Profile unavailable."] = "Profil nicht verfügbar.";
+$a->strings["%s has received too many connection requests today."] = "%s hat heute zu viele Freundschaftsanfragen erhalten.";
+$a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
+$a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten es in 24 Stunden erneut zu versuchen.";
+$a->strings["Invalid locator"] = "Ungültiger Locator";
+$a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
+$a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
+$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits ein Freund von %s bist.";
+$a->strings["Invalid profile URL."] = "Ungültige Profil URL.";
+$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil URL.";
+$a->strings["Your introduction has been sent."] = "Deine Vorstellung wurde abgeschickt.";
+$a->strings["Please login to confirm introduction."] = "Bitte melde dich an um die Vorstellung zu bestätigen.";
+$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
+$a->strings["[Name Withheld]"] = "[Name Zurückgehalten]";
+$a->strings["Introduction received at "] = "Vorstellung erhalten auf";
+$a->strings["Friend/Connection Request"] = "Freundschafts/Kontakt Anfrage";
+$a->strings["Please answer the following:"] = "Bitte beantworte folgende Fragen:";
+$a->strings["Does \$name know you?"] = "Kennt \$name dich?";
+$a->strings["Add a personal note:"] = "Eine persönliche Notiz anfügen:";
+$a->strings["Please enter your profile address from one of the following supported social networks:"] = "Bitte gib deine Profil Adresse von einem der unterstützten Sozialen Netzwerken an:";
+$a->strings["Friendika"] = "Friendika";
+$a->strings["StatusNet/Federated Social Web"] = "StatusNet/Federated Social Web";
+$a->strings["Private (secure) network"] = "Privates (sicheres) Netzwerk";
+$a->strings["Public (insecure) network"] = "Öffentliches (unsicheres) Netzwerk";
+$a->strings["Your profile address:"] = "Deine Profiladresse:";
+$a->strings["Submit Request"] = "Anfrage abschicken";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["status"] = "Status";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
+$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s nicht";
+$a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten";
+$a->strings["Remove My Account"] = "Account löschen";
+$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit ihn wiederherzustellen.";
+$a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:";
+$a->strings["Applications"] = "Anwendungen";
+$a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Unable to locate original post."] = "Konnte das original Posting nicht finden.";
+$a->strings["Empty post discarded."] = "Leere Nachricht wurde verworfen.";
+$a->strings["%s commented on your item at %s"] = "%s hat einen deiner Beiträge auf %s kommentiert";
+$a->strings["%s posted on your profile wall at %s"] = "%s hat etwas auf deiner Pinnwand bei %s gepostet";
+$a->strings["System error. Post not saved."] = "Systemfehler. Nachricht konnte nicht gespeichert werden.";
+$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "Diese Nachricht wurde dir von %s gesendet, einem Mitglied des Sozialen Netzwerks Friendika";
+$a->strings["You may visit them online at"] = "Du kannst sie online besuchen unter ";
+$a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "Please contact the sender by replying to this post if you do not wish to receive these messages.";
+$a->strings["%s posted an update."] = "%s hat ein Update gepostet.";
+$a->strings["Tag removed"] = "Tag entfernt";
+$a->strings["Remove Item Tag"] = "Gegenstands Tag entfernen";
+$a->strings["Select a tag to remove: "] = "Wähle ein Tag zum Entfernen aus: ";
+$a->strings["Remove"] = "Entfernen";
+$a->strings["No recipient selected."] = "Kein Empfänger gewählt.";
+$a->strings["[no subject]"] = "[kein Betreff]";
+$a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden.";
+$a->strings["Message sent."] = "Nachricht gesendet.";
+$a->strings["Message could not be sent."] = "Nachricht konnte nicht gesendet werden.";
+$a->strings["Messages"] = "Nachrichten";
+$a->strings["Inbox"] = "Eingang";
+$a->strings["Outbox"] = "Ausgang";
+$a->strings["New Message"] = "Neue Nachricht";
+$a->strings["Message deleted."] = "Nachricht gelöscht.";
+$a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
+$a->strings["Send Private Message"] = "Private Nachricht senden";
+$a->strings["To:"] = "An:";
+$a->strings["Subject:"] = "Betreff:";
+$a->strings["No messages."] = "Keine Nachrichten.";
+$a->strings["Delete conversation"] = "Unterhaltung löschen";
+$a->strings["Message not available."] = "Nachricht nicht verfügbar.";
+$a->strings["Delete message"] = "Nachricht löschen";
+$a->strings["Send Reply"] = "Antwort senden";
+$a->strings["Response from remote site was not understood."] = "Antwort der entfernten Gegenstelle unverständlich.";
+$a->strings["Unexpected response from remote site: "] = "Unerwartete Antwort der Gegenstelle: ";
+$a->strings["Confirmation completed successfully."] = "Bestätigung erfolgreich abgeschlossen.";
+$a->strings["Remote site reported: "] = "Entfernte Seite meldet: ";
+$a->strings["Temporary failure. Please wait and try again."] = "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal.";
+$a->strings["Introduction failed or was revoked."] = "Vorstellung schlug fehl oder wurde zurück gezogen.";
+$a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
+$a->strings["is now friends with"] = "ist jetzt ein(e) Freund(in) von";
+$a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
+$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsslungsschlüssel unserer Seite ist anscheinend im Arsch.";
+$a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
+$a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
+$a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte versuche es noch einmal.";
+$a->strings["Unable to set your contact credentials on our system."] = "Deine Kontaktreferenzen konnten nicht in unserm System gespeichert werden.";
+$a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
+$a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert";
+$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
+$a->strings["Welcome back "] = "Willkommen zurück ";
+$a->strings["%s welcomes %s"] = "%s heist %s herzlich willkommen";
+$a->strings["No contacts."] = "Keine Kontakte.";
+$a->strings["Group created."] = "Gruppe erstellt.";
+$a->strings["Could not create group."] = "Konnte die Gruppe nicht erstellen.";
+$a->strings["Group not found."] = "Gruppe nicht gefunden.";
+$a->strings["Group name changed."] = "Gruppenname geändert.";
+$a->strings["Membership list updated."] = "Mitgliedsliste aktualisiert.";
+$a->strings["Group removed."] = "Gruppe entfernt.";
+$a->strings["Unable to remove group."] = "Konnte die Gruppe nicht entfernen.";
+$a->strings["Post to Twitter"] = "Nach Twitter senden";
+$a->strings["Twitter Posting Settings"] = "Twitter Posting Einstellungen";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
+$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf dieser Friendika Instanz wurde das Twitter Plugin aktiviert dein Account ist allerdings noch nicht mit einem Twitter Account verbunden. Um deinen Account mit Twitter zu verbinden, klick auf den Button weiter unten und gib die PIN die du auf Twitter erhälst hier ein. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten auf Twitter veröffentlicht.";
+$a->strings["Log in with Twitter"] = "bei Twitter anmelden";
+$a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter PIN hier her";
+$a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
+$a->strings["If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well."] = "Wenn dies aktiviert ist, werden alle deine <strong>öffentlichen</strong> Nachricten auch auf dem verbundenen Twitter Account veröffentlicht.";
+$a->strings["Send public postings to Twitter"] = "Veröffentliche öffentliche Nachrichten auf Twitter";
+$a->strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
+$a->strings["Post to StatusNet"] = "Nach StatusNet senden";
+$a->strings["StatusNet Posting Settings"] = "StatusNet Posting Einstellungen";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation."] = "Kein OAuth Consumer Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendika Account als Desktopapplikation und trage hier den OAuth Consumer Schlüssel, das Geheimnis und die Basis-URL der StatusNet API ein.<br />Bevor du eine neue Anwendung registrierst, kannst du auch erstmal den Admin deiner Friendika Seite fragen, ob es für deine bevorzugte StatusNet Instanz eventuell bereits ein OAuth Schlüsselpaar gibt.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Schlüssel";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Geheimnis";
+$a->strings["Base API Path (remember the trailing /)"] = "Basis-URL der StatusNet API (vergiss den abschließenden / nicht)";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Um deinen Account mit einem StatusNet Account zu verknüpfen klicke den Button an um einen Sicherheitscode von StatusNet zu erhalten und kopiere diesen in die Eingabebox weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten bei StatusNet veröffentllicht.";
+$a->strings["Log in with StatusNet"] = "Bei StatusNet anmelden";
+$a->strings["Copy the security code from StatusNet here"] = "Kopiere den Sicherheitscode von StatusNet hier her";
+$a->strings["If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well."] = "Wenn dies aktiviert ist, werden alle deine <strong>öffentlichen</strong> Nachricten auch auf dem verbundenen StatusNet Account veröffentlicht.";
+$a->strings["Send public postings to StatusNet"] = "Veröffentliche öffentliche Nachrichten auf StatusNet";
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Neues Spiel";
+$a->strings["New game with handicap"] = "Neues Handicap Spiel";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Drei dimensionales Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf mehreren Ebenen gleichzeitig spielt.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt.";
+$a->strings["You go first..."] = "Du fängst an...";
+$a->strings["I'm going first this time..."] = "Diesmal fange ich an...";
+$a->strings["You won!"] = "Du gewinnst!";
+$a->strings["\"Cat\" game!"] = "Unentschieden!";
+$a->strings["I won!"] = "Ich gewinne!";
+$a->strings["Select files to upload: "] = "Wähle Dateien zum Upload aus: ";
+$a->strings["Use the following controls only if the Java uploader [above] fails to launch."] = "Verwende die folgenden Kontrollen nur, wenn der Java Uploader [oben] nicht funktioniert.";
+$a->strings["Facebook disabled"] = "Facebook deaktiviert";
+$a->strings["Facebook API key is missing."] = "Facebook API Schlüssel nicht gefunden";
+$a->strings["Facebook Connect"] = "Mit Facebook verbinden";
+$a->strings["Install Facebook post connector"] = "Facebook Versnd installieren";
+$a->strings["Remove Facebook post connector"] = "Facebook versand deinstallieren";
+$a->strings["Post to Facebook by default"] = "Sende standardmäßig nach Facebook";
+$a->strings["Facebook"] = "Facebook";
+$a->strings["Facebook Connector Settings"] = "Facebook Verbindungseinstellungen";
+$a->strings["Post to Facebook"] = "Zu Facebook posten";
+$a->strings["Image: "] = "Bild";
+$a->strings["Randplace Settings"] = "Randplace Einstellungen";
+$a->strings["Enable Randplace Plugin"] = "Randplace Erweiterung aktivieren";
+$a->strings["Upload a file"] = "Datei hochladen";
+$a->strings["Drop files here to upload"] = "Ziehe die Dateien hier her die du hochladen willst";
+$a->strings["Failed"] = "Fehlgeschlagen";
+$a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
+$a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
+$a->strings["Uploaded file is too large"] = "Hochgeladene Datei ist zu groß";
+$a->strings["File has an invalid extension, it should be one of "] = "Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten";
+$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
+$a->strings["Block immediately"] = "Sofort blockieren";
+$a->strings["Shady, spammer, self-marketer"] = "Zwielichtig, Spammer, Selbstdarsteller";
+$a->strings["Known to me, but no opinion"] = "Ist mir bekannt, hab aber keine Meinung";
+$a->strings["OK, probably harmless"] = "OK, wahrscheinlich harmlos";
+$a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen";
+$a->strings["Frequently"] = "Häufig";
+$a->strings["Hourly"] = "Stündlich";
+$a->strings["Twice daily"] = "Zweimal Täglich";
+$a->strings["Daily"] = "Täglich";
+$a->strings["Weekly"] = "Wöchendlich";
+$a->strings["Monthly"] = "Monatlich";
+$a->strings["Male"] = "Männlich";
+$a->strings["Female"] = "Weiblich";
+$a->strings["Currently Male"] = "Momentan Männlich";
+$a->strings["Currently Female"] = "Momentan Weiblich";
+$a->strings["Mostly Male"] = "Hauptsächlich Männlich";
+$a->strings["Mostly Female"] = "Hauptsächlich Weiblich";
+$a->strings["Transgender"] = "Transgender";
+$a->strings["Intersex"] = "Intersex";
+$a->strings["Transsexual"] = "Transsexuel";
+$a->strings["Hermaphrodite"] = "Hermaphrodit";
+$a->strings["Neuter"] = "Neuter";
+$a->strings["Non-specific"] = "Nicht spezifiziert";
+$a->strings["Other"] = "Andere";
+$a->strings["Undecided"] = "Unentschieden";
+$a->strings["Males"] = "Männer";
+$a->strings["Females"] = "Frauen";
+$a->strings["Gay"] = "Schwul";
+$a->strings["Lesbian"] = "Lesbisch";
+$a->strings["No Preference"] = "Keine Vorlieben";
+$a->strings["Bisexual"] = "Bisexuel";
+$a->strings["Autosexual"] = "Autosexual";
+$a->strings["Abstinent"] = "Abstinent";
+$a->strings["Virgin"] = "Jungfrau";
+$a->strings["Deviant"] = "Deviant";
+$a->strings["Fetish"] = "Fetish";
+$a->strings["Oodles"] = "Oodles";
+$a->strings["Nonsexual"] = "Nonsexual";
+$a->strings["Single"] = "Single";
+$a->strings["Lonely"] = "Einsam";
+$a->strings["Available"] = "Verfügbar";
+$a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Dating"] = "Dating";
+$a->strings["Unfaithful"] = "Untreu";
+$a->strings["Sex Addict"] = "Sex Besessen";
+$a->strings["Friends"] = "Freunde";
+$a->strings["Friends/Benefits"] = "Friends/Benefits";
+$a->strings["Casual"] = "Casual";
+$a->strings["Engaged"] = "Verlobt";
+$a->strings["Married"] = "Verheiratet";
+$a->strings["Partners"] = "Partner";
+$a->strings["Cohabiting"] = "kohabitierend";
+$a->strings["Happy"] = "Glücklich";
+$a->strings["Not Looking"] = "Nicht auf der Suche";
+$a->strings["Swinger"] = "Swinger";
+$a->strings["Betrayed"] = "Betrogen";
+$a->strings["Separated"] = "Getrennt";
+$a->strings["Unstable"] = "Unstabil";
+$a->strings["Divorced"] = "Geschieden";
+$a->strings["Widowed"] = "Verwidwet";
+$a->strings["Uncertain"] = "Unsicher";
+$a->strings["Complicated"] = "Kompliziert";
+$a->strings["Don't care"] = "Ist mir nicht wichtig";
+$a->strings["Ask me"] = "Frag mich";
+$a->strings["Visible To:"] = "Sichtbar für:";
+$a->strings["Groups"] = "Gruppen";
+$a->strings["Except For:"] = "Abgesehen von:";
+$a->strings["Logged out."] = "Abgemeldet.";
+$a->strings["Miscellaneous"] = "Verschiedenes";
+$a->strings["less than a second ago"] = "vor weniger als einer Sekunde";
+$a->strings["year"] = "Jahr";
+$a->strings["years"] = "Jahre";
+$a->strings["month"] = "Monat";
+$a->strings["months"] = "Monate";
+$a->strings["week"] = "Woche";
+$a->strings["weeks"] = "Wochen";
+$a->strings["day"] = "Tag";
+$a->strings["days"] = "Tage";
+$a->strings["hour"] = "Stunde";
+$a->strings["hours"] = "Stunden";
+$a->strings["minute"] = "Minute";
+$a->strings["minutes"] = "Minuten";
+$a->strings["second"] = "Sekunde";
+$a->strings["seconds"] = "Sekunden";
+$a->strings[" ago"] = " her";
+$a->strings["Home"] = "Persönlich";
+$a->strings["Apps"] = "Apps";
+$a->strings["Directory"] = "Verzeichnis";
+$a->strings["Network"] = "Netzwerk";
+$a->strings["Notifications"] = "Benachrichtigungen";
+$a->strings["Manage"] = "Verwalten";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Profiles"] = "Profile";
+$a->strings["Birthday:"] = "Geburtstag:";
+$a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
+$a->strings["Create a new group"] = "Neue Gruppe erstellen";
+$a->strings["Everybody"] = "Alle Kontakte";
+$a->strings["Embedding disabled"] = "Einbettungen deaktiviert";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln.";
+$a->strings["Status"] = "Status";
+$a->strings["Profile"] = "Profil";
+$a->strings["Photos"] = "Bilder";
+$a->strings["Please enter a link URL:"] = "Bitte gib die URL des Links ein:";
+$a->strings["Please enter a YouTube link:"] = "Bitte gebe den YouTube Link ein:";
+$a->strings["Please enter a video(.ogg) link/URL:"] = "Bitte gebe den Link zum Video(.ogg) an:";
+$a->strings["Please enter an audio(.ogg) link/URL:"] = "Bitte gebe den Link zum Audio(.ogg) an:";
+$a->strings["Where are you right now?"] = "Wo hälst du dich jetzt gerade auf?";
+$a->strings["Enter a title for this item"] = "Gib den Titel für diesen Beitrag ein";
+$a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
+$a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";
+$a->strings["Set title"] = "Titel setzen";
+$a->strings["See all %d comments"] = "Alle %d Kommentare anzeigen";
+$a->strings["Edit"] = "Bearbeiten";
+$a->strings["This is Friendika version"] = "Dies ist Friendika Version";
+$a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist";
+$a->strings["Shared content within the Friendika network is provided under the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>"] = "Geteilte Inhalte innerhalb des Friendika Netzwerks sind unter der <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a> verfügbar";
+$a->strings["Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn more about the Friendika project."] = "Bitte besuche <a href=\"http://project.friendika.com\">Project.Friendika.com</a> um mehr über Friendika zu erfahren.";
+$a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - dot com"] = "Vorschläge, Lobeshymnen, Spenden usw. - bitte eine Email an \"Info\" at Friendika - dot com (englisch bevorzugt)";
+$a->strings["Installed plugins/addons/apps"] = "Installierte Plugins/Erweiterungen/Apps";
+$a->strings["No installed plugins/addons/apps"] = "Keine Plugins/Erweiterungen/Apps installiert";
+$a->strings["Proceed with Installation"] = "Mit der Installation fortfahren";
+$a->strings["Your Friendika site database has been installed."] = "Die Datenbank deiner Friendika Seite wurde erfolgreich installiert.";
+$a->strings["Proceed to registration"] = "Mit der Registration fortfahren";
+$a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine Email.";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert.";
+$a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesand.";
+$a->strings["Nickname or Email: "] = "Spitzname oder Email:";
+$a->strings["Reset"] = "Zurücksetzen";
+$a->strings["Pending Friend/Connect Notifications"] = "Anstehende Freundschafts/Kontakt Benachrichtigungen";
+$a->strings["User registrations waiting for confirm"] = "Neuanmeldungen die auf deine Bestätigung warten";
+$a->strings["That doesn't appear to be your full (First Last) name."] = "Das scheint nicht dein kompletter Name (Vor- und Nachname) zu sein.";
+$a->strings["<< Prev"] = "<< Vorherige";
+$a->strings["Next >>"] = "Nächste >>";
+$a->strings["Site Directory"] = "Verzeichnis";
+$a->strings["Gender: "] = "Geschlecht:";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
+$a->strings["Normal Account"] = "Normaler Account";
+$a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil";
+$a->strings["Soapbox Account"] = "Sandkasten Accunt";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Freundschaftsanfragen werden automatisch als Nurlese-Fans akzeptiert";
+$a->strings["Community/Celebrity Account"] = "Gemeinschafts/Berühmtheiten Account";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Freundschaftsanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert";
+$a->strings["Automatic Friend Account"] = "Automatischer Freundes Account";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Freundschaftsanfragen werden automatisch als Freund akzeptiert";
+$a->strings["Export Personal Data"] = "Perönliche Daten exportieren";
+$a->strings["No results."] = "Keine Ergebnisse.";
+$a->strings["Crop Image"] = "Bild Zurechtschneiden";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bitte den Bildausschnitt an damit das Bild optimal dargestellt werden kann.";
+$a->strings["Done Editing"] = "Bearbeitung abgeschlossen";
+$a->strings["Profile Match"] = "Profil Übereinstimmungen";
+$a->strings["No matches"] = "Keine Übereinstimmungen";
+$a->strings["Create a group of contacts/friends."] = "Eine Gruppe von Kontakten/Freunden anlegen.";
+$a->strings["Group Name: "] = "Gruppen Name:";
+$a->strings["Group Editor"] = "Gruppen Editor";
+$a->strings["Members:"] = "Mitglieder:";
+$a->strings["Find People With Shared Interests"] = "Finde Personen die deine Interessen teilen";
+$a->strings["Privacy Unavailable"] = "Privatsphäre nicht verfügbar";
+$a->strings["Private communications are not available for this contact."] = "Private Kommunikation ist für diesen Kontakt nicht verfügbar.";
+$a->strings["Post successful."] = "Erfolgreich gesendet.";
+$a->strings["%d member"] = array(
+	0 => "%d Mitglied",
+	1 => "%d Mitglieder",
+);
+$a->strings["Warning: This group contains %s from an insecure network."] = "Warnung: Diese Gruppe beinhaltet %s aus einem unsicheren Netzwerk.";
+$a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten.";
+$a->strings["See more posts like this"] = "Mehr Beiträge wie diesen anzeigen";
+$a->strings["D, d M Y - g:i A"] = "g A l F d";
+$a->strings["Welcome home %s."] = "Willkommen zurück %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Vorstellung/Verbindungs Anfrage bei %s.";
+$a->strings["Confirm"] = "Bestätigen";
+$a->strings["Item not found"] = "Beitrag nicht gefunden";
+$a->strings["Edit post"] = "Beitrag bearbeiten";
+$a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
+$a->strings["Comment"] = "Kommentar";
+$a->strings["%d Contact"] = array(
+	0 => "%d Kontakt",
+	1 => "%d Kontakte",
+);
+$a->strings["g A l F d"] = "g A l F d";
+$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
+$a->strings["View status"] = "Status anzeigen";
+$a->strings["View profile"] = "Profil anzeigen";
+$a->strings["View photos"] = "Fotos ansehen";
+$a->strings["Send PM"] = "Private Nachricht senden";
+$a->strings["Full Name:"] = "Kompletter Name:";
+$a->strings["j F, Y"] = "j F, Y";
+$a->strings["j F"] = "j F";
+$a->strings["Age:"] = "Alter:";
+$a->strings["<span class=\"heart\">&hearts;</span> Status:"] = "<span class=\"heart\">&hearts;</span> Bezieungsstatus:";
+$a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:";
+$a->strings["Policial Views:"] = "Politische Ansichten:";
+$a->strings["Religion:"] = "Religion:";
+$a->strings["About:"] = "Über:";
+$a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:";
+$a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:";
+$a->strings["Musical interests:"] = "Musikalische Interessen:";
+$a->strings["Books, literature:"] = "Literatur/Bücher:";
+$a->strings["Television:"] = "Fernsehen:";
+$a->strings["Film/dance/culture/entertainment:"] = "Filme/Tänze/Kultur/Unterhaltung:";
+$a->strings["Love/Romance:"] = "Liebesleben:";
+$a->strings["Work/employment:"] = "Arbeit/Beschäftigung:";
+$a->strings["School/education:"] = "Schule/Ausbildung:";
+$a->strings["Hide my contact/friend list from viewers of this profile?"] = "Verberge meine Kontakte/Freunde von Betrachtern dieses Profils?";
+$a->strings["Edit Profile Details"] = "Profil bearbeiten";
+$a->strings["View this profile"] = "Dieses Profil anzeigen";
+$a->strings["Create a new profile using these settings"] = "Neues Profil anlegen und diese Einstellungen verwenden";
+$a->strings["Clone this profile"] = "Dieses Profil dublizieren";
+$a->strings["Delete this profile"] = "Dieses Profil löschen";
+$a->strings["Profile Name:"] = "Profilname:";
+$a->strings["Your Full Name:"] = "Dein kompletter Name:";
+$a->strings["Title/Description:"] = "Titel/Beschreibung:";
+$a->strings["Your Gender:"] = "Dein Geschlecht:";
+$a->strings["Birthday (y/m/d):"] = "Geburtstag (y/m/d):";
+$a->strings["Street Address:"] = "Adresse:";
+$a->strings["Locality/City:"] = "Wohnort/Stadt:";
+$a->strings["Postal/Zip Code:"] = "Postleitzahl:";
+$a->strings["Country:"] = "Land:";
+$a->strings["Region/State:"] = "Region/Bundesstaat:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Beziehungs Status:";
+$a->strings["Who: (if applicable)"] = "Wer: (falls anwendbar)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiel: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Homepage URL:"] = "Adresse der Homepage:";
+$a->strings["Political Views:"] = "Politische Ansichten:";
+$a->strings["Religious Views:"] = "Religiöse Ansichten:";
+$a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
+$a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
+$a->strings["Example: fishing photography software"] = "Beispiel: Fischen Photographie Software";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
+$a->strings["Tell us about yourself..."] = "Erzähle und ein bisschen von dir...";
+$a->strings["Hobbies/Interests"] = "Hobbies/Interessen";
+$a->strings["Contact information and Social Networks"] = "Kontaktinformationen und Soziale Netzwerke";
+$a->strings["Musical interests"] = "Musikalische Interessen";
+$a->strings["Books, literature"] = "Literatur/Bücher";
+$a->strings["Television"] = "Fernsehen";
+$a->strings["Film/dance/culture/entertainment"] = "Filme/Tänze/Kultur/Unterhaltung";
+$a->strings["Love/romance"] = "Liebesleben";
+$a->strings["Work/employment"] = "Arbeit/Beschäftigung";
+$a->strings["School/education"] = "Schule/Ausbildung";
+$a->strings["Change profile photo"] = "Profilbild ändern";
+$a->strings["Create New Profile"] = "Neues Profil anlegen";
+$a->strings["Friendika Social Network"] = "Friendika Soziales Netzwerk";
+$a->strings["Installation"] = "Installation";
+$a->strings["In order to install Friendika we need to know how to contact your database."] = "Um Friendika installieren zu können müssen wir wissen, wie wir die Datenbank erreichen können.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Bitte kontaktiere den Hosting Provider oder den Administrator der Seite falls du Fragen zu diesen Einstellungen haben solltest.";
+$a->strings["The database you specify below must already exist. If it does not, please create it before continuing."] = "Die Datenbank die du hier angibst muss bereits existieren. Wenn dies noch nicht der Fall ist lege sie bitte an bevor du fortfährst.";
+$a->strings["Database Server Name"] = "Datenbank Server";
+$a->strings["Database Login Name"] = "Datenbank Nutzer";
+$a->strings["Database Login Password"] = "Datenbank Passwort";
+$a->strings["Database Name"] = "Datenbank Name";
+$a->strings["Please select a default timezone for your website"] = "Bitte wähle die standard Zeitzone deiner Webseite";
+$a->strings["Your password has been reset as requested."] = "Dein Passwort wurde wie gewünscht zurück gesetzt.";
+$a->strings["Your new password is"] = "Dein neues Passwort lautet";
+$a->strings["Save or copy your new password - and then"] = "Speichere oder kopiere dein neues Passwort - und dann";
+$a->strings["click here to login"] = "hier klicken um dich anzumelden";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort unter den <em>Einstellungen</em> ändern sobald du dich erfolgreich angemeldet hast.";
+$a->strings["Deny"] = "Verwehren";
+$a->strings["Publish your default profile in site directory?"] = "Dein Standard-Profil im Verzeichnis dieser Seite veröffentliche?";
+$a->strings["Publish your default profile in global social directory?"] = "Dein Standard-Profil im weltweiten Verzeichnis veröffentlichen?";
+$a->strings["or"] = " oder ";
+$a->strings["Your profile address is"] = "Deine Profiladresse lautet";
+$a->strings["Basic Settings"] = "Grundeinstellungen";
+$a->strings["Email Address:"] = "Email Adresse:";
+$a->strings["Your Timezone:"] = "Deine Zeitzone:";
+$a->strings["Default Post Location:"] = "Standardstandort:";
+$a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:";
+$a->strings["Display Theme:"] = "Theme:";
+$a->strings["Security and Privacy Settings"] = "Sicherheits und Privatsphären Einstellungen";
+$a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:";
+$a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)";
+$a->strings["Allow friends to post to your profile page:"] = "Erlaube es Freunden Beiträge auf deiner Pinnwand zu posten:";
+$a->strings["Automatically expire (delete) posts older than"] = "Automatisch Beiträge verfallen lassen (löschen) die älter sind als";
+$a->strings["Notification Settings"] = "Benachrichtigungs Einstellungen";
+$a->strings["Send a notification email when:"] = "Benachrichtigungs-Email senden wenn:";
+$a->strings["You receive an introduction"] = "Du eine Vorstellung erhälst";
+$a->strings["Your introductions are confirmed"] = "Eine deiner Vorstellungen angenommen wurde";
+$a->strings["Someone writes on your profile wall"] = "Jemand etwas auf deiner Pinnwand postet";
+$a->strings["Someone writes a followup comment"] = "Jemand einen Kommentar verfasst";
+$a->strings["You receive a private message"] = "Du eine private Nachricht erhälst";
+$a->strings["Password Settings"] = "Passwort Einstellungen";
+$a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer außer du willst das Passwort ändern";
+$a->strings["New Password:"] = "Neues Passwort:";
+$a->strings["Confirm:"] = "Bestätigen:";
+$a->strings["Advanced Page Settings"] = "Erweiterte Seiten Einstellungen";
+$a->strings["Upload File:"] = "Datei hochladen:";
+$a->strings["Upload Profile Photo"] = "Profilbild hochladen";
+$a->strings["Upload"] = "Hochladen";
+$a->strings["select a photo from your photo albums"] = "wähle ein Foto von deinen Fotoalben";
+$a->strings["Profile Visibility"] = "Profil Anzeige";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeitgt werden soll, wenn %s dein Profil aufruft.";
+$a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
+$a->strings["Online Reputation"] = "Online Ruf";
+$a->strings["Occasionally your friends may wish to inquire about this person's online legitimacy."] = "Es könnte sein, dass deine Freunde etwas über den Ruf einer Peron erfahren möchten.";
+$a->strings["You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them."] = "Du kannst ihnen bei der Entscheidung helfen ob sie mit einer Person interagieren sollten oder nicht indem du Informationen über den <em>Ruf</em>  der Person anbietest.";
+$a->strings["Please take a moment to elaborate on this selection if you feel it could be helpful to others."] = "Bitte nimm dir einen Moment und fülle diesen Punkt aus wenn du denkst das es anderen helfen könnte.";
diff --git a/view/en/install_db.tpl b/view/en/install_db.tpl
deleted file mode 100644
index c413689c2..000000000
--- a/view/en/install_db.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installation</h3>
-
-<p>
-In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Database Name</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Please select a default timezone for your website
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-<div id="install-end" ></div>
-
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
deleted file mode 100644
index 6d2ecba4d..000000000
--- a/view/en/profile_advanced.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Full Name:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Gender:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Birthday:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">' 
-	. ((intval($a->profile['dob'])) 
-		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
-		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
-	. "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
-	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexual Preference:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
-	$homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Political Views:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">About:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musical interests:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Books, literature:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Television:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Love/romance:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Work/employment:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">School/education:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-EOT;
-}
-
-
diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl
deleted file mode 100644
index 6c7d74daf..000000000
--- a/view/en/profile_edit.tpl
+++ /dev/null
@@ -1,299 +0,0 @@
-<h1>Edit Profile Details</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Tell us about yourself... 
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Hobbies/Interests 
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Contact information and Social Networks 
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Musical interests 
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-Books, literature 
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-Television 
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Film/dance/culture/entertainment 
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-Love/romance 
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Work/employment 
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-School/education 
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
\ No newline at end of file
diff --git a/view/en/profile_entry_default.tpl b/view/en/profile_entry_default.tpl
deleted file mode 100644
index 651199918..000000000
--- a/view/en/profile_entry_default.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
diff --git a/view/en/profile_listing_header.tpl b/view/en/profile_listing_header.tpl
deleted file mode 100644
index d4b139a69..000000000
--- a/view/en/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>Profiles</h1>
-<p id="profile-listing-desc" >
-<a href="profile_photo" >Change profile photo</a>
-</p>
-<div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a>
-</div>
-
diff --git a/view/en/pwdreset.tpl b/view/en/pwdreset.tpl
deleted file mode 100644
index dd609f061..000000000
--- a/view/en/pwdreset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>Password Reset</h3>
-
-<p>
-Your password has been reset as requested.
-</p>
-<p>
-Your new password is
-</p>
-<p>
-$newpass
-</p>
-<p>
-Save or copy your new password - and then <a href="$baseurl" >click here to login</a>.
-</p>
-<p>
-Your password may be changed from the 'Settings' page after successful login.
\ No newline at end of file
diff --git a/view/en/registrations.tpl b/view/en/registrations.tpl
deleted file mode 100644
index c8646043e..000000000
--- a/view/en/registrations.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>
diff --git a/view/fr/contact_edit.tpl b/view/fr/contact_edit.tpl
deleted file mode 100644
index d74ac54f3..000000000
--- a/view/fr/contact_edit.tpl
+++ /dev/null
@@ -1,83 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
-	<div id="contact-edit-photo-wrapper" >
-		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-		<div id="contact-edit-photo" >
-			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
-		</div>
-		<div id="contact-edit-photo-end" ></div>
-	</div>
-	<div id="contact-edit-nav-wrapper" >
-
-		<div id="contact-edit-links" >
-			<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
-			<a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
-		</div>
-		<div id="contact-drop-links" >
-			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
-		</div>
-		<div id="contact-edit-nav-end"></div>
-
-
-
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
-			<div id="contact-edit-poll-text">$updpub</div>
-			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
-		</div>
-	</div>
-	<div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-
-<div id="contact-edit-info-wrapper">
-<h4>Informations / Notes du contact</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Visibilité du profil</h4>
-<p>Merci de choisir le profil que vous souhaitez afficher à $name lorsqu'il consulte votre page de manière sécurisée.
-</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Réputation</h4>
-<p>
-De temps à autre, vos amis peuvent vouloir en savoir plus sur la légitimité de cette personne "en ligne". Vous pouvez les aider à décider s'ils veulent ou non interagir avec cette personne en indiquant une "réputation".
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Merci de prendre un moment pour développer si vous pensez que cela peut être utile à d'autres.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Sauver" />
-</form>
-</div>
diff --git a/view/fr/profile-hide-friends.tpl b/view/fr/profile-hide-friends.tpl
deleted file mode 100644
index 857e049bb..000000000
--- a/view/fr/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-Cacher ma liste de contacts/amis des visiteurs de ce profil?
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Oui</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">Non</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/fr/profile-in-directory.tpl b/view/fr/profile-in-directory.tpl
deleted file mode 100644
index 1189e3f9f..000000000
--- a/view/fr/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Publier votre profil par défaut dans l'annuaire local?
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Oui</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">Non</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/fr/profile-in-netdir.tpl b/view/fr/profile-in-netdir.tpl
deleted file mode 100644
index 9b94f302a..000000000
--- a/view/fr/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Publier votre profil par défaut dans l'annuaire global?
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Oui</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Non</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/fr/profile_edit.tpl b/view/fr/profile_edit.tpl
deleted file mode 100644
index c76bc592c..000000000
--- a/view/fr/profile_edit.tpl
+++ /dev/null
@@ -1,299 +0,0 @@
-<h1>Éditer les détails du profil</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="Voir ce profil">Voir ce profil</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Créer un nouveau profil en utilisant les réglages de celui-ci">Cloner ce profil</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Supprimer ce profil" $disabled >Supprimer ce profil</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Nom du profil: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Votre nom complet: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titre/descriptif: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Votre genre: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Votre anniversaire (j/m/a): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Adresse postale: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Localité/Ville: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Code postal: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Pays: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Région/état: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>Statut (marital): </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Qui: (si pertinent) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Attirance sexuelle: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Site web personnel: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Opinions politiques: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Mots clés publics: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exemple: football photographie programmation" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Utilisés pour les amis potentiels, peuvent être vus)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Mots clés privés: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exemple: football photographie programmation" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Utilisés lors des recherches, ne sont jamais montrés à personne)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Parlez nous de vous... 
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Marottes/Centre d'intérêts 
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Coordonnées et réseau sociaux 
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Goûts musicaux  
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-Livres, littérature 
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-Télévision 
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Cinéma/Danse/Culture/Divertissement 
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-Amour/Passion 
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Travail/activité professionnelle 
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-École/études
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Soumettre" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
diff --git a/view/fr/profile_entry_default.tpl b/view/fr/profile_entry_default.tpl
deleted file mode 100644
index b7f94b0b0..000000000
--- a/view/fr/profile_entry_default.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Image du profil" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
diff --git a/view/fr/profile_listing_header.tpl b/view/fr/profile_listing_header.tpl
deleted file mode 100644
index 70393e1bc..000000000
--- a/view/fr/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>Profiles</h1>
-<p id="profile-listing-desc" >
-<a href="profile_photo" >Changer la photo du profil</a>
-</p>
-<div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Créer un nouveau profil</a>
-</div>
-
diff --git a/view/fr/profile_photo.tpl b/view/fr/profile_photo.tpl
deleted file mode 100644
index e506b2066..000000000
--- a/view/fr/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h1>Téléverser une photo de profil</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Fichier à téléverser: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Envoyer">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-ou <a href='photos/$user'>choisissez une photo dans vos albums</a>
-</div>
diff --git a/view/fr/pwdreset.tpl b/view/fr/pwdreset.tpl
deleted file mode 100644
index 502d0d447..000000000
--- a/view/fr/pwdreset.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>Mot de passe réinitialisé</h3>
-
-<p>
-Votre mot de passe a été changé, comme demandé.
-</p>
-<p>
-Votre nouveau mot de passe est 
-</p>
-<p>
-$newpass
-</p>
-<p>
-Sauvez ou copiez ce nouveau mot de passe - puis <a href="$baseurl" >connectez-vous</a>.
-
-</p>
-<p>
-Votre mot de passe pourra être changé, après connexion, dans la page 'Réglages'.
-
diff --git a/view/fr/registrations.tpl b/view/fr/registrations.tpl
deleted file mode 100644
index 73bc3883e..000000000
--- a/view/fr/registrations.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<li>$fullname ($email) : <a href="$approvelink">Approuver</a> - <a href="$denylink">Refuser</a></li>
diff --git a/view/fr/settings.tpl b/view/fr/settings.tpl
deleted file mode 100644
index fc9b6d65b..000000000
--- a/view/fr/settings.tpl
+++ /dev/null
@@ -1,175 +0,0 @@
-<h1>Réglages du compte</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Réglages des extensions</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Réglages basiques</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Nom complet: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Adresse de courriel: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Votre fuseau horaire: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Localisation par défaut: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Utiliser les informations géographiques du navigateur: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Thème affiché: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-<h3 class="settings-heading">Sécurité et vie privée</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Nombre maximum de demandes d'amitié par jour</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(pour limiter le spam)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Autoriser les amis à publier sur votre profil: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-<div id="settings-expire-desc">Faire automatiquement expirer (supprimer) les publications de plus de <input type="text" size="3" name="expire" value="$expire" /> jours</div>
-<div id="settings-expire-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-
-<h3 class="settings-heading">Notifications</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Envoyer un courriel d'alerte quand: </div>
-<label for="notify1" id="settings-label-notify1">Vous recevez une introduction</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Une de vos introductions est validée</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Quelqu'un a écrit sur votre mur</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Quelqu'un a commenté</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Vous avez reçu un message privée</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-<h3 class="settings-heading">Mot de passe</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Laissez le champ vide, sauf si vous souhaitez le changer
-</p>
-<label id="settings-password-label" for="settings-password" >Nouveau mot de passe: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirmation: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
-<h3 class="settings-heading">Réglages avancés</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Sauver" />
-</div>
-
-
diff --git a/view/fr/settings_nick_set.tpl b/view/fr/settings_nick_set.tpl
deleted file mode 100644
index 761b089f1..000000000
--- a/view/fr/settings_nick_set.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">L'adresse de votre profil est <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/fr/settings_nick_subdir.tpl b/view/fr/settings_nick_subdir.tpl
deleted file mode 100644
index 2a367f8da..000000000
--- a/view/fr/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>
-Il semble que votre site soit situé dans un sous-répertoire du<br />
-site $hostname, ce réglage pourrait donc ne pas marcher comme prévu.<br />
-</p>
-<p>Si vous avez le moindre problème, essayez d'utiliser l'adresse <br />
-de profil suivante : '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
diff --git a/view/head.tpl b/view/head.tpl
index 7a5710b2a..1ff0ae1df 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -3,6 +3,10 @@
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendika" />
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/fr/install_db.tpl b/view/install_db.tpl
index b6aea3e49..1c59dbdb9 100644
--- a/view/fr/install_db.tpl
+++ b/view/install_db.tpl
@@ -1,33 +1,33 @@
 
-<h3>Réseau Social Friendika</h3>
-<h3>Installation</h3>
+<h3>$lbl_01</h3>
+<h3>$lbl_02</h3>
 
 <p>
-Pour pouvoir installer Friendika, nous avons besoin de contacter votre base de données. Merci de contacter votre hébergeur et/ou administrateur si vous avez des questions à ce sujet. La base que vous spécifierez ci-dessous doit exister. Si ce n'est pas le cas, merci de la créer avant toute chose.
+$lbl_03 $lbl_04 $lbl_05
 </p>
 
 <form id="install-form" action="$baseurl/install" method="post">
 
 <input type="hidden" name="phpath" value="$phpath" />
 
-<label for="install-dbhost" id="install-dbhost-label">Nom du serveur</label>
+<label for="install-dbhost" id="install-dbhost-label">$lbl_06</label>
 <input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
 <div id="install-dbhost-end"></div>
 
-<label for="install-dbuser" id="install-dbuser-label">Nom d'utilisateur</label>
+<label for="install-dbuser" id="install-dbuser-label">$lbl_07</label>
 <input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
 <div id="install-dbuser-end"></div>
 
-<label for="install-dbpass" id="install-dbpass-label">Mot de passe</label>
+<label for="install-dbpass" id="install-dbpass-label">$lbl_08</label>
 <input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
 <div id="install-dbpass-end"></div>
 
-<label for="install-dbdata" id="install-dbdata-label">Nom de la base</label>
+<label for="install-dbdata" id="install-dbdata-label">$lbl_09</label>
 <input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
 <div id="install-dbdata-end"></div>
 
 <div id="install-tz-desc">
-Merci de choisir un fuseau horaire par défaut
+$lbl_10
 </div>
 
 $tzselect
diff --git a/view/it/contact_edit.tpl b/view/it/contact_edit.tpl
deleted file mode 100644
index ac0f13a54..000000000
--- a/view/it/contact_edit.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
-	<div id="contact-edit-photo-wrapper" >
-		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-		<div id="contact-edit-photo" >
-			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
-		</div>
-		<div id="contact-edit-photo-end" ></div>
-	</div>
-	<div id="contact-edit-nav-wrapper" >
-
-		<div id="contact-edit-links" >
-			<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
-			<a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
-		</div>
-		<div id="contact-drop-links" >
-			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
-		</div>
-		<div id="contact-edit-nav-end"></div>
-
-
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
-			<div id="contact-edit-poll-text">$updpub</div>
-			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
-		</div>
-	</div>
-	<div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-
-<div id="contact-edit-info-wrapper">
-<h4>Informazioni di contatto / Note</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
-
-
-<div id="contact-edit-profile-select-text">
-<h4>Visibilt&agrave; Profilo</h4>
-<p>Scegli il profilo che vuoi mostrare a $name quando guarda il tuo profilo in modo sicuro.</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Reputazione Online</h4>
-<p>Puo' capitare che i tuoi amici vogliano sapere la legittimit&agrave; online dei questa persona. Puoi aiutarli a scegliere se interagire o no con questa persona fornendo una 'reputazione' per guidarli.</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Prenditi un momento per pensare su questa selezione se senti che puo' essere utile ad altri.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Aggiorna" />
-</form>
-</div>
diff --git a/view/it/install_db.tpl b/view/it/install_db.tpl
deleted file mode 100644
index 69a467e9d..000000000
--- a/view/it/install_db.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installazione</h3>
-
-<p>
-Per poter installare Friendika dobbiamo conoscrere come collegarci al tuo database. Contatta il tuo hosting provider o l'amministratore del sito se hai domande su questi settaggi. Il database specificato qui di seguito deve essere già presente. Se non esiste, crealo prima di continuare.
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Nome Server Database</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Nome Login Database</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Password Login Database</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Nome Database</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Seleziona il fuso orario del tuo sito web
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-<div id="install-end" ></div>
-
diff --git a/view/it/messages.po b/view/it/messages.po
index 4337e7965..2e8a0b2a1 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -1,4 +1,4 @@
-# FRIENDIKA Distribuited Social Network
+# FRIENDIKA Distributed Social Network
 # Copyright (C) 2010, 2011 Mike Macgirvin
 # This file is distributed under the same license as the Friendika package.
 # Mike Macgirvin, 2010
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.931\n"
+"Project-Id-Version: 2.1.942\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-28 20:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2011-04-08 12:29+0200\n"
+"PO-Revision-Date: 2011-04-08 12:29+0200\n"
 "Last-Translator: Fabio Comuni <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian <fabrix.xm@gmail.com>\n"
 "Language: It\n"
@@ -20,15 +20,16 @@ msgstr ""
 "X-Language: it_IT\n"
 "X-Source-Language: C\n"
 
-#: ../../index.php:187 ../../index.php:194
+#: ../../index.php:187 ../../index.php:194 ../../index.php:208
 msgid "Not Found"
 msgstr "Non Trovato"
 
-#: ../../index.php:188 ../../index.php:195
+#: ../../index.php:188 ../../index.php:195 ../../index.php:209
 msgid "Page not found."
 msgstr "Pagina non trovata."
 
 #: ../../index.php:243 ../../mod/group.php:88 ../../index.php:250
+#: ../../index.php:264
 msgid "Permission denied"
 msgstr "Permesso negato"
 
@@ -49,242 +50,254 @@ msgstr "Permesso negato"
 #: ../../mod/photos.php:773 ../../mod/display.php:308 ../../mod/editpost.php:10
 #: ../../mod/item.php:668 ../../mod/install.php:93 ../../mod/settings.php:15
 #: ../../mod/settings.php:20 ../../mod/settings.php:211
-#: ../../mod/contacts.php:106
+#: ../../mod/contacts.php:106 ../../index.php:265 ../../mod/display.php:311
 msgid "Permission denied."
 msgstr "Permesso negato."
 
-#: ../../boot.php:808
+#: ../../boot.php:808 ../../boot.php:813
 msgid "Create a New Account"
 msgstr "Crea un Nuovo Account"
 
 #: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
-#: ../../mod/register.php:445 ../../mod/register.php:463
+#: ../../mod/register.php:445 ../../mod/register.php:463 ../../boot.php:814
+#: ../../include/nav.php:62
 msgid "Register"
 msgstr "Regitrati"
 
-#: ../../boot.php:815
+#: ../../boot.php:815 ../../boot.php:820
 msgid "Nickname or Email address: "
 msgstr "Soprannome o indirizzo Email: "
 
-#: ../../boot.php:816
+#: ../../boot.php:816 ../../boot.php:821
 msgid "Password: "
 msgstr "Password: "
 
 #: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
+#: ../../boot.php:822 ../../boot.php:828 ../../include/nav.php:45
 msgid "Login"
 msgstr "Accedi"
 
-#: ../../boot.php:821
+#: ../../boot.php:821 ../../boot.php:826
 msgid "Nickname/Email/OpenID: "
 msgstr "Soprannome/Email/OpenID: "
 
-#: ../../boot.php:822
+#: ../../boot.php:822 ../../boot.php:827
 msgid "Password (if not OpenID): "
 msgstr "Password (se non OpenID): "
 
-#: ../../boot.php:825
+#: ../../boot.php:825 ../../boot.php:830
 msgid "Forgot your password?"
 msgstr "Dimenticata la password?"
 
-#: ../../boot.php:826
+#: ../../boot.php:826 ../../boot.php:831 ../../mod/lostpass.php:74
 msgid "Password Reset"
 msgstr "Resetta password"
 
-#: ../../boot.php:837 ../../include/nav.php:38
+#: ../../boot.php:837 ../../include/nav.php:38 ../../boot.php:842
+#: ../../include/nav.php:39
 msgid "Logout"
 msgstr "Esci"
 
-#: ../../boot.php:1077 ../../boot.php:1078
+#: ../../boot.php:1077 ../../boot.php:1078 ../../boot.php:1083
 msgid "prev"
 msgstr "prec"
 
-#: ../../boot.php:1079 ../../boot.php:1080
+#: ../../boot.php:1079 ../../boot.php:1080 ../../boot.php:1085
 msgid "first"
 msgstr "primo"
 
-#: ../../boot.php:1108 ../../boot.php:1109
+#: ../../boot.php:1108 ../../boot.php:1109 ../../boot.php:1114
 msgid "last"
 msgstr "ultimo"
 
-#: ../../boot.php:1111 ../../boot.php:1112
+#: ../../boot.php:1111 ../../boot.php:1112 ../../boot.php:1117
 msgid "next"
 msgstr "succ"
 
-#: ../../boot.php:1831 ../../boot.php:1838
+#: ../../boot.php:1831 ../../boot.php:1838 ../../boot.php:1848
 #, php-format
 msgid "%s likes this."
 msgstr "Piace a %s."
 
-#: ../../boot.php:1831 ../../boot.php:1838
+#: ../../boot.php:1831 ../../boot.php:1838 ../../boot.php:1848
 #, php-format
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."
 
-#: ../../boot.php:1835 ../../test.php:8 ../../boot.php:1842
+#: ../../boot.php:1835 ../../test.php:8 ../../boot.php:1842 ../../boot.php:1852
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "Piace a <span %1$s>%2$d persone</span>."
 
-#: ../../boot.php:1837 ../../boot.php:1844
+#: ../../boot.php:1837 ../../boot.php:1844 ../../boot.php:1854
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "Non piace a <span %1$s>%2$d persone</span>."
 
-#: ../../boot.php:1843 ../../boot.php:1850
+#: ../../boot.php:1843 ../../boot.php:1850 ../../boot.php:1860
 msgid "and"
 msgstr "e"
 
-#: ../../boot.php:1846 ../../boot.php:1853
+#: ../../boot.php:1846 ../../boot.php:1853 ../../boot.php:1863
 #, php-format
 msgid ", and %d other people"
 msgstr ", e altre %d persone"
 
-#: ../../boot.php:1847 ../../boot.php:1854
+#: ../../boot.php:1847 ../../boot.php:1854 ../../boot.php:1864
 #, php-format
 msgid "%s like this."
 msgstr "Piace a %s."
 
-#: ../../boot.php:1847 ../../boot.php:1854
+#: ../../boot.php:1847 ../../boot.php:1854 ../../boot.php:1864
 #, php-format
 msgid "%s don't like this."
 msgstr "Non piace a %s."
 
-#: ../../boot.php:2008 ../../boot.php:2015
+#: ../../boot.php:2008 ../../boot.php:2015 ../../boot.php:2025
 msgid "No contacts"
 msgstr "Nessun contatto"
 
 #: ../../boot.php:2016 ../../mod/contacts.php:303
 #: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
 #: ../../include/nav.php:111 ../../mod/contacts.php:311
+#: ../../mod/contacts.php:319 ../../include/nav.php:112
 msgid "Contacts"
 msgstr "Contatti"
 
 #: ../../boot.php:2032 ../../mod/viewcontacts.php:17 ../../boot.php:2039
+#: ../../boot.php:2049
 msgid "View Contacts"
 msgstr "Guarda contatti"
 
 #: ../../boot.php:2049 ../../mod/search.php:17 ../../include/nav.php:67
-#: ../../boot.php:2056
+#: ../../boot.php:2056 ../../boot.php:2066 ../../include/nav.php:68
 msgid "Search"
 msgstr "Cerca"
 
 #: ../../boot.php:2204 ../../mod/profile.php:8 ../../boot.php:2211
+#: ../../boot.php:2221
 msgid "No profile"
 msgstr "Nessun profilo"
 
-#: ../../boot.php:2261 ../../boot.php:2268
+#: ../../boot.php:2261 ../../boot.php:2268 ../../boot.php:2278
 msgid "Connect"
 msgstr "Connetti"
 
-#: ../../boot.php:2271 ../../boot.php:2278
+#: ../../boot.php:2271 ../../boot.php:2278 ../../boot.php:2288
 msgid "Location:"
 msgstr "Posizione:"
 
-#: ../../boot.php:2275 ../../boot.php:2282
+#: ../../boot.php:2275 ../../boot.php:2282 ../../boot.php:2292
 msgid ", "
 msgstr ", "
 
-#: ../../boot.php:2283 ../../boot.php:2290
+#: ../../boot.php:2283 ../../boot.php:2290 ../../boot.php:2300
+#: ../../include/profile_advanced.php:23
 msgid "Gender:"
 msgstr "Genere:"
 
-#: ../../boot.php:2287 ../../boot.php:2294
+#: ../../boot.php:2287 ../../boot.php:2294 ../../boot.php:2304
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../../boot.php:2289 ../../boot.php:2296
+#: ../../boot.php:2289 ../../boot.php:2296 ../../boot.php:2306
+#: ../../include/profile_advanced.php:103
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Monday"
 msgstr "Lunedì"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Friday"
 msgstr "Venerdì"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Saturday"
 msgstr "Sabato"
 
-#: ../../boot.php:2380 ../../boot.php:2387
+#: ../../boot.php:2380 ../../boot.php:2387 ../../boot.php:2397
 msgid "Sunday"
 msgstr "Domenica"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "January"
 msgstr "Gennaio"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "February"
 msgstr "Febbraio"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "March"
 msgstr "Marzo"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "April"
 msgstr "Aprile"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "May"
 msgstr "Maggio"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "June"
 msgstr "Giugno"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "July"
 msgstr "Luglio"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "August"
 msgstr "Agosto"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "September"
 msgstr "Settembre"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "October"
 msgstr "Ottobre"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "November"
 msgstr "Novembre"
 
-#: ../../boot.php:2384 ../../boot.php:2391
+#: ../../boot.php:2384 ../../boot.php:2391 ../../boot.php:2401
 msgid "December"
 msgstr "Dicembre"
 
 #: ../../boot.php:2413 ../../boot.php:2419 ../../boot.php:2426
+#: ../../boot.php:2434
 msgid "Birthdays this week:"
 msgstr "Compleanni questa settimana:"
 
 #: ../../boot.php:2414 ../../boot.php:2420 ../../boot.php:2427
+#: ../../boot.php:2435
 msgid "(Adjusted for local time)"
 msgstr "(Convertiti all'ora locale)"
 
 #: ../../boot.php:2423 ../../boot.php:2431 ../../boot.php:2438
+#: ../../boot.php:2446
 msgid "[today]"
 msgstr "[oggi]"
 
 #: ../../boot.php:2620 ../../boot.php:2628 ../../boot.php:2635
+#: ../../boot.php:2643
 msgid "link to source"
 msgstr "Collegamento all'originale"
 
@@ -318,6 +331,11 @@ msgstr "Seleziona una identità da gestire:"
 #: ../../addon/facebook/facebook.php:151
 #: ../../addon/randplace/randplace.php:179 ../../mod/photos.php:801
 #: ../../mod/photos.php:858 ../../mod/photos.php:1066 ../../mod/install.php:123
+#: ../../mod/profile.php:388 ../../mod/profiles.php:370
+#: ../../mod/settings.php:364 ../../mod/photos.php:1109
+#: ../../mod/display.php:174 ../../mod/contacts.php:264
+#: ../../mod/install.php:133 ../../mod/network.php:506 ../../mod/group.php:97
+#: ../../mod/group.php:155
 msgid "Submit"
 msgstr "Invia"
 
@@ -339,6 +357,7 @@ msgstr "Foto Bacheca"
 
 #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
 #: ../../mod/photos.php:588 ../../mod/photos.php:589
+#: ../../mod/profile_photo.php:236
 msgid "Image upload failed."
 msgstr "Caricamento immagine fallito."
 
@@ -349,7 +368,9 @@ msgstr "Caricamento immagine fallito."
 #: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350
 #: ../../mod/dfrn_notify.php:475 ../../mod/item.php:475 ../../mod/item.php:498
 #: ../../include/items.php:1373 ../../mod/register.php:329
-#: ../../mod/register.php:366
+#: ../../mod/register.php:366 ../../mod/dfrn_notify.php:392
+#: ../../mod/dfrn_notify.php:478 ../../mod/dfrn_request.php:547
+#: ../../include/items.php:1420
 msgid "Administrator"
 msgstr "Amministratore"
 
@@ -362,6 +383,7 @@ msgid "New mail received at "
 msgstr "Nuova mail ricevuta su "
 
 #: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477
 #, php-format
 msgid "%s commented on an item at %s"
 msgstr "%s ha commentato un elemento su %s"
@@ -369,7 +391,9 @@ msgstr "%s ha commentato un elemento su %s"
 #: ../../mod/profile.php:151 ../../mod/network.php:91 ../../mod/profile.php:156
 #: ../../mod/profile.php:317 ../../mod/photos.php:1086
 #: ../../mod/display.php:158 ../../mod/network.php:370 ../../mod/network.php:96
-#: ../../mod/network.php:441 ../../mod/profile.php:164 ../../mod/profile.php:377
+#: ../../mod/network.php:441 ../../mod/profile.php:164
+#: ../../mod/profile.php:377 ../../mod/profile.php:158
+#: ../../mod/profile.php:372 ../../mod/network.php:105 ../../mod/network.php:489
 msgid "Share"
 msgstr "Condividi"
 
@@ -377,6 +401,8 @@ msgstr "Condividi"
 #: ../../mod/message.php:319 ../../mod/profile.php:157
 #: ../../mod/editpost.php:63 ../../mod/network.php:97 ../../mod/message.php:186
 #: ../../mod/message.php:320 ../../mod/profile.php:165
+#: ../../mod/profile.php:159 ../../mod/network.php:106
+#: ../../mod/message.php:188 ../../mod/message.php:322
 msgid "Upload photo"
 msgstr "Carica foto"
 
@@ -384,23 +410,26 @@ msgstr "Carica foto"
 #: ../../mod/message.php:320 ../../mod/profile.php:158
 #: ../../mod/editpost.php:64 ../../mod/network.php:98 ../../mod/message.php:187
 #: ../../mod/message.php:321 ../../mod/profile.php:166
+#: ../../mod/profile.php:160 ../../mod/network.php:107
+#: ../../mod/message.php:189 ../../mod/message.php:323
 msgid "Insert web link"
 msgstr "Inserisci link"
 
 #: ../../mod/profile.php:154 ../../mod/network.php:94 ../../mod/profile.php:159
 #: ../../mod/editpost.php:65 ../../mod/network.php:99 ../../mod/profile.php:167
+#: ../../mod/profile.php:161 ../../mod/network.php:108
 msgid "Insert YouTube video"
 msgstr "Inserisci video da YouTube"
 
 #: ../../mod/profile.php:155 ../../mod/network.php:95 ../../mod/profile.php:162
 #: ../../mod/editpost.php:68 ../../mod/network.php:97 ../../mod/network.php:102
-#: ../../mod/profile.php:170
+#: ../../mod/profile.php:170 ../../mod/profile.php:164 ../../mod/network.php:111
 msgid "Set your location"
 msgstr "Imposta la tua posizione"
 
 #: ../../mod/profile.php:156 ../../mod/network.php:96 ../../mod/profile.php:163
 #: ../../mod/editpost.php:69 ../../mod/network.php:98 ../../mod/network.php:103
-#: ../../mod/profile.php:171
+#: ../../mod/profile.php:171 ../../mod/profile.php:165 ../../mod/network.php:112
 msgid "Clear browser location"
 msgstr "Cancella la tua posizione data dal browser"
 
@@ -412,45 +441,54 @@ msgstr "Cancella la tua posizione data dal browser"
 #: ../../mod/display.php:159 ../../mod/editpost.php:70 ../../mod/network.php:99
 #: ../../mod/network.php:371 ../../mod/network.php:104
 #: ../../mod/network.php:442 ../../mod/message.php:188
-#: ../../mod/message.php:322 ../../mod/profile.php:172 ../../mod/profile.php:378
+#: ../../mod/message.php:322 ../../mod/profile.php:172
+#: ../../mod/profile.php:378 ../../mod/profile.php:167
+#: ../../mod/profile.php:373 ../../mod/network.php:114
+#: ../../mod/network.php:490 ../../mod/message.php:190 ../../mod/message.php:324
 msgid "Please wait"
 msgstr "Attendi"
 
 #: ../../mod/profile.php:158 ../../mod/network.php:98 ../../mod/profile.php:165
 #: ../../mod/editpost.php:71 ../../mod/network.php:100
 #: ../../mod/network.php:105 ../../mod/profile.php:173
+#: ../../mod/profile.php:168 ../../mod/network.php:115
 msgid "Permission settings"
 msgstr "Impostazione permessi"
 
 #: ../../mod/profile.php:165 ../../mod/network.php:104
 #: ../../mod/profile.php:172 ../../mod/editpost.php:77
-#: ../../mod/network.php:106 ../../mod/network.php:111 ../../mod/profile.php:180
+#: ../../mod/network.php:106 ../../mod/network.php:111
+#: ../../mod/profile.php:180 ../../mod/profile.php:175 ../../mod/network.php:121
 msgid "CC: email addresses"
 msgstr "CC: indirizzi email"
 
 #: ../../mod/profile.php:167 ../../mod/network.php:106
 #: ../../mod/profile.php:174 ../../mod/editpost.php:79
-#: ../../mod/network.php:108 ../../mod/network.php:113 ../../mod/profile.php:182
+#: ../../mod/network.php:108 ../../mod/network.php:113
+#: ../../mod/profile.php:182 ../../mod/profile.php:177 ../../mod/network.php:123
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Esempio: bob@example.com, mary@example.com"
 
 #: ../../mod/profile.php:300 ../../mod/photos.php:935 ../../mod/display.php:149
 #: ../../mod/network.php:321 ../../mod/profile.php:308 ../../mod/photos.php:962
-#: ../../mod/network.php:324 ../../mod/network.php:395 ../../mod/profile.php:368
+#: ../../mod/network.php:324 ../../mod/network.php:395
+#: ../../mod/profile.php:368 ../../mod/profile.php:363 ../../mod/network.php:443
 msgid "Private Message"
 msgstr "Messaggio privato"
 
 #: ../../mod/profile.php:307 ../../mod/photos.php:1050
 #: ../../mod/display.php:156 ../../mod/network.php:365
 #: ../../mod/profile.php:315 ../../mod/photos.php:1084
-#: ../../mod/network.php:368 ../../mod/network.php:439 ../../mod/profile.php:375
+#: ../../mod/network.php:368 ../../mod/network.php:439
+#: ../../mod/profile.php:375 ../../mod/profile.php:370 ../../mod/network.php:487
 msgid "I like this (toggle)"
 msgstr "Mi piace questo (metti/togli)"
 
 #: ../../mod/profile.php:308 ../../mod/photos.php:1051
 #: ../../mod/display.php:157 ../../mod/network.php:366
 #: ../../mod/profile.php:316 ../../mod/photos.php:1085
-#: ../../mod/network.php:369 ../../mod/network.php:440 ../../mod/profile.php:376
+#: ../../mod/network.php:369 ../../mod/network.php:440
+#: ../../mod/profile.php:376 ../../mod/profile.php:371 ../../mod/network.php:488
 msgid "I don't like this (toggle)"
 msgstr "Non mi piace questo (metti/togli)"
 
@@ -461,6 +499,8 @@ msgstr "Non mi piace questo (metti/togli)"
 #: ../../mod/photos.php:1146 ../../mod/photos.php:1175
 #: ../../mod/display.php:171 ../../mod/network.php:384
 #: ../../mod/network.php:455 ../../mod/profile.php:390
+#: ../../mod/profile.php:385 ../../mod/photos.php:1148
+#: ../../mod/photos.php:1177 ../../mod/network.php:503
 msgid "This is you"
 msgstr "Questo sei tu"
 
@@ -469,6 +509,8 @@ msgstr "Questo sei tu"
 #: ../../mod/profile.php:376 ../../mod/photos.php:1203
 #: ../../mod/display.php:238 ../../mod/network.php:393
 #: ../../mod/network.php:464 ../../mod/profile.php:436
+#: ../../mod/profile.php:433 ../../mod/photos.php:1205
+#: ../../mod/display.php:240 ../../mod/network.php:514 ../../mod/group.php:141
 msgid "Delete"
 msgstr "Cancella"
 
@@ -476,7 +518,9 @@ msgstr "Cancella"
 #: ../../mod/network.php:272 ../../mod/network.php:434
 #: ../../mod/profile.php:397 ../../mod/display.php:262
 #: ../../mod/network.php:275 ../../mod/network.php:441
-#: ../../mod/network.php:303 ../../mod/network.php:512 ../../mod/profile.php:457
+#: ../../mod/network.php:303 ../../mod/network.php:512
+#: ../../mod/profile.php:457 ../../mod/profile.php:455 ../../mod/search.php:124
+#: ../../mod/display.php:264 ../../mod/network.php:330 ../../mod/network.php:563
 msgid "View $name's profile"
 msgstr "Guarda il profilo di $name"
 
@@ -485,7 +529,8 @@ msgstr "Guarda il profilo di $name"
 #: ../../mod/profile.php:430 ../../mod/display.php:317
 #: ../../mod/register.php:424 ../../mod/network.php:479
 #: ../../mod/network.php:554 ../../mod/profile.php:490
-#: ../../mod/register.php:442
+#: ../../mod/register.php:442 ../../mod/profile.php:489
+#: ../../mod/display.php:320 ../../mod/network.php:609
 msgid ""
 "Shared content is covered by the <a "
 "href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons "
@@ -495,12 +540,12 @@ msgstr ""
 "href=\"http://creativecommons.org/licenses/by/3.0/deed.it\">Creative Commons "
 "Attribuzione 3.0</a>."
 
-#: ../../mod/follow.php:167 ../../mod/follow.php:173
+#: ../../mod/follow.php:167 ../../mod/follow.php:173 ../../mod/follow.php:186
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 "L'indirizzo del profilo specificato non fornisce adeguate informazioni."
 
-#: ../../mod/follow.php:173 ../../mod/follow.php:179
+#: ../../mod/follow.php:173 ../../mod/follow.php:179 ../../mod/follow.php:192
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
@@ -508,11 +553,11 @@ msgstr ""
 "Profilo limitato. Questa persona non sarà in grado di ricevere nofiche "
 "dirette/personali da te."
 
-#: ../../mod/follow.php:224 ../../mod/follow.php:230
+#: ../../mod/follow.php:224 ../../mod/follow.php:230 ../../mod/follow.php:243
 msgid "Unable to retrieve contact information."
 msgstr "Impossibile recuperare informazioni sul contatto."
 
-#: ../../mod/follow.php:270 ../../mod/follow.php:276
+#: ../../mod/follow.php:270 ../../mod/follow.php:276 ../../mod/follow.php:289
 msgid "following"
 msgstr "segue"
 
@@ -528,12 +573,14 @@ msgstr "L'immagine è stata caricata, ma il ritaglio è fallito."
 #: ../../mod/register.php:274 ../../mod/register.php:281
 #: ../../mod/photos.php:531 ../../mod/photos.php:850 ../../mod/photos.php:865
 #: ../../mod/register.php:285 ../../mod/register.php:292
-#: ../../mod/register.php:299
+#: ../../mod/register.php:299 ../../mod/profile_photo.php:231
+#: ../../mod/profile_photo.php:240
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
 #: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
 #: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
+#: ../../mod/profile_photo.php:243
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr "Riduzione della dimensione dell'immagine [%s] fallito."
@@ -542,7 +589,7 @@ msgstr "Riduzione della dimensione dell'immagine [%s] fallito."
 msgid "Unable to process image"
 msgstr "Impossibile elaborare l'immagine"
 
-#: ../../mod/profile_photo.php:228
+#: ../../mod/profile_photo.php:228 ../../mod/profile_photo.php:234
 msgid "Image uploaded successfully."
 msgstr "Immagine caricata con successo."
 
@@ -602,6 +649,7 @@ msgid "Profile unavailable to clone."
 msgstr "Impossibile duplicare il plrofilo."
 
 #: ../../mod/profiles.php:367 ../../mod/profiles.php:370
+#: ../../mod/profiles.php:411
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
@@ -610,11 +658,13 @@ msgstr ""
 "/><strong>Potrebbe</strong> essere visto da chiunque attraverso internet."
 
 #: ../../mod/profiles.php:377 ../../mod/profiles.php:380
-#: ../../mod/directory.php:89
+#: ../../mod/directory.php:89 ../../mod/profiles.php:421
+#: ../../mod/directory.php:91
 msgid "Age: "
 msgstr "Età : "
 
 #: ../../mod/profiles.php:418 ../../mod/profiles.php:422
+#: ../../mod/profiles.php:470
 msgid "Profile Image"
 msgstr "Immagine del Profilo"
 
@@ -659,12 +709,12 @@ msgid "Settings updated."
 msgstr "Impostazioni aggiornate."
 
 #: ../../mod/settings.php:211 ../../mod/settings.php:213
-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:216 ../../mod/settings.php:356
 msgid "Plugin Settings"
 msgstr "Impostazioni Plugin"
 
 #: ../../mod/settings.php:212 ../../mod/settings.php:214
-#: ../../mod/settings.php:217
+#: ../../mod/settings.php:217 ../../mod/settings.php:355
 msgid "Account Settings"
 msgstr "Impostazioni Account"
 
@@ -674,28 +724,28 @@ msgid "No Plugin settings configured"
 msgstr "Nessun Plugin ha delle configurazioni che puoi modificare"
 
 #: ../../mod/settings.php:263 ../../mod/settings.php:266
-#: ../../mod/settings.php:270
+#: ../../mod/settings.php:270 ../../mod/settings.php:278
 msgid "OpenID: "
 msgstr "OpenID: "
 
 #: ../../mod/settings.php:263 ../../mod/settings.php:266
-#: ../../mod/settings.php:270
+#: ../../mod/settings.php:270 ../../mod/settings.php:278
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 "&nbsp;(Opzionale) Permetti a questo OpenID di accedere a questo account."
 
 #: ../../mod/settings.php:295 ../../mod/settings.php:298
-#: ../../mod/settings.php:302
+#: ../../mod/settings.php:302 ../../mod/settings.php:316
 msgid "Profile is <strong>not published</strong>."
 msgstr "Il profilo <strong>non è pubblicato</strong>."
 
 #: ../../mod/settings.php:352 ../../mod/settings.php:355
-#: ../../mod/settings.php:363
+#: ../../mod/settings.php:363 ../../mod/settings.php:397
 msgid "Default Post Permissions"
 msgstr "Permessi di default per i messaggi"
 
 #: ../../mod/search.php:131 ../../mod/network.php:287 ../../mod/network.php:290
-#: ../../mod/network.php:318
+#: ../../mod/network.php:318 ../../mod/search.php:140 ../../mod/network.php:346
 msgid "View in context"
 msgstr "Vedi nel contesto"
 
@@ -712,6 +762,9 @@ msgstr "Album Foto"
 #: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233
 #: ../../mod/photos.php:1244 ../../include/items.php:982
 #: ../../include/items.php:985 ../../include/items.php:988
+#: ../../mod/photos.php:1235 ../../mod/photos.php:1246
+#: ../../include/items.php:1028 ../../include/items.php:1031
+#: ../../include/items.php:1034
 msgid "Contact Photos"
 msgstr "Foto dei contatti"
 
@@ -775,7 +828,7 @@ msgid "Edit Album"
 msgstr "Modifica album"
 
 #: ../../mod/photos.php:878 ../../mod/photos.php:1228 ../../mod/photos.php:879
-#: ../../mod/photos.php:1263
+#: ../../mod/photos.php:1263 ../../mod/photos.php:1265
 msgid "View Photo"
 msgstr "Vedi foto"
 
@@ -820,44 +873,48 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 "Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1214 ../../mod/photos.php:1249
+#: ../../mod/photos.php:1214 ../../mod/photos.php:1249 ../../mod/photos.php:1251
 msgid "Recent Photos"
 msgstr "Foto recenti"
 
-#: ../../mod/photos.php:1218 ../../mod/photos.php:1253
+#: ../../mod/photos.php:1218 ../../mod/photos.php:1253 ../../mod/photos.php:1255
 msgid "Upload New Photos"
 msgstr "Carica nuova foto"
 
-#: ../../mod/photos.php:1234 ../../mod/photos.php:1269
+#: ../../mod/photos.php:1234 ../../mod/photos.php:1269 ../../mod/photos.php:1271
 msgid "View Album"
 msgstr "Vedi album"
 
 #: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
-#: ../../mod/display.php:312 ../../mod/item.php:598
+#: ../../mod/display.php:312 ../../mod/item.php:598 ../../mod/display.php:315
 msgid "Item not found."
 msgstr "Elemento non trovato."
 
 #: ../../mod/display.php:259 ../../mod/network.php:435
-#: ../../mod/display.php:263 ../../mod/network.php:442 ../../mod/network.php:513
+#: ../../mod/display.php:263 ../../mod/network.php:442
+#: ../../mod/network.php:513 ../../mod/display.php:265 ../../mod/network.php:564
 msgid "View $owner_name's profile"
 msgstr "Guarda il profilo di $owner_name"
 
 #: ../../mod/display.php:260 ../../mod/network.php:436
-#: ../../mod/display.php:264 ../../mod/network.php:443 ../../mod/network.php:514
+#: ../../mod/display.php:264 ../../mod/network.php:443
+#: ../../mod/network.php:514 ../../mod/display.php:266 ../../mod/network.php:565
 msgid "to"
 msgstr "a"
 
 #: ../../mod/display.php:261 ../../mod/network.php:437
-#: ../../mod/display.php:265 ../../mod/network.php:444 ../../mod/network.php:515
+#: ../../mod/display.php:265 ../../mod/network.php:444
+#: ../../mod/network.php:515 ../../mod/display.php:267 ../../mod/network.php:566
 msgid "Wall-to-Wall"
 msgstr "Bacheca-A-Bacheca"
 
 #: ../../mod/display.php:262 ../../mod/network.php:438
-#: ../../mod/display.php:266 ../../mod/network.php:445 ../../mod/network.php:516
+#: ../../mod/display.php:266 ../../mod/network.php:445
+#: ../../mod/network.php:516 ../../mod/display.php:268 ../../mod/network.php:567
 msgid "via Wall-To-Wall:"
 msgstr "sulla sua Bacheca:"
 
-#: ../../mod/display.php:300 ../../mod/display.php:305
+#: ../../mod/display.php:300 ../../mod/display.php:305 ../../mod/display.php:308
 msgid "Item has been removed."
 msgstr "L'elemento è stato rimosso."
 
@@ -893,6 +950,7 @@ msgstr "Inserisci gli indirizzi email, uno per riga:"
 
 #: ../../mod/invite.php:59 ../../mod/message.php:182 ../../mod/message.php:316
 #: ../../mod/message.php:183 ../../mod/message.php:317
+#: ../../mod/message.php:185 ../../mod/message.php:319
 msgid "Your message:"
 msgstr "Il tuo messaggio:"
 
@@ -975,16 +1033,19 @@ msgstr "Contatto non trovato."
 
 #: ../../mod/contacts.php:223 ../../mod/contacts.php:344
 #: ../../mod/contacts.php:228 ../../mod/contacts.php:352
+#: ../../mod/contacts.php:360
 msgid "Mutual Friendship"
 msgstr "Reciproca amicizia"
 
 #: ../../mod/contacts.php:227 ../../mod/contacts.php:348
 #: ../../mod/contacts.php:232 ../../mod/contacts.php:356
+#: ../../mod/contacts.php:364
 msgid "is a fan of yours"
 msgstr "è un tuo fan"
 
 #: ../../mod/contacts.php:232 ../../mod/contacts.php:352
 #: ../../mod/contacts.php:237 ../../mod/contacts.php:360
+#: ../../mod/contacts.php:368
 msgid "you are a fan of"
 msgstr "sei un fan di"
 
@@ -1005,80 +1066,97 @@ msgid "Contact Editor"
 msgstr "Editor dei Contatti"
 
 #: ../../mod/contacts.php:256 ../../mod/contacts.php:264
+#: ../../mod/contacts.php:272
 msgid "Visit $name's profile"
 msgstr "Visita il profilo di $name"
 
 #: ../../mod/contacts.php:257 ../../mod/contacts.php:265
+#: ../../mod/contacts.php:273
 msgid "Block/Unblock contact"
 msgstr "Blocca/Sblocca contatto"
 
 #: ../../mod/contacts.php:258 ../../mod/contacts.php:266
+#: ../../mod/contacts.php:274
 msgid "Ignore contact"
 msgstr "Ingnora il contatto"
 
 #: ../../mod/contacts.php:259 ../../mod/contacts.php:267
+#: ../../mod/contacts.php:275
 msgid "Delete contact"
 msgstr "Rimuovi contatto"
 
 #: ../../mod/contacts.php:261 ../../mod/contacts.php:269
+#: ../../mod/contacts.php:277
 msgid "Last updated: "
 msgstr "Ultimo aggiornameto: "
 
 #: ../../mod/contacts.php:262 ../../mod/contacts.php:270
+#: ../../mod/contacts.php:278
 msgid "Update public posts: "
 msgstr "Aggiorna messaggi pubblici: "
 
 #: ../../mod/contacts.php:264 ../../mod/contacts.php:272
+#: ../../mod/contacts.php:280
 msgid "Update now"
 msgstr "Aggiorna adesso"
 
 #: ../../mod/contacts.php:267 ../../mod/contacts.php:275
+#: ../../mod/contacts.php:283
 msgid "Unblock this contact"
 msgstr "Sblocca questo contatto"
 
 #: ../../mod/contacts.php:267 ../../mod/contacts.php:275
+#: ../../mod/contacts.php:283
 msgid "Block this contact"
 msgstr "Blocca questo contatto"
 
 #: ../../mod/contacts.php:268 ../../mod/contacts.php:276
+#: ../../mod/contacts.php:284
 msgid "Unignore this contact"
 msgstr "Rimuovi dai contatti ingorati"
 
 #: ../../mod/contacts.php:268 ../../mod/contacts.php:276
+#: ../../mod/contacts.php:284
 msgid "Ignore this contact"
 msgstr "Aggiungi ai contatti ignorati"
 
 #: ../../mod/contacts.php:271 ../../mod/contacts.php:279
+#: ../../mod/contacts.php:287
 msgid "Currently blocked"
 msgstr "Bloccato"
 
 #: ../../mod/contacts.php:272 ../../mod/contacts.php:280
+#: ../../mod/contacts.php:288
 msgid "Currently ignored"
 msgstr "Ignorato"
 
 #: ../../mod/contacts.php:305 ../../mod/contacts.php:313
+#: ../../mod/contacts.php:321
 msgid "Show Blocked Connections"
 msgstr "Mostra connessioni bloccate"
 
 #: ../../mod/contacts.php:305 ../../mod/contacts.php:313
+#: ../../mod/contacts.php:321
 msgid "Hide Blocked Connections"
 msgstr "Nascondi connessioni bloccate"
 
 #: ../../mod/contacts.php:307 ../../mod/directory.php:38
-#: ../../mod/contacts.php:315
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:323
 msgid "Finding: "
 msgstr "Cerco: "
 
 #: ../../mod/contacts.php:308 ../../mod/contacts.php:316
+#: ../../mod/contacts.php:324 ../../mod/directory.php:40
 msgid "Find"
 msgstr "Trova"
 
 #: ../../mod/contacts.php:368 ../../mod/viewcontacts.php:44
-#: ../../mod/contacts.php:376
+#: ../../mod/contacts.php:376 ../../mod/contacts.php:384
 msgid "Visit $username's profile"
 msgstr "Visita il profilo di $username"
 
-#: ../../mod/contacts.php:369 ../../mod/contacts.php:377
+#: ../../mod/contacts.php:369 ../../mod/contacts.php:377 ../../boot.php:2732
+#: ../../mod/contacts.php:385
 msgid "Edit contact"
 msgstr "Modifca contatto"
 
@@ -1207,11 +1285,15 @@ msgstr "Includi il tuo profilo nell'elenco dei membir?"
 
 #: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
 #: ../../mod/register.php:418 ../../mod/register.php:436
+#: ../../mod/profiles.php:355 ../../mod/settings.php:289
+#: ../../mod/settings.php:301 ../../mod/dfrn_request.php:620
 msgid "Yes"
 msgstr "Si"
 
 #: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
 #: ../../mod/register.php:419 ../../mod/register.php:437
+#: ../../mod/profiles.php:356 ../../mod/settings.php:290
+#: ../../mod/settings.php:302 ../../mod/dfrn_request.php:621
 msgid "No"
 msgstr "No"
 
@@ -1266,6 +1348,7 @@ msgstr ""
 
 #: ../../mod/install.php:68 ../../mod/install.php:75 ../../mod/install.php:175
 #: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
+#: ../../mod/install.php:199
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr "Guarda il file \"INSTALL.txt\"."
 
@@ -1285,19 +1368,19 @@ msgstr ""
 msgid "Welcome to Friendika."
 msgstr "Benvenuto su Friendika."
 
-#: ../../mod/install.php:124 ../../mod/install.php:138
+#: ../../mod/install.php:124 ../../mod/install.php:138 ../../mod/install.php:148
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 "Non riesco a trovare una versione da riga di comando di PHP nel PATH del "
 "server web"
 
-#: ../../mod/install.php:125 ../../mod/install.php:139
+#: ../../mod/install.php:125 ../../mod/install.php:139 ../../mod/install.php:149
 msgid ""
 "This is required. Please adjust the configuration file .htconfig.php "
 "accordingly."
 msgstr "E' richiesto. Aggiorna il file .htconfig.php di conseguenza."
 
-#: ../../mod/install.php:132 ../../mod/install.php:146
+#: ../../mod/install.php:132 ../../mod/install.php:146 ../../mod/install.php:156
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
@@ -1305,11 +1388,11 @@ msgstr ""
 "La versione da riga di comando di PHP nel sistema non ha abilitato "
 "\"register_argc_argv\"."
 
-#: ../../mod/install.php:133 ../../mod/install.php:147
+#: ../../mod/install.php:133 ../../mod/install.php:147 ../../mod/install.php:157
 msgid "This is required for message delivery to work."
 msgstr "Ciò è richiesto per far funzionare la consegna dei messaggi."
 
-#: ../../mod/install.php:155 ../../mod/install.php:169
+#: ../../mod/install.php:155 ../../mod/install.php:169 ../../mod/install.php:179
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
@@ -1317,7 +1400,7 @@ msgstr ""
 "Errore: la funzione \"openssl_pkey_new\" in questo sistema non è in grado di "
 "generare le chiavi di criptazione"
 
-#: ../../mod/install.php:156 ../../mod/install.php:170
+#: ../../mod/install.php:156 ../../mod/install.php:170 ../../mod/install.php:180
 msgid ""
 "If running under Windows, please see "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
@@ -1325,32 +1408,32 @@ msgstr ""
 "Se stai eseguendo friendika su windows, guarda "
 "\"http://www.php.net/manual/en/openssl.installation.php\"."
 
-#: ../../mod/install.php:165 ../../mod/install.php:179
+#: ../../mod/install.php:165 ../../mod/install.php:179 ../../mod/install.php:189
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 "Errore: il modulo mod-rewrite di Apache &egreve; richiesto ma non installato"
 
-#: ../../mod/install.php:167 ../../mod/install.php:181
+#: ../../mod/install.php:167 ../../mod/install.php:181 ../../mod/install.php:191
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Errore: il modulo libCURL di PHP è richiesto ma non installato."
 
-#: ../../mod/install.php:169 ../../mod/install.php:183
+#: ../../mod/install.php:169 ../../mod/install.php:183 ../../mod/install.php:193
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non "
 "installato."
 
-#: ../../mod/install.php:171 ../../mod/install.php:185
+#: ../../mod/install.php:171 ../../mod/install.php:185 ../../mod/install.php:195
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Errore: il modulo openssl di PHP è richiesto ma non installato."
 
-#: ../../mod/install.php:173 ../../mod/install.php:187
+#: ../../mod/install.php:173 ../../mod/install.php:187 ../../mod/install.php:197
 msgid "Error: mysqli PHP module required but not installed."
 msgstr "Errore: il modulo mysqli di PHP è richiesto ma non installato"
 
-#: ../../mod/install.php:184 ../../mod/install.php:198
+#: ../../mod/install.php:184 ../../mod/install.php:198 ../../mod/install.php:208
 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."
@@ -1358,7 +1441,7 @@ msgstr ""
 "L'installazione web deve poter creare un file chiamato \".htconfig.php\" "
 "nella cartella principale del tuo web server ma non è in grado di farlo."
 
-#: ../../mod/install.php:185 ../../mod/install.php:199
+#: ../../mod/install.php:185 ../../mod/install.php:199 ../../mod/install.php:209
 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."
@@ -1366,7 +1449,7 @@ msgstr ""
 "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server puo' "
 "scrivere il file nella tua cartella, anche se tu puoi."
 
-#: ../../mod/install.php:186 ../../mod/install.php:200
+#: ../../mod/install.php:186 ../../mod/install.php:200 ../../mod/install.php:210
 msgid ""
 "Please check with your site documentation or support people to see if this "
 "situation can be corrected."
@@ -1374,7 +1457,7 @@ msgstr ""
 "Controlla la documentazione del tuo sito o con il personale di suporto se la "
 "situazione puo' essere corretta."
 
-#: ../../mod/install.php:187 ../../mod/install.php:201
+#: ../../mod/install.php:187 ../../mod/install.php:201 ../../mod/install.php:211
 msgid ""
 "If not, you may be required to perform a manual installation. Please see the "
 "file \"INSTALL.txt\" for instructions."
@@ -1382,7 +1465,7 @@ msgstr ""
 "Altrimenti dovrai procedere con l'installazione manuale. Guarda il file "
 "\"INSTALL.txt\" per istuzioni"
 
-#: ../../mod/install.php:196 ../../mod/install.php:210
+#: ../../mod/install.php:196 ../../mod/install.php:210 ../../mod/install.php:220
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
@@ -1392,7 +1475,7 @@ msgstr ""
 "scritto. Usa il testo qui di seguito per creare un file di configurazione "
 "nella cartella principale del tuo sito."
 
-#: ../../mod/install.php:211 ../../mod/install.php:225
+#: ../../mod/install.php:211 ../../mod/install.php:225 ../../mod/install.php:235
 msgid "Errors encountered creating database tables."
 msgstr "Errori creando le tabelle nel database."
 
@@ -1404,15 +1487,18 @@ msgstr "Vista normale"
 msgid "New Item View"
 msgstr "Vista Nuovi Elementi"
 
-#: ../../mod/network.php:149 ../../mod/network.php:151 ../../mod/network.php:156
+#: ../../mod/network.php:149 ../../mod/network.php:151
+#: ../../mod/network.php:156 ../../mod/network.php:166
 msgid "No such group"
 msgstr "Nessun gruppo"
 
-#: ../../mod/network.php:160 ../../mod/network.php:162 ../../mod/network.php:167
+#: ../../mod/network.php:160 ../../mod/network.php:162
+#: ../../mod/network.php:167 ../../mod/network.php:177
 msgid "Group is empty"
 msgstr "Il gruppo è vuoto"
 
-#: ../../mod/network.php:164 ../../mod/network.php:166 ../../mod/network.php:171
+#: ../../mod/network.php:164 ../../mod/network.php:166
+#: ../../mod/network.php:171 ../../mod/network.php:181
 msgid "Group: "
 msgstr "Gruppo: "
 
@@ -1421,10 +1507,12 @@ msgid "Invalid request identifier."
 msgstr "Identificativo richiesta invalido."
 
 #: ../../mod/notifications.php:31 ../../mod/notifications.php:134
+#: ../../mod/notifications.php:133
 msgid "Discard"
 msgstr "Scarta"
 
 #: ../../mod/notifications.php:41 ../../mod/notifications.php:133
+#: ../../mod/notifications.php:132
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -1436,51 +1524,52 @@ msgstr "Mostra richieste ignorate"
 msgid "Hide Ignored Requests"
 msgstr "Nascondi richieste ignorate"
 
-#: ../../mod/notifications.php:105
+#: ../../mod/notifications.php:105 ../../mod/notifications.php:104
 msgid "Claims to be known to you: "
 msgstr "Dice di conoscerti: "
 
-#: ../../mod/notifications.php:105
+#: ../../mod/notifications.php:105 ../../mod/notifications.php:104
 msgid "yes"
 msgstr "si"
 
-#: ../../mod/notifications.php:105
+#: ../../mod/notifications.php:105 ../../mod/notifications.php:104
 msgid "no"
 msgstr "no"
 
-#: ../../mod/notifications.php:111
+#: ../../mod/notifications.php:111 ../../mod/notifications.php:110
 msgid "Approve as: "
 msgstr "Approva come: "
 
-#: ../../mod/notifications.php:112
+#: ../../mod/notifications.php:112 ../../mod/notifications.php:111
 msgid "Friend"
 msgstr "Amico"
 
-#: ../../mod/notifications.php:113
+#: ../../mod/notifications.php:113 ../../mod/notifications.php:112
 msgid "Fan/Admirer"
 msgstr "Fan/Admiratore"
 
-#: ../../mod/notifications.php:120
+#: ../../mod/notifications.php:120 ../../mod/notifications.php:119
 msgid "Notification type: "
 msgstr "Tipo di notifica: "
 
-#: ../../mod/notifications.php:121
+#: ../../mod/notifications.php:121 ../../mod/notifications.php:120
 msgid "Friend/Connect Request"
 msgstr "Richiesta Amicizia/Connessione"
 
-#: ../../mod/notifications.php:121
+#: ../../mod/notifications.php:121 ../../mod/notifications.php:120
 msgid "New Follower"
 msgstr "Nuovo Seguace"
 
-#: ../../mod/notifications.php:131
+#: ../../mod/notifications.php:131 ../../mod/notifications.php:130
+#: ../../mod/notifications.php:153
 msgid "Approve"
 msgstr "Approva"
 
-#: ../../mod/notifications.php:140
+#: ../../mod/notifications.php:140 ../../mod/notifications.php:139
 msgid "No notifications."
 msgstr "Nessuna notifica."
 
-#: ../../mod/notifications.php:164
+#: ../../mod/notifications.php:164 ../../mod/notifications.php:159
 msgid "No registrations."
 msgstr "Nessuna registrazione."
 
@@ -1575,31 +1664,32 @@ msgstr ""
 "Accesso con identà incorretta. Accedi a <strong>questo</strong> profilo."
 
 #: ../../mod/dfrn_request.php:536 ../../include/items.php:1341
-#: ../../include/items.php:1364
+#: ../../include/items.php:1364 ../../mod/dfrn_request.php:538
+#: ../../include/items.php:1411
 msgid "[Name Withheld]"
 msgstr "[Nome Nascosto]"
 
-#: ../../mod/dfrn_request.php:543
+#: ../../mod/dfrn_request.php:543 ../../mod/dfrn_request.php:545
 msgid "Introduction received at "
 msgstr "Introduzione ricevuta su "
 
-#: ../../mod/dfrn_request.php:615
+#: ../../mod/dfrn_request.php:615 ../../mod/dfrn_request.php:617
 msgid "Friend/Connection Request"
 msgstr "Richieste di Amicizia/Connessione"
 
-#: ../../mod/dfrn_request.php:616
+#: ../../mod/dfrn_request.php:616 ../../mod/dfrn_request.php:618
 msgid "Please answer the following:"
 msgstr "Rispondi al seguente:"
 
-#: ../../mod/dfrn_request.php:617
+#: ../../mod/dfrn_request.php:617 ../../mod/dfrn_request.php:619
 msgid "Does $name know you?"
 msgstr "$name ti conosce?"
 
-#: ../../mod/dfrn_request.php:620
+#: ../../mod/dfrn_request.php:620 ../../mod/dfrn_request.php:622
 msgid "Add a personal note:"
 msgstr "Aggiungi una nota personale:"
 
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/dfrn_request.php:621 ../../mod/dfrn_request.php:623
 msgid ""
 "Please enter your profile address from one of the following supported social "
 "networks:"
@@ -1607,32 +1697,32 @@ msgstr ""
 "Inserisci l'indirizzo del tue profilo da uno dei seguenti supportati seocial "
 "network:"
 
-#: ../../mod/dfrn_request.php:622
+#: ../../mod/dfrn_request.php:622 ../../mod/dfrn_request.php:624
 msgid "Friendika"
 msgstr "Friendika"
 
-#: ../../mod/dfrn_request.php:623
+#: ../../mod/dfrn_request.php:623 ../../mod/dfrn_request.php:625
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet/Federated Social Web"
 
-#: ../../mod/dfrn_request.php:624
+#: ../../mod/dfrn_request.php:624 ../../mod/dfrn_request.php:626
 msgid "Private (secure) network"
 msgstr "Network (sicuro) privato"
 
-#: ../../mod/dfrn_request.php:625
+#: ../../mod/dfrn_request.php:625 ../../mod/dfrn_request.php:627
 msgid "Public (insecure) network"
 msgstr "Network (insicuro) pubblico"
 
-#: ../../mod/dfrn_request.php:626
+#: ../../mod/dfrn_request.php:626 ../../mod/dfrn_request.php:628
 msgid "Your profile address:"
 msgstr "L'indirizzo del tuo profilo:"
 
-#: ../../mod/dfrn_request.php:627
+#: ../../mod/dfrn_request.php:627 ../../mod/dfrn_request.php:629
 msgid "Submit Request"
 msgstr "Invia richiesta"
 
 #: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../addon/js_upload/js_upload.php:41
+#: ../../addon/js_upload/js_upload.php:41 ../../mod/dfrn_request.php:630
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1762,7 +1852,7 @@ msgstr "Messaggio inviato."
 msgid "Message could not be sent."
 msgstr "Il messaggio non puo' essere inviato."
 
-#: ../../mod/message.php:125 ../../include/nav.php:100
+#: ../../mod/message.php:125 ../../include/nav.php:100 ../../include/nav.php:101
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -1786,37 +1876,39 @@ msgstr "Messaggio cancellato."
 msgid "Conversation removed."
 msgstr "Conversazione rimossa."
 
-#: ../../mod/message.php:177 ../../mod/message.php:178
+#: ../../mod/message.php:177 ../../mod/message.php:178 ../../mod/message.php:180
 msgid "Send Private Message"
 msgstr "Invia messaggio privato"
 
 #: ../../mod/message.php:178 ../../mod/message.php:312
 #: ../../mod/message.php:179 ../../mod/message.php:313
+#: ../../mod/message.php:181 ../../mod/message.php:315
 msgid "To:"
 msgstr "A:"
 
 #: ../../mod/message.php:179 ../../mod/message.php:313
 #: ../../mod/message.php:180 ../../mod/message.php:314
+#: ../../mod/message.php:182 ../../mod/message.php:316
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: ../../mod/message.php:221 ../../mod/message.php:222
+#: ../../mod/message.php:221 ../../mod/message.php:222 ../../mod/message.php:224
 msgid "No messages."
 msgstr "Nessun messaggio."
 
-#: ../../mod/message.php:234 ../../mod/message.php:235
+#: ../../mod/message.php:234 ../../mod/message.php:235 ../../mod/message.php:237
 msgid "Delete conversation"
 msgstr "Cancella conversazione"
 
-#: ../../mod/message.php:264 ../../mod/message.php:265
+#: ../../mod/message.php:264 ../../mod/message.php:265 ../../mod/message.php:267
 msgid "Message not available."
 msgstr "Messaggio non disponibile."
 
-#: ../../mod/message.php:301 ../../mod/message.php:302
+#: ../../mod/message.php:301 ../../mod/message.php:302 ../../mod/message.php:304
 msgid "Delete message"
 msgstr "Cancella messaggio"
 
-#: ../../mod/message.php:311 ../../mod/message.php:312
+#: ../../mod/message.php:311 ../../mod/message.php:312 ../../mod/message.php:314
 msgid "Send Reply"
 msgstr "Invia risposta"
 
@@ -1903,6 +1995,7 @@ msgid "Welcome back "
 msgstr "Bentornato "
 
 #: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
+#: ../../mod/dfrn_poll.php:483
 #, php-format
 msgid "%s welcomes %s"
 msgstr "%s da il benvenuto a %s"
@@ -1919,7 +2012,7 @@ msgstr "Gruppo creato."
 msgid "Could not create group."
 msgstr "Impossibile creare il gruppo."
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
+#: ../../mod/group.php:43 ../../mod/group.php:123 ../../mod/group.php:127
 msgid "Group not found."
 msgstr "Gruppo non trovato."
 
@@ -1931,11 +2024,11 @@ msgstr "Il nome del gruppo è cambiato."
 msgid "Membership list updated."
 msgstr "Lista adesioni aggiornata."
 
-#: ../../mod/group.php:107
+#: ../../mod/group.php:107 ../../mod/group.php:111
 msgid "Group removed."
 msgstr "Gruppo rimosso."
 
-#: ../../mod/group.php:109
+#: ../../mod/group.php:109 ../../mod/group.php:113
 msgid "Unable to remove group."
 msgstr "Impossibile rimuovere il gruppo."
 
@@ -2529,7 +2622,7 @@ msgstr "settimane"
 msgid "day"
 msgstr "giorno"
 
-#: ../../include/datetime.php:154
+#: ../../include/datetime.php:154 ../../mod/settings.php:370
 msgid "days"
 msgstr "giorni"
 
@@ -2561,51 +2654,55 @@ msgstr "secondi"
 msgid " ago"
 msgstr " fa"
 
-#: ../../include/nav.php:56 ../../include/nav.php:91
+#: ../../include/nav.php:56 ../../include/nav.php:91 ../../include/nav.php:57
+#: ../../include/nav.php:92
 msgid "Home"
 msgstr "Home"
 
-#: ../../include/nav.php:64
+#: ../../include/nav.php:64 ../../include/nav.php:65
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:77 ../../include/nav.php:78
 msgid "Directory"
 msgstr "Elenco"
 
-#: ../../include/nav.php:87
+#: ../../include/nav.php:87 ../../include/nav.php:88
 msgid "Network"
 msgstr "Rete"
 
-#: ../../include/nav.php:96
+#: ../../include/nav.php:96 ../../include/nav.php:97
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../../include/nav.php:104
+#: ../../include/nav.php:104 ../../include/nav.php:105
 msgid "Manage"
 msgstr "Gestisci"
 
-#: ../../include/nav.php:107
+#: ../../include/nav.php:107 ../../include/nav.php:108
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:109 ../../mod/profiles.php:456
+#: ../../include/nav.php:110
 msgid "Profiles"
 msgstr "Profili"
 
 #: ../../include/items.php:1004 ../../include/items.php:1027
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1073
 msgid "Birthday:"
 msgstr "Compleanno:"
 
 #: ../../include/items.php:1348 ../../include/items.php:1371
+#: ../../include/items.php:1418
 msgid "You have a new follower at "
 msgstr "Hai un nuovo seguace su "
 
-#: ../../include/group.php:130
+#: ../../include/group.php:130 ../../include/group.php:145
 msgid "Create a new group"
 msgstr "Crea un nuovo gruppo"
 
-#: ../../include/group.php:131
+#: ../../include/group.php:131 ../../include/group.php:146
 msgid "Everybody"
 msgstr "Tutti"
 
@@ -2613,27 +2710,30 @@ msgstr "Tutti"
 msgid "Embedding disabled"
 msgstr "Inclusione disabilitata"
 
-#: ../../boot.php:2418 ../../boot.php:2425
+#: ../../boot.php:2418 ../../boot.php:2425 ../../boot.php:2433
 msgid "Birthday Reminders"
 msgstr "Promemoria Compleanni"
 
 #: ../../mod/profile.php:160 ../../mod/editpost.php:66 ../../mod/network.php:95
 #: ../../mod/network.php:100 ../../mod/profile.php:168
+#: ../../mod/profile.php:162 ../../mod/network.php:109
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Inserisci video Theora [.ogg]"
 
 #: ../../mod/profile.php:161 ../../mod/editpost.php:67 ../../mod/network.php:96
 #: ../../mod/network.php:101 ../../mod/profile.php:169
+#: ../../mod/profile.php:163 ../../mod/network.php:110
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Inserisci audio Vorbis [.ogg]"
 
 #: ../../mod/profile.php:354 ../../mod/display.php:222
 #: ../../mod/editpost.php:62 ../../mod/network.php:392
 #: ../../mod/network.php:463 ../../mod/profile.php:414
+#: ../../mod/profile.php:411 ../../mod/display.php:224 ../../mod/network.php:513
 msgid "Edit"
 msgstr "Modifica"
 
-#: ../../mod/search.php:54
+#: ../../mod/search.php:54 ../../mod/search.php:62
 msgid "No results."
 msgstr "Nessun risultato."
 
@@ -2658,7 +2758,7 @@ msgstr "Modifica messaggio"
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
 
-#: ../../boot.php:2016 ../../boot.php:2023
+#: ../../boot.php:2016 ../../boot.php:2023 ../../boot.php:2033
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -2666,30 +2766,36 @@ msgstr[0] "%d Contatto"
 msgstr[1] "%d Contatti"
 
 #: ../../mod/network.php:69 ../../mod/message.php:172 ../../mod/profile.php:137
+#: ../../mod/profile.php:130 ../../mod/network.php:77
 msgid "Please enter a link URL:"
 msgstr "Inserisci l'indirizzo del link:"
 
-#: ../../mod/network.php:70 ../../mod/profile.php:138
+#: ../../mod/network.php:70 ../../mod/profile.php:138 ../../mod/profile.php:131
+#: ../../mod/network.php:78
 msgid "Please enter a YouTube link:"
 msgstr "Inserisci l'indirizzo di YouTube:"
 
-#: ../../mod/network.php:71 ../../mod/profile.php:139
+#: ../../mod/network.php:71 ../../mod/profile.php:139 ../../mod/profile.php:132
+#: ../../mod/network.php:79
 msgid "Please enter a video(.ogg) link/URL:"
 msgstr "Inserisci il link a un video (.ogg):"
 
-#: ../../mod/network.php:72 ../../mod/profile.php:140
+#: ../../mod/network.php:72 ../../mod/profile.php:140 ../../mod/profile.php:133
+#: ../../mod/network.php:80
 msgid "Please enter an audio(.ogg) link/URL:"
 msgstr "Inserisci il link a un audio (.ogg):"
 
-#: ../../mod/network.php:73 ../../mod/profile.php:141
+#: ../../mod/network.php:73 ../../mod/profile.php:141 ../../mod/profile.php:134
+#: ../../mod/network.php:81
 msgid "Where are you right now?"
 msgstr "Dove sei ora?"
 
-#: ../../mod/network.php:363
+#: ../../mod/network.php:363 ../../mod/network.php:409
 msgid "See more posts like this"
 msgstr "Vedi altri post come questo"
 
 #: ../../mod/network.php:382 ../../mod/profile.php:357
+#: ../../mod/profile.php:352 ../../mod/network.php:428
 #, php-format
 msgid "See all %d comments"
 msgstr "Vedi tutti i %d commenti"
@@ -2706,11 +2812,11 @@ msgstr "Il database del tuo sito Friendika è stato installato."
 msgid "Proceed to registration"
 msgstr "Continua con la registrazione"
 
-#: ../../mod/directory.php:92
+#: ../../mod/directory.php:92 ../../mod/directory.php:94
 msgid "Gender: "
 msgstr "Genere:"
 
-#: ../../mod/directory.php:118
+#: ../../mod/directory.php:118 ../../mod/directory.php:120
 msgid "No entries (some entries may be hidden)."
 msgstr "Nessuna voce (qualche voce potrebbe essere nascosta)."
 
@@ -2773,7 +2879,7 @@ msgstr "Nessun risultato"
 msgid "Status"
 msgstr "Stato"
 
-#: ../../mod/profile.php:103
+#: ../../mod/profile.php:103 ../../include/profile_advanced.php:7
 msgid "Profile"
 msgstr "Profilo"
 
@@ -2781,7 +2887,7 @@ msgstr "Profilo"
 msgid "Photos"
 msgstr "Foto"
 
-#: ../../mod/settings.php:345
+#: ../../mod/settings.php:345 ../../mod/settings.php:351
 msgid "Export Personal Data"
 msgstr "Esporta i Dati Personali"
 
@@ -2796,3 +2902,662 @@ msgstr "Privacy non disponibile"
 #: ../../mod/contacts.php:253
 msgid "Private communications are not available for this contact."
 msgstr "Le comunicazioni private non sono disponibili per questo contatto."
+
+#: ../../boot.php:359
+msgid "Delete this item?"
+msgstr "Cancellare questo elemento?"
+
+#: ../../boot.php:360 ../../mod/profile.php:387 ../../mod/photos.php:1108
+#: ../../mod/display.php:173 ../../mod/network.php:505
+msgid "Comment"
+msgstr "Commento"
+
+#: ../../boot.php:2416
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../boot.php:2729
+msgid "View status"
+msgstr "Vedi stato"
+
+#: ../../boot.php:2730
+msgid "View profile"
+msgstr "Vedi profilo"
+
+#: ../../boot.php:2731
+msgid "View photos"
+msgstr "Vedi foto"
+
+#: ../../boot.php:2733
+msgid "Send PM"
+msgstr "Invia messaggio privato"
+
+#: ../../mod/profile.php:135 ../../mod/network.php:82
+msgid "Enter a title for this item"
+msgstr "Inserisci un titolo per questo elemento"
+
+#: ../../mod/profile.php:166 ../../mod/network.php:113
+msgid "Set title"
+msgstr "Imposta il titolo"
+
+#: ../../mod/profile_photo.php:188
+msgid "Upload File:"
+msgstr "Carica un file:"
+
+#: ../../mod/profile_photo.php:189
+msgid "Upload Profile Photo"
+msgstr "Carica la Foto del Profilo"
+
+#: ../../mod/profile_photo.php:190
+msgid "Upload"
+msgstr "Carica"
+
+#: ../../mod/profile_photo.php:191 ../../mod/settings.php:336
+msgid "or"
+msgstr "o"
+
+#: ../../mod/profile_photo.php:191
+msgid "select a photo from your photo albums"
+msgstr "seleziona una foto dai tuoi album"
+
+#: ../../mod/profile_photo.php:204
+msgid "Crop Image"
+msgstr "Ritaglia immagine"
+
+#: ../../mod/profile_photo.php:205
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr "Sistema il ritaglio dell'imagine per una visualizzazione ottimale."
+
+#: ../../mod/profile_photo.php:206
+msgid "Done Editing"
+msgstr "Fatto"
+
+#: ../../mod/profiles.php:354
+msgid "Hide my contact/friend list from viewers of this profile?"
+msgstr ""
+"Nascondi la mia lista di contatti/amici dai visitatori di questo profilo"
+
+#: ../../mod/profiles.php:369
+msgid "Edit Profile Details"
+msgstr "Modifica i Dettagli del Profilo"
+
+#: ../../mod/profiles.php:371
+msgid "View this profile"
+msgstr "Visualizza questo profilo"
+
+#: ../../mod/profiles.php:372
+msgid "Create a new profile using these settings"
+msgstr "Crea un nuovo profilo usando queste impostazioni"
+
+#: ../../mod/profiles.php:373
+msgid "Clone this profile"
+msgstr "Clona questo profilo"
+
+#: ../../mod/profiles.php:374
+msgid "Delete this profile"
+msgstr "Cancella questo profilo"
+
+#: ../../mod/profiles.php:375
+msgid "Profile Name:"
+msgstr "Nome del profilo:"
+
+#: ../../mod/profiles.php:376
+msgid "Your Full Name:"
+msgstr "Il tuo nome completo:"
+
+#: ../../mod/profiles.php:377
+msgid "Title/Description:"
+msgstr "Breve descrizione (es. titolo, posizione, altro):"
+
+#: ../../mod/profiles.php:378
+msgid "Your Gender:"
+msgstr "Il tuo sesso:"
+
+#: ../../mod/profiles.php:379
+msgid "Birthday (y/m/d):"
+msgstr "Data di nascita (a/m/g):"
+
+#: ../../mod/profiles.php:380
+msgid "Street Address:"
+msgstr "Indirizzo:"
+
+#: ../../mod/profiles.php:381
+msgid "Locality/City:"
+msgstr "Località/Città:"
+
+#: ../../mod/profiles.php:382
+msgid "Postal/Zip Code:"
+msgstr "CAP:"
+
+#: ../../mod/profiles.php:383
+msgid "Country:"
+msgstr "Nazione:"
+
+#: ../../mod/profiles.php:384
+msgid "Region/State:"
+msgstr "Regione/Stato:"
+
+#: ../../mod/profiles.php:385
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Stato sentimentale:"
+
+#: ../../mod/profiles.php:386
+msgid "Who: (if applicable)"
+msgstr "Con chi: (se possibile)"
+
+#: ../../mod/profiles.php:387
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Esempio: cathy123, Cathy Williams, cathy@example.com"
+
+#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90
+msgid "Sexual Preference:"
+msgstr "Preferenza sessuale:"
+
+#: ../../mod/profiles.php:389
+msgid "Homepage URL:"
+msgstr "Indirizzo homepage:"
+
+#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115
+msgid "Political Views:"
+msgstr "Orientamento politico:"
+
+#: ../../mod/profiles.php:391
+msgid "Religious Views:"
+msgstr "Orientamento religioso:"
+
+#: ../../mod/profiles.php:392
+msgid "Public Keywords:"
+msgstr "Parole chiave pubbliche:"
+
+#: ../../mod/profiles.php:393
+msgid "Private Keywords:"
+msgstr "Parole chiave private:"
+
+#: ../../mod/profiles.php:394
+msgid "Example: fishing photography software"
+msgstr "Esempio: pesca fotografia programmazione"
+
+#: ../../mod/profiles.php:395
+msgid "(Used for suggesting potential friends, can be seen by others)"
+msgstr "(Utilizzato per suggerire potenziali amici, può essere visto da altri)"
+
+#: ../../mod/profiles.php:396
+msgid "(Used for searching profiles, never shown to others)"
+msgstr "(Usato per cercare tra i profili, mai mostrato ad altri)"
+
+#: ../../mod/profiles.php:397
+msgid "Tell us about yourself..."
+msgstr "Racconta di te..."
+
+#: ../../mod/profiles.php:398
+msgid "Hobbies/Interests"
+msgstr "Hobbie/Interessi"
+
+#: ../../mod/profiles.php:399
+msgid "Contact information and Social Networks"
+msgstr "Informazioni su contatti e Social network"
+
+#: ../../mod/profiles.php:400
+msgid "Musical interests"
+msgstr "Interessi musicali"
+
+#: ../../mod/profiles.php:401
+msgid "Books, literature"
+msgstr "Libri, letteratura"
+
+#: ../../mod/profiles.php:402
+msgid "Television"
+msgstr "Televisione"
+
+#: ../../mod/profiles.php:403
+msgid "Film/dance/culture/entertainment"
+msgstr "Film/danza/cultura/intrattenimento"
+
+#: ../../mod/profiles.php:404
+msgid "Love/romance"
+msgstr "Amore/romanticismo"
+
+#: ../../mod/profiles.php:405
+msgid "Work/employment"
+msgstr "Lavoro/impiego"
+
+#: ../../mod/profiles.php:406
+msgid "School/education"
+msgstr "Scuola/educazione"
+
+#: ../../mod/profiles.php:457
+msgid "Change profile photo"
+msgstr "Cambia la foto del profilo"
+
+#: ../../mod/profiles.php:458
+msgid "Create New Profile"
+msgstr "Crea un nuovo profilo"
+
+#: ../../mod/settings.php:262
+msgid "Normal Account"
+msgstr "Account normale"
+
+#: ../../mod/settings.php:263
+msgid "This account is a normal personal profile"
+msgstr "Questo account è un normale profilo personale"
+
+#: ../../mod/settings.php:264
+msgid "Soapbox Account"
+msgstr "Account Palco"
+
+#: ../../mod/settings.php:265
+msgid "Automatically approve all connection/friend requests as read-only fans"
+msgstr ""
+"Accetta automaticamente le richieste di connessione/amicizia come fan che "
+"possono solamente leggere"
+
+#: ../../mod/settings.php:266
+msgid "Community/Celebrity Account"
+msgstr "Account Celebrità/Comunità"
+
+#: ../../mod/settings.php:267
+msgid "Automatically approve all connection/friend requests as read-write fans"
+msgstr ""
+"Accetta automaticamente le richieste di connessione/amicizia come fan che "
+"possono scrivere in bacheca"
+
+#: ../../mod/settings.php:268
+msgid "Automatic Friend Account"
+msgstr "Account Amico Automatico"
+
+#: ../../mod/settings.php:269
+msgid "Automatically approve all connection/friend requests as friends"
+msgstr ""
+"Accetta automaticamente le richieste di connessione/amicizia come amici"
+
+#: ../../mod/settings.php:288
+msgid "Publish your default profile in site directory?"
+msgstr "Pubblicare il tuo profilo di default nell'elenco del sito?"
+
+#: ../../mod/settings.php:300
+msgid "Publish your default profile in global social directory?"
+msgstr "Pubblicare il tuo profilo di default nell'elenco sociale globale?"
+
+#: ../../mod/settings.php:341
+msgid "Your profile address is"
+msgstr "L'indirizzo del tuo profilo è"
+
+#: ../../mod/settings.php:357
+msgid "Basic Settings"
+msgstr "Impostazioni base"
+
+#: ../../mod/settings.php:358 ../../include/profile_advanced.php:10
+msgid "Full Name:"
+msgstr "Nome completo:"
+
+#: ../../mod/settings.php:359
+msgid "Email Address:"
+msgstr "Indirizzo Email:"
+
+#: ../../mod/settings.php:360
+msgid "Your Timezone:"
+msgstr "Il tuo fuso orario:"
+
+#: ../../mod/settings.php:361
+msgid "Default Post Location:"
+msgstr "Località di default per l'invio:"
+
+#: ../../mod/settings.php:362
+msgid "Use Browser Location:"
+msgstr "Usa la località rilevata dal browser:"
+
+#: ../../mod/settings.php:363
+msgid "Display Theme:"
+msgstr "Tema:"
+
+#: ../../mod/settings.php:365
+msgid "Security and Privacy Settings"
+msgstr "Impostazioni di Sicurezza e Privacy"
+
+#: ../../mod/settings.php:366
+msgid "Maximum Friend Requests/Day:"
+msgstr "Numero massimo di richieste di amicizia per giorno:"
+
+#: ../../mod/settings.php:367
+msgid "(to prevent spam abuse)"
+msgstr "(per prevenire lo spam)"
+
+#: ../../mod/settings.php:368
+msgid "Allow friends to post to your profile page:"
+msgstr "Permetti agli amici di inviare messaggi sulla tua bacheca:"
+
+#: ../../mod/settings.php:369
+msgid "Automatically expire (delete) posts older than"
+msgstr "Cancella automaticamente i messaggi più vecchi di"
+
+#: ../../mod/settings.php:371
+msgid "Notification Settings"
+msgstr "Impostazioni Notifiche"
+
+#: ../../mod/settings.php:372
+msgid "Send a notification email when:"
+msgstr "Invia una mail di notifica quando:"
+
+#: ../../mod/settings.php:373
+msgid "You receive an introduction"
+msgstr "Ricevi una presentazione"
+
+#: ../../mod/settings.php:374
+msgid "Your introductions are confirmed"
+msgstr "Le tue presentazioni sono confermate"
+
+#: ../../mod/settings.php:375
+msgid "Someone writes on your profile wall"
+msgstr "Qualcuno scrive sulla bacheca del tuo profilo"
+
+#: ../../mod/settings.php:376
+msgid "Someone writes a followup comment"
+msgstr "Qualcuno scrive un commento a un tuo messaggio"
+
+#: ../../mod/settings.php:377
+msgid "You receive a private message"
+msgstr "Ricevi un messaggio privato"
+
+#: ../../mod/settings.php:378
+msgid "Password Settings"
+msgstr "Impostazioni Password"
+
+#: ../../mod/settings.php:379
+msgid "Leave password fields blank unless changing"
+msgstr ""
+"Lascia questi campi in bianco per non effettuare variazioni alla password"
+
+#: ../../mod/settings.php:380
+msgid "New Password:"
+msgstr "Nuova Password:"
+
+#: ../../mod/settings.php:381
+msgid "Confirm:"
+msgstr "Conferma:"
+
+#: ../../mod/settings.php:382
+msgid "Advanced Page Settings"
+msgstr "Impostazioni Avanzate Account"
+
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
+msgstr "Visibilità del profilo"
+
+#: ../../mod/contacts.php:266
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
+msgstr ""
+"Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in "
+"modo sicuro."
+
+#: ../../mod/contacts.php:267
+msgid "Contact Information / Notes"
+msgstr "Informazioni / Note sul contatto"
+
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
+msgstr "Reputazione Online"
+
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
+msgstr ""
+"Puo' capitare che i tuoi amici vogliano sapere la legittimità online dei "
+"questa persona."
+
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> to guide them."
+msgstr ""
+"Puoi aiutarli a scegliere se interagire o no con questa persona fornendo una "
+"<em>reputazione</em> per guidarli."
+
+#: ../../mod/contacts.php:271
+msgid ""
+"Please take a moment to elaborate on this selection if you feel it could be "
+"helpful to others."
+msgstr ""
+"Prenditi un momento per pensare su questa selezione se senti che puo' essere "
+"utile ad altri."
+
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
+msgstr "Inviato con successo."
+
+#: ../../mod/install.php:121
+msgid "Friendika Social Network"
+msgstr "Friendika Social Network"
+
+#: ../../mod/install.php:122
+msgid "Installation"
+msgstr "Installazione"
+
+#: ../../mod/install.php:123
+msgid ""
+"In order to install Friendika we need to know how to contact your database."
+msgstr ""
+"Per installare Friendika dobbiamo sapere come contattare il tuo database."
+
+#: ../../mod/install.php:124
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
+msgstr ""
+"Contatta il tuo fornitore di hosting o l'amministratore del sito se hai "
+"domande su questi settaggi."
+
+#: ../../mod/install.php:125
+msgid ""
+"The database you specify below must already exist. If it does not, please "
+"create it before continuing."
+msgstr ""
+"Il datatabase specificato qui sotto deve esistere. Se non è così, crealo "
+"prima di continuare."
+
+#: ../../mod/install.php:126
+msgid "Database Server Name"
+msgstr ""
+
+#: ../../mod/install.php:127
+msgid "Database Login Name"
+msgstr ""
+
+#: ../../mod/install.php:128
+msgid "Database Login Password"
+msgstr ""
+
+#: ../../mod/install.php:129
+msgid "Database Name"
+msgstr ""
+
+#: ../../mod/install.php:130
+msgid "Please select a default timezone for your website"
+msgstr "Seleziona un fuso orario di default per il tuo sito web"
+
+#: ../../mod/network.php:59
+#, php-format
+msgid "%d member"
+msgid_plural "%d members"
+msgstr[0] "%d membro"
+msgstr[1] "%d membri"
+
+#: ../../mod/network.php:60
+#, php-format
+msgid "Warning: This group contains %s from an insecure network."
+msgstr "Attenzione: questo gruppo contiente %s da un network insicuro."
+
+#: ../../mod/network.php:61
+msgid "Private messages to this group are at risk of public disclosure."
+msgstr ""
+"I messaggi privati a questo gruppo sono a rischio di visualizzazione "
+"pubblica."
+
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
+msgstr "Richieste di amicizia/connessione in attesa"
+
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
+msgstr "Richieste di registrazione in attesa di conferma"
+
+#: ../../mod/notifications.php:154
+msgid "Deny"
+msgstr "Nega"
+
+#: ../../mod/dfrn_request.php:503
+#, php-format
+msgid "Welcome home %s."
+msgstr "Bentornato a casa %s."
+
+#: ../../mod/dfrn_request.php:504
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
+msgstr "Conferma la tua richiesta di connessione con %s."
+
+#: ../../mod/dfrn_request.php:505
+msgid "Confirm"
+msgstr "Conferma"
+
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
+msgstr "Richiesta di reimpostazione pasword inviata. Controlla la tua email."
+
+#: ../../mod/lostpass.php:56
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+"La richiesta non può essere verificata. (Puoi averla già richiesta "
+"precendentemente). Reimpostazione password fallita."
+
+#: ../../mod/lostpass.php:75
+msgid "Your password has been reset as requested."
+msgstr "La tua password è stata reimpostata come richiesto."
+
+#: ../../mod/lostpass.php:76
+msgid "Your new password is"
+msgstr "La tua nuova password è"
+
+#: ../../mod/lostpass.php:77
+msgid "Save or copy your new password - and then"
+msgstr "Sava o copa la tua nuova password, quindi"
+
+#: ../../mod/lostpass.php:78
+msgid "click here to login"
+msgstr "clicca qui per entrare"
+
+#: ../../mod/lostpass.php:79
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+"Puoi cambiare la tua password dalla pagina <em>Impostazioni</em> dopo essere "
+"entrato."
+
+#: ../../mod/lostpass.php:107
+msgid "Forgot your Password?"
+msgstr "Dimenticato la tua password?"
+
+#: ../../mod/lostpass.php:108
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+"Inserisci il tuo indirizzo email per richiedere di reimpostare la tua "
+"passwork."
+
+#: ../../mod/lostpass.php:109
+msgid "Nickname or Email: "
+msgstr "Nome utente o Email: "
+
+#: ../../mod/lostpass.php:110
+msgid "Reset"
+msgstr "Reimposta"
+
+#: ../../mod/directory.php:39
+msgid "Site Directory"
+msgstr "Elenco del Sito"
+
+#: ../../mod/message.php:240
+msgid "D, d M Y - g:i A"
+msgstr "D d M Y - G:i"
+
+#: ../../mod/group.php:95
+msgid "Create a group of contacts/friends."
+msgstr "Crea un gruppo di amici/contatti."
+
+#: ../../mod/group.php:96 ../../mod/group.php:153
+msgid "Group Name: "
+msgstr "Nome del gruppo:"
+
+#: ../../mod/group.php:152
+msgid "Group Editor"
+msgstr "Modifica gruppo"
+
+#: ../../mod/group.php:154
+msgid "Members:"
+msgstr "Membri:"
+
+#: ../../include/profile_advanced.php:45
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/profile_advanced.php:46
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/profile_advanced.php:59
+msgid "Age:"
+msgstr "Età:"
+
+#: ../../include/profile_advanced.php:70
+msgid "<span class=\"heart\">&hearts;</span> Status:"
+msgstr "<span class=\"heart\">&hearts;</span> Stato sentimentale:"
+
+#: ../../include/profile_advanced.php:127
+msgid "Religion:"
+msgstr "Religione:"
+
+#: ../../include/profile_advanced.php:138
+msgid "About:"
+msgstr "Informazioni:"
+
+#: ../../include/profile_advanced.php:150
+msgid "Hobbies/Interests:"
+msgstr "Hobbie/Interessi:"
+
+#: ../../include/profile_advanced.php:162
+msgid "Contact information and Social Networks:"
+msgstr "Informazioni su contatti e Social network:"
+
+#: ../../include/profile_advanced.php:174
+msgid "Musical interests:"
+msgstr "Interessi musicali:"
+
+#: ../../include/profile_advanced.php:186
+msgid "Books, literature:"
+msgstr "Libri, letteratura:"
+
+#: ../../include/profile_advanced.php:198
+msgid "Television:"
+msgstr "Televisione:"
+
+#: ../../include/profile_advanced.php:210
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/danza/cultura/intrattenimento:"
+
+#: ../../include/profile_advanced.php:222
+msgid "Love/Romance:"
+msgstr "Amore/romanticismo:"
+
+#: ../../include/profile_advanced.php:234
+msgid "Work/employment:"
+msgstr "Lavoro/impiego:"
+
+#: ../../include/profile_advanced.php:246
+msgid "School/education:"
+msgstr "Scuola/educazione:"
diff --git a/view/it/profile-hide-friends.tpl b/view/it/profile-hide-friends.tpl
deleted file mode 100644
index fb04d449b..000000000
--- a/view/it/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-Nascondere la lista di contatti/amici dai visitatori di questo profilo?
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Si</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">No</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/it/profile-in-directory.tpl b/view/it/profile-in-directory.tpl
deleted file mode 100644
index 69b025366..000000000
--- a/view/it/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Pubblicare il tuo profilo di default nell'elenco sul sito?
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Si</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/it/profile-in-netdir.tpl b/view/it/profile-in-netdir.tpl
deleted file mode 100644
index ffe56edb6..000000000
--- a/view/it/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Pubblicare il tuo profilo di default nell'elenco sociale globale? 
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Si</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php
deleted file mode 100644
index fe065d46f..000000000
--- a/view/it/profile_advanced.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profilo</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Nome Completo:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Genere:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Compleanno:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">' 
-	. ((intval($a->profile['dob'])) 
-		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
-		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
-	. "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Et&agrave;:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Stato:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
-	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Preferenze sessuali:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
-	$homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Orientamento politico:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religione:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">Informazioni varie:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbie/Interessi:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Informazioni su contatti e Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Interessi musicali:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Libri, letteratura:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Televisione:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/danza/cultura/intrattenimento:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Amore/romanticismo:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Lavoro/impiego:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">Scuola/educazione:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-EOT;
-}
-
-
diff --git a/view/it/profile_edit.tpl b/view/it/profile_edit.tpl
deleted file mode 100644
index 9f2a13790..000000000
--- a/view/it/profile_edit.tpl
+++ /dev/null
@@ -1,299 +0,0 @@
-<h1>Modifica i dettagli del profilo</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">Guarda questo profilo</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clona questo profilo</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Elimina questo profilo</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Nome profilo: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Il tuo nome completo: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Breve descrizione: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div><div id="profile-edit-pdesc-desc">(es. titolo, posizione, altro)</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Il tuo sesso: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Data di nascia (a/m/g): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Indirizzo: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Localit&agrave;/Citt&agrave;: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >CAP: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Stato: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Regione: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span>Stato sentimentale: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Con chi: </label>
-<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Preferenza sessuale: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Indirizzo homepage: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Orientamento politico: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religione: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >[Public] Parole chiave: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Esempio: pescare fotografia software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Parole chiave: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Esempio: pescare fotografia software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Usati per la ricerca dei profili, mai mostrati agli altri)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Raccontaci di te....
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Hobbie/Interessi
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Informazioni su contatti e Social network
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Interessi musicali
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-Libri, letteratura
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-Televisione
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Film/danza/cultura/intrattenimento
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-Amore/romanticismo
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Lavoro/impiego
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-Scuola/educazione
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Aggiorna" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
diff --git a/view/it/profile_entry_default.tpl b/view/it/profile_entry_default.tpl
deleted file mode 100644
index 8c9aedae8..000000000
--- a/view/it/profile_entry_default.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Immagine Profilo" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
diff --git a/view/it/profile_listing_header.tpl b/view/it/profile_listing_header.tpl
deleted file mode 100644
index 995a577b3..000000000
--- a/view/it/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>Profiles</h1>
-<p id="profile-listing-desc" >
-<a href="profile_photo" >Cambia la foto del profilo</a>
-</p>
-<div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Crea un nuovo profilo</a>
-</div>
-
diff --git a/view/it/profile_photo.tpl b/view/it/profile_photo.tpl
deleted file mode 100644
index 4d77e87cf..000000000
--- a/view/it/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h1>Carica foto del profilo</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Carica File: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Carica">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-o <a href='photos/$user'>seleziona una foto da un album</a>
-</div>
\ No newline at end of file
diff --git a/view/it/pwdreset.tpl b/view/it/pwdreset.tpl
deleted file mode 100644
index c283033ee..000000000
--- a/view/it/pwdreset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>Resetta Password</h3>
-
-<p>
-La tua password &egrave; stata resettata come richiesto.
-</p>
-<p>
-La tua nuova password &egrave;
-</p>
-<p>
-$newpass
-</p>
-<p>
-Salva o copia la tua nuova password, e quindi <a href="$baseurl" >clicca qui per accedere</a>.
-</p>
-<p>
-La tua password puo' essere cambiata dalla pagina 'Impostazioni0 dopo aver effettuato l'accesso.
diff --git a/view/it/registrations.tpl b/view/it/registrations.tpl
deleted file mode 100644
index 698c766f7..000000000
--- a/view/it/registrations.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<li>$fullname ($email) : <a href="$approvelink">Approva</a> - <a href="$denylink">Rifiuta</a></li>
diff --git a/view/it/settings.tpl b/view/it/settings.tpl
deleted file mode 100644
index f361419da..000000000
--- a/view/it/settings.tpl
+++ /dev/null
@@ -1,175 +0,0 @@
-<h1>Impostazioni account</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Impostazioni Plugin</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Impostazioni base</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Nome Completo: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Indirizzo Email: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Il tuo fuso orario: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Localit&agrave; di default per l'invio: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Usa la localit&agrave; rilevata dal browser: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Tema: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-<h3 class="settings-heading">Impostazioni di Sicurezza e Privacy</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Numero massimo di richieste di amicizia per giorno</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(per prevenire lo spam)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Permetti agli amici di inviare messaggi sulla tua pagina del profilo: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-<div id="settings-expire-desc">Cancella automaticamente i messaggi pi&ugrave; vecchi di <input type="text" size="3" name="expire" value="$expire" /> giorni</div>
-<div id="settings-expire-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-
-<h3 class="settings-heading">Impostazione Notifiche</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Invia una mail di notifica quando: </div>
-<label for="notify1" id="settings-label-notify1">Ricevi una presentazione</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Le tue presentazioni sono confermate</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Qualcuno scrive sulla bacheca del tuo profilo</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Qualcuno scrive un commento a un tuo messaggio</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Ricevi un messaggio privato</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-<h3 class="settings-heading">Impostazioni Password</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Lascia questi campi in bianco per non effettuare variazioni alla password
-</p>
-<label id="settings-password-label" for="settings-password" >Nuova Password: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Conferma: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
-<h3 class="settings-heading">Impostazioni Avanzate Account</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Aggiorna" />
-</div>
-
-
diff --git a/view/it/settings_nick_set.tpl b/view/it/settings_nick_set.tpl
deleted file mode 100644
index c57653703..000000000
--- a/view/it/settings_nick_set.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">L'indirizzo del tuo profilo &egrave; <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/it/settings_nick_subdir.tpl b/view/it/settings_nick_subdir.tpl
deleted file mode 100644
index fc6138c6c..000000000
--- a/view/it/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>
-Sembra che il tuo sito web sia in una sottocartella del sito<br />
-$hostname. Qualche impostazione potrebbe non funzionare correttamente.<br />
-</p>
-<p>
-Se hai problemi, potresti avere migliori risultati usando l'inidirizzo<br /> '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
diff --git a/view/it/strings.php b/view/it/strings.php
index 544c815c1..b507fcb34 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -606,3 +606,157 @@ $a->strings["Export Personal Data"] = "Esporta i Dati Personali";
 $a->strings["Find People With Shared Interests"] = "Trova persone che condividono i tuoi interessi";
 $a->strings["Privacy Unavailable"] = "Privacy non disponibile";
 $a->strings["Private communications are not available for this contact."] = "Le comunicazioni private non sono disponibili per questo contatto.";
+$a->strings["Delete this item?"] = "Cancellare questo elemento?";
+$a->strings["Comment"] = "Commento";
+$a->strings["g A l F d"] = "g A l d F";
+$a->strings["View status"] = "Vedi stato";
+$a->strings["View profile"] = "Vedi profilo";
+$a->strings["View photos"] = "Vedi foto";
+$a->strings["Send PM"] = "Invia messaggio privato";
+$a->strings["Enter a title for this item"] = "Inserisci un titolo per questo elemento";
+$a->strings["Set title"] = "Imposta il titolo";
+$a->strings["Upload File:"] = "Carica un file:";
+$a->strings["Upload Profile Photo"] = "Carica la Foto del Profilo";
+$a->strings["Upload"] = "Carica";
+$a->strings["or"] = "o";
+$a->strings["select a photo from your photo albums"] = "seleziona una foto dai tuoi album";
+$a->strings["Crop Image"] = "Ritaglia immagine";
+$a->strings["Please adjust the image cropping for optimum viewing."] = "Sistema il ritaglio dell'imagine per una visualizzazione ottimale.";
+$a->strings["Done Editing"] = "Fatto";
+$a->strings["Hide my contact/friend list from viewers of this profile?"] = "Nascondi la mia lista di contatti/amici dai visitatori di questo profilo";
+$a->strings["Edit Profile Details"] = "Modifica i Dettagli del Profilo";
+$a->strings["View this profile"] = "Visualizza questo profilo";
+$a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni";
+$a->strings["Clone this profile"] = "Clona questo profilo";
+$a->strings["Delete this profile"] = "Cancella questo profilo";
+$a->strings["Profile Name:"] = "Nome del profilo:";
+$a->strings["Your Full Name:"] = "Il tuo nome completo:";
+$a->strings["Title/Description:"] = "Breve descrizione (es. titolo, posizione, altro):";
+$a->strings["Your Gender:"] = "Il tuo sesso:";
+$a->strings["Birthday (y/m/d):"] = "Data di nascita (a/m/g):";
+$a->strings["Street Address:"] = "Indirizzo:";
+$a->strings["Locality/City:"] = "Località/Città:";
+$a->strings["Postal/Zip Code:"] = "CAP:";
+$a->strings["Country:"] = "Nazione:";
+$a->strings["Region/State:"] = "Regione/Stato:";
+$a->strings["<span class=\"heart\">&hearts;</span> Marital Status:"] = "<span class=\"heart\">&hearts;</span> Stato sentimentale:";
+$a->strings["Who: (if applicable)"] = "Con chi: (se possibile)";
+$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Esempio: cathy123, Cathy Williams, cathy@example.com";
+$a->strings["Sexual Preference:"] = "Preferenza sessuale:";
+$a->strings["Homepage URL:"] = "Indirizzo homepage:";
+$a->strings["Political Views:"] = "Orientamento politico:";
+$a->strings["Religious Views:"] = "Orientamento religioso:";
+$a->strings["Public Keywords:"] = "Parole chiave pubbliche:";
+$a->strings["Private Keywords:"] = "Parole chiave private:";
+$a->strings["Example: fishing photography software"] = "Esempio: pesca fotografia programmazione";
+$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Utilizzato per suggerire potenziali amici, può essere visto da altri)";
+$a->strings["(Used for searching profiles, never shown to others)"] = "(Usato per cercare tra i profili, mai mostrato ad altri)";
+$a->strings["Tell us about yourself..."] = "Racconta di te...";
+$a->strings["Hobbies/Interests"] = "Hobbie/Interessi";
+$a->strings["Contact information and Social Networks"] = "Informazioni su contatti e Social network";
+$a->strings["Musical interests"] = "Interessi musicali";
+$a->strings["Books, literature"] = "Libri, letteratura";
+$a->strings["Television"] = "Televisione";
+$a->strings["Film/dance/culture/entertainment"] = "Film/danza/cultura/intrattenimento";
+$a->strings["Love/romance"] = "Amore/romanticismo";
+$a->strings["Work/employment"] = "Lavoro/impiego";
+$a->strings["School/education"] = "Scuola/educazione";
+$a->strings["Change profile photo"] = "Cambia la foto del profilo";
+$a->strings["Create New Profile"] = "Crea un nuovo profilo";
+$a->strings["Normal Account"] = "Account normale";
+$a->strings["This account is a normal personal profile"] = "Questo account è un normale profilo personale";
+$a->strings["Soapbox Account"] = "Account Palco";
+$a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Accetta automaticamente le richieste di connessione/amicizia come fan che possono solamente leggere";
+$a->strings["Community/Celebrity Account"] = "Account Celebrità/Comunità";
+$a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Accetta automaticamente le richieste di connessione/amicizia come fan che possono scrivere in bacheca";
+$a->strings["Automatic Friend Account"] = "Account Amico Automatico";
+$a->strings["Automatically approve all connection/friend requests as friends"] = "Accetta automaticamente le richieste di connessione/amicizia come amici";
+$a->strings["Publish your default profile in site directory?"] = "Pubblicare il tuo profilo di default nell'elenco del sito?";
+$a->strings["Publish your default profile in global social directory?"] = "Pubblicare il tuo profilo di default nell'elenco sociale globale?";
+$a->strings["Your profile address is"] = "L'indirizzo del tuo profilo è";
+$a->strings["Basic Settings"] = "Impostazioni base";
+$a->strings["Full Name:"] = "Nome completo:";
+$a->strings["Email Address:"] = "Indirizzo Email:";
+$a->strings["Your Timezone:"] = "Il tuo fuso orario:";
+$a->strings["Default Post Location:"] = "Località di default per l'invio:";
+$a->strings["Use Browser Location:"] = "Usa la località rilevata dal browser:";
+$a->strings["Display Theme:"] = "Tema:";
+$a->strings["Security and Privacy Settings"] = "Impostazioni di Sicurezza e Privacy";
+$a->strings["Maximum Friend Requests/Day:"] = "Numero massimo di richieste di amicizia per giorno:";
+$a->strings["(to prevent spam abuse)"] = "(per prevenire lo spam)";
+$a->strings["Allow friends to post to your profile page:"] = "Permetti agli amici di inviare messaggi sulla tua bacheca:";
+$a->strings["Automatically expire (delete) posts older than"] = "Cancella automaticamente i messaggi più vecchi di";
+$a->strings["Notification Settings"] = "Impostazioni Notifiche";
+$a->strings["Send a notification email when:"] = "Invia una mail di notifica quando:";
+$a->strings["You receive an introduction"] = "Ricevi una presentazione";
+$a->strings["Your introductions are confirmed"] = "Le tue presentazioni sono confermate";
+$a->strings["Someone writes on your profile wall"] = "Qualcuno scrive sulla bacheca del tuo profilo";
+$a->strings["Someone writes a followup comment"] = "Qualcuno scrive un commento a un tuo messaggio";
+$a->strings["You receive a private message"] = "Ricevi un messaggio privato";
+$a->strings["Password Settings"] = "Impostazioni Password";
+$a->strings["Leave password fields blank unless changing"] = "Lascia questi campi in bianco per non effettuare variazioni alla password";
+$a->strings["New Password:"] = "Nuova Password:";
+$a->strings["Confirm:"] = "Conferma:";
+$a->strings["Advanced Page Settings"] = "Impostazioni Avanzate Account";
+$a->strings["Profile Visibility"] = "Visibilità del profilo";
+$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro.";
+$a->strings["Contact Information / Notes"] = "Informazioni / Note sul contatto";
+$a->strings["Online Reputation"] = "Reputazione Online";
+$a->strings["Occasionally your friends may wish to inquire about this person's online legitimacy."] = "Puo' capitare che i tuoi amici vogliano sapere la legittimità online dei questa persona.";
+$a->strings["You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them."] = "Puoi aiutarli a scegliere se interagire o no con questa persona fornendo una <em>reputazione</em> per guidarli.";
+$a->strings["Please take a moment to elaborate on this selection if you feel it could be helpful to others."] = "Prenditi un momento per pensare su questa selezione se senti che puo' essere utile ad altri.";
+$a->strings["Post successful."] = "Inviato con successo.";
+$a->strings["Friendika Social Network"] = "Friendika Social Network";
+$a->strings["Installation"] = "Installazione";
+$a->strings["In order to install Friendika we need to know how to contact your database."] = "Per installare Friendika dobbiamo sapere come contattare il tuo database.";
+$a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "Contatta il tuo fornitore di hosting o l'amministratore del sito se hai domande su questi settaggi.";
+$a->strings["The database you specify below must already exist. If it does not, please create it before continuing."] = "Il datatabase specificato qui sotto deve esistere. Se non è così, crealo prima di continuare.";
+$a->strings["Database Server Name"] = "";
+$a->strings["Database Login Name"] = "";
+$a->strings["Database Login Password"] = "";
+$a->strings["Database Name"] = "";
+$a->strings["Please select a default timezone for your website"] = "Seleziona un fuso orario di default per il tuo sito web";
+$a->strings["%d member"] = array(
+	0 => "%d membro",
+	1 => "%d membri",
+);
+$a->strings["Warning: This group contains %s from an insecure network."] = "Attenzione: questo gruppo contiente %s da un network insicuro.";
+$a->strings["Private messages to this group are at risk of public disclosure."] = "I messaggi privati a questo gruppo sono a rischio di visualizzazione pubblica.";
+$a->strings["Pending Friend/Connect Notifications"] = "Richieste di amicizia/connessione in attesa";
+$a->strings["User registrations waiting for confirm"] = "Richieste di registrazione in attesa di conferma";
+$a->strings["Deny"] = "Nega";
+$a->strings["Welcome home %s."] = "Bentornato a casa %s.";
+$a->strings["Please confirm your introduction/connection request to %s."] = "Conferma la tua richiesta di connessione con %s.";
+$a->strings["Confirm"] = "Conferma";
+$a->strings["Password reset request issued. Check your email."] = "Richiesta di reimpostazione pasword inviata. Controlla la tua email.";
+$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La richiesta non può essere verificata. (Puoi averla già richiesta precendentemente). Reimpostazione password fallita.";
+$a->strings["Your password has been reset as requested."] = "La tua password è stata reimpostata come richiesto.";
+$a->strings["Your new password is"] = "La tua nuova password è";
+$a->strings["Save or copy your new password - and then"] = "Sava o copa la tua nuova password, quindi";
+$a->strings["click here to login"] = "clicca qui per entrare";
+$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puoi cambiare la tua password dalla pagina <em>Impostazioni</em> dopo essere entrato.";
+$a->strings["Forgot your Password?"] = "Dimenticato la tua password?";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per richiedere di reimpostare la tua passwork.";
+$a->strings["Nickname or Email: "] = "Nome utente o Email: ";
+$a->strings["Reset"] = "Reimposta";
+$a->strings["Site Directory"] = "Elenco del Sito";
+$a->strings["D, d M Y - g:i A"] = "D d M Y - G:i";
+$a->strings["Create a group of contacts/friends."] = "Crea un gruppo di amici/contatti.";
+$a->strings["Group Name: "] = "Nome del gruppo:";
+$a->strings["Group Editor"] = "Modifica gruppo";
+$a->strings["Members:"] = "Membri:";
+$a->strings["j F, Y"] = "j F Y";
+$a->strings["j F"] = "j F";
+$a->strings["Age:"] = "Età:";
+$a->strings["<span class=\"heart\">&hearts;</span> Status:"] = "<span class=\"heart\">&hearts;</span> Stato sentimentale:";
+$a->strings["Religion:"] = "Religione:";
+$a->strings["About:"] = "Informazioni:";
+$a->strings["Hobbies/Interests:"] = "Hobbie/Interessi:";
+$a->strings["Contact information and Social Networks:"] = "Informazioni su contatti e Social network:";
+$a->strings["Musical interests:"] = "Interessi musicali:";
+$a->strings["Books, literature:"] = "Libri, letteratura:";
+$a->strings["Television:"] = "Televisione:";
+$a->strings["Film/dance/culture/entertainment:"] = "Film/danza/cultura/intrattenimento:";
+$a->strings["Love/Romance:"] = "Amore/romanticismo:";
+$a->strings["Work/employment:"] = "Lavoro/impiego:";
+$a->strings["School/education:"] = "Scuola/educazione:";
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index eebaf803a..94f0f58f8 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -89,6 +89,7 @@ tinyMCE.init({
 	function jotGetLink() {
 		reply = prompt("$linkurl");
 		if(reply && reply.length) {
+			reply = bin2hex(reply);
 			$('#profile-rotator').show();
 			$.get('parse_url?url=' + reply, function(data) {
 				tinyMCE.execCommand('mceInsertRawHTML',false,data);
diff --git a/view/opensearch.tpl b/view/opensearch.tpl
new file mode 100644
index 000000000..374fcaac9
--- /dev/null
+++ b/view/opensearch.tpl
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+	<ShortName>Friendika@$nodename</ShortName>
+	<Description>Search in Friendika@$nodename</Description>
+	<Contact>http://bugs.friendika.com/</Contact>
+	<Image height="16" width="16" type="image/png">$baseurl/images/friendika-16.png</Image>
+	<Image height="64" width="64" type="image/png">$baseurl/images/friendika-64.png</Image>
+	<Url type="text/html" 
+        template="$baseurl/search?search={searchTerms}"/>
+	<Url type="application/opensearchdescription+xml"
+      	rel="self"
+      	template="$baseurl/opensearch" />        
+</OpenSearchDescription>
\ No newline at end of file
diff --git a/view/en/profile-hide-friends.tpl b/view/profile-hide-friends.tpl
index 54ade00fe..9ecacfbe0 100644
--- a/view/en/profile-hide-friends.tpl
+++ b/view/profile-hide-friends.tpl
@@ -1,15 +1,15 @@
 <p id="hide-friends-text">
-Hide my contact/friend list from viewers of this profile?
+$desc
 </p>
 
 		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label>
+		<label id="hide-friends-yes-label" for="hide-friends-yes">$yes_str</label>
 		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
 
 		<div id="hide-friends-break" ></div>	
 		</div>
 		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">No</label>
+		<label id="hide-friends-no-label" for="hide-friends-no">$no_str</label>
 		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
 
 		<div id="hide-friends-end"></div>
diff --git a/view/en/profile-in-directory.tpl b/view/profile-in-directory.tpl
index 98af3e59a..56b28d37e 100644
--- a/view/en/profile-in-directory.tpl
+++ b/view/profile-in-directory.tpl
@@ -1,15 +1,15 @@
 <p id="profile-in-directory">
-Publish your default profile in site directory? 
+$desc
 </p>
 
 		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label>
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">$yes_str</label>
 		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
 
 		<div id="profile-in-dir-break" ></div>	
 		</div>
 		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">$no_str</label>
 		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
 
 		<div id="profile-in-dir-end"></div>
diff --git a/view/en/profile-in-netdir.tpl b/view/profile-in-netdir.tpl
index be111aa67..882ad2d17 100644
--- a/view/en/profile-in-netdir.tpl
+++ b/view/profile-in-netdir.tpl
@@ -1,15 +1,15 @@
 <p id="profile-in-directory">
-Publish your default profile in global social directory? 
+$desc
 </p>
 
 		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">$yes_str</label>
 		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
 
 		<div id="profile-in-netdir-break" ></div>	
 		</div>
 		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
+		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">$no_str</label>
 		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
 
 		<div id="profile-in-netdir-end"></div>
diff --git a/view/de/profile_edit.tpl b/view/profile_edit.tpl
index 0b0619420..6e27dfca5 100644
--- a/view/de/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -1,11 +1,11 @@
-<h1>Proil Details Bearbeiten</h1>
+<h1>$banner</h1>
 
 <div id="profile-edit-links">
 <ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
+<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
 <li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
+<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
 
 </ul>
 </div>
@@ -18,32 +18,32 @@ $default
 <form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
 
 <div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label>
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
 <input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label>
+<label id="profile-edit-name-label" for="profile-edit-name" >$lbl_fullname </label>
 <input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 <div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
+<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >$lbl_title </label>
 <input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
 </div>
 <div id="profile-edit-pdesc-end"></div>
 
 
 <div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
+<label id="profile-edit-gender-label" for="gender-select" >$lbl_gender </label>
 $gender
 </div>
 <div id="profile-edit-gender-end"></div>
 
 <div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
+<label id="profile-edit-dob-label" for="dob-select" >$lbl_bd </label>
 <div id="profile-edit-dob" >
 $dob $age
 </div>
@@ -53,32 +53,32 @@ $dob $age
 $hide_friends
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
 
 <div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label>
+<label id="profile-edit-address-label" for="profile-edit-address" >$lbl_address </label>
 <input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label>
+<label id="profile-edit-locality-label" for="profile-edit-locality" >$lbl_city </label>
 <input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label>
+<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >$lbl_zip </label>
 <input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 <div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
+<label id="profile-edit-country-name-label" for="profile-edit-country-name" >$lbl_country </label>
 <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
 <option selected="selected" >$country_name</option>
 <option>temp</option>
@@ -87,7 +87,7 @@ $hide_friends
 <div id="profile-edit-country-name-end"></div>
 
 <div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
+<label id="profile-edit-region-label" for="profile-edit-region" >$lbl_region </label>
 <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
 <option selected="selected" >$region</option>
 <option>temp</option>
@@ -96,20 +96,20 @@ $hide_friends
 <div id="profile-edit-region-end"></div>
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
 <div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> (Marital) Status: </label>
+<label id="profile-edit-marital-label" for="profile-edit-marital" >$lbl_marital </label>
 $marital
 </div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" value="$with" />
+<label id="profile-edit-with-label" for="profile-edit-with" > $lbl_with </label>
+<input type="text" size="32" name="with" id="profile-edit-with" title="$lbl_ex1" value="$with" />
 <div id="profile-edit-marital-end"></div>
 
 <div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
+<label id="profile-edit-sexual-label" for="sexual-select" >$lbl_sexual </label>
 $sexual
 </div>
 <div id="profile-edit-sexual-end"></div>
@@ -117,44 +117,44 @@ $sexual
 
 
 <div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label>
+<label id="profile-edit-homepage-label" for="profile-edit-homepage" >$lbl_homepage </label>
 <input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
 </div>
 <div id="profile-edit-homepage-end"></div>
 
 <div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label>
+<label id="profile-edit-politic-label" for="profile-edit-politic" >$lbl_politic </label>
 <input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
 </div>
 <div id="profile-edit-politic-end"></div>
 
 <div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
+<label id="profile-edit-religion-label" for="profile-edit-religion" >$lbl_religion </label>
 <input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
 </div>
 <div id="profile-edit-religion-end"></div>
 
 <div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >$lbl_pubkey </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="lbl_ex2" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">$lbl_pubdsc</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >$lbl_prvkey </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="$lbl_ex2" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">$lbl_prvdsc</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
 <div id="about-jot-wrapper" >
 <p id="about-jot-desc" >
-Tell us about yourself... 
+$lbl_about
 </p>
 
 <textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
@@ -166,7 +166,7 @@ Tell us about yourself...
 
 <div id="interest-jot-wrapper" >
 <p id="interest-jot-desc" >
-Hobbies/Interests 
+$lbl_hobbies
 </p>
 
 <textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
@@ -178,7 +178,7 @@ Hobbies/Interests
 
 <div id="contact-jot-wrapper" >
 <p id="contact-jot-desc" >
-Contact information and Social Networks 
+$lbl_social
 </p>
 
 <textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
@@ -189,14 +189,14 @@ Contact information and Social Networks
 
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
 
 <div id="music-jot-wrapper" >
 <p id="music-jot-desc" >
-Musical interests 
+$lbl_music
 </p>
 
 <textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
@@ -207,7 +207,7 @@ Musical interests
 
 <div id="book-jot-wrapper" >
 <p id="book-jot-desc" >
-Books, literature 
+$lbl_book
 </p>
 
 <textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
@@ -220,7 +220,7 @@ Books, literature
 
 <div id="tv-jot-wrapper" >
 <p id="tv-jot-desc" >
-Television 
+$lbl_tv 
 </p>
 
 <textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
@@ -233,7 +233,7 @@ Television
 
 <div id="film-jot-wrapper" >
 <p id="film-jot-desc" >
-Film/dance/culture/entertainment 
+$lbl_film
 </p>
 
 <textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
@@ -244,14 +244,14 @@ Film/dance/culture/entertainment
 
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
 
 <div id="romance-jot-wrapper" >
 <p id="romance-jot-desc" >
-Love/romance 
+$lbl_love
 </p>
 
 <textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
@@ -264,7 +264,7 @@ Love/romance
 
 <div id="work-jot-wrapper" >
 <p id="work-jot-desc" >
-Work/employment 
+$lbl_work
 </p>
 
 <textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
@@ -277,7 +277,7 @@ Work/employment
 
 <div id="education-jot-wrapper" >
 <p id="education-jot-desc" >
-School/education 
+$lbl_school 
 </p>
 
 <textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
@@ -289,7 +289,7 @@ School/education
 
 
 <div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" />
+<input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
diff --git a/view/sv/profile_entry_default.tpl b/view/profile_entry_default.tpl
index dff6b53f7..98f20dbe7 100644
--- a/view/sv/profile_entry_default.tpl
+++ b/view/profile_entry_default.tpl
@@ -1,7 +1,7 @@
 
 <div class="profile-listing" >
 <div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profilbild" /></a>
+<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="$alt" /></a>
 </div>
 <div class="profile-listing-photo-end" ></div>
 <div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
new file mode 100644
index 000000000..707dfec53
--- /dev/null
+++ b/view/profile_listing_header.tpl
@@ -0,0 +1,8 @@
+<h1>$header</h1>
+<p id="profile-listing-desc" >
+<a href="profile_photo" >$chg_photo</a>
+</p>
+<div id="profile-listing-new-link-wrapper" >
+<a href="profiles/new" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
+</div>
+
diff --git a/view/en/profile_photo.tpl b/view/profile_photo.tpl
index 30e51210a..f258b5b86 100644
--- a/view/en/profile_photo.tpl
+++ b/view/profile_photo.tpl
@@ -1,18 +1,18 @@
-<h1>Upload Profile Photo</h1>
+<h1>$title</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
 
 <div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
+<label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
 <input name="userfile" type="file" id="profile-photo-upload" size="48" />
 </div>
 
 <div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
+<input type="submit" name="submit" id="profile-photo-submit" value="$submit">
 </div>
 
 </form>
 
 <div id="profile-photo-link-select-wrapper">
-or <a href='photos/$user'>select a photo from albums</a>
+$select
 </div>
\ No newline at end of file
diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl
new file mode 100644
index 000000000..497b93396
--- /dev/null
+++ b/view/pwdreset.tpl
@@ -0,0 +1,17 @@
+<h3>$lbl1</h3>
+
+<p>
+$lbl2
+</p>
+<p>
+$lbl3
+</p>
+<p>
+$newpass
+</p>
+<p>
+$lbl4 $lbl5
+</p>
+<p>
+$lbl6
+</p>
diff --git a/view/search_item.tpl b/view/search_item.tpl
index 02c31fe14..47ec06950 100644
--- a/view/search_item.tpl
+++ b/view/search_item.tpl
@@ -1,6 +1,6 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<span class="wall-item-info" id="wall-item-info-$id">
+		<div class="wall-item-info" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
 				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
 				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
@@ -18,7 +18,7 @@
 				$lock
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
 			</div>
-		</span>
+		</div>
 		<div class="wall-item-author">
 				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
 				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
diff --git a/view/en/settings.tpl b/view/settings.tpl
index 9822291c1..162299f5d 100644
--- a/view/en/settings.tpl
+++ b/view/settings.tpl
@@ -1,6 +1,6 @@
-<h1>Account Settings</h1>
+<h1>$ptitle</h1>
 
-<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
+<div id="plugin-settings-link"><a href="settings/addon">$lbl_plug</a></div>
 
 $uexport
 
@@ -10,16 +10,16 @@ $nickname_block
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
 
 
-<h3 class="settings-heading">Basic Settings</h3>
+<h3 class="settings-heading">$lbl_basic</h3>
 
 <div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Full Name: </label>
+<label id="settings-username-label" for="settings-username" >$lbl_fn </label>
 <input type="text" name="username" id="settings-username" value="$username" />
 </div>
 <div id="settings-username-end" ></div>
 
 <div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Email Address: </label>
+<label id="settings-email-label" for="settings-email" >$lbl_email </label>
 <input type="text" name="email" id="settings-email" value="$email" />
 </div>
 <div id="settings-email-end" ></div>
@@ -27,19 +27,19 @@ $nickname_block
 
 
 <div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
+<label id="settings-timezone-label" for="timezone_select" >$lbl_tz </label>
 $zoneselect
 </div>
 <div id="settings-timezone-end" ></div>
 
 <div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
+<label id="settings-defloc-label" for="settings-defloc" >$lbl_loc1 </label>
 <input type="text" name="defloc" id="settings-defloc" value="$defloc" />
 </div>
 <div id="settings-defloc-end" ></div>
 
 <div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
+<label id="settings-allowloc-label" for="settings-allowloc" >$lbl_loc2 </label>
 <input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
 </div>
 <div id="settings-allowloc-end" ></div>
@@ -48,25 +48,25 @@ $zoneselect
 
 
 <div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
+<label id="settings-theme-label" for="theme-select" >$lbl_theme </label>
 $theme
 </div>
 <div id="settings-theme-end"></div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
-<h3 class="settings-heading">Security and Privacy Settings</h3>
+<h3 class="settings-heading">$lbl_prv</h3>
 
 
 <input type="hidden" name="visibility" value="$visibility" />
 
 <div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label>
+<label id="settings-maxreq-label" for="settings-maxreq" >$lbl_maxreq</label>
 <input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
+<div id="settings-maxreq-desc">$lbl_maxrdesc</div>
 </div>
 <div id="settings-maxreq-end"></div>
 
@@ -91,14 +91,14 @@ $profile_in_net_dir
 <div id="settings-default-perms-end"></div>
 
 <div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
+<label id="settings-blockw-label" for="settings-blockw" >$lbl_rempost </label>
 <input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
 </div>
 <div id="settings-blockw-end" ></div>
 
 
 
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-desc">$lbl_exp1 <input type="text" size="3" name="expire" value="$expire" /> $lbl_exp2</div>
 <div id="settings-expire-end"></div>
 
 
@@ -108,48 +108,48 @@ $profile_in_net_dir
 
 
 
-<h3 class="settings-heading">Notification Settings</h3>
+<h3 class="settings-heading">$lbl_not1</h3>
 
 
 <div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">You receive an introduction</label>
+<div id="settings-notify-desc">$lbl_not2 </div>
+<label for="notify1" id="settings-label-notify1">$lbl_not3</label>
 <input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
 <div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label>
+<label for="notify2" id="settings-label-notify2">$lbl_not4</label>
 <input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
 <div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label>
+<label for="notify3" id="settings-label-notify3">$lbl_not5</label>
 <input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
 <div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
+<label for="notify4" id="settings-label-notify4">$lbl_not6</label>
 <input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
 <div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">You receive a private message</label>
+<label for="notify5" id="settings-label-notify5">$lbl_not7</label>
 <input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
 <div id="notify5-end"></div>
 </div>
 <div id="settings=notify-end"></div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
-<h3 class="settings-heading">Password Settings</h3>
+<h3 class="settings-heading">$lbl_pass1</h3>
 
 
 <div id="settings-password-wrapper" >
 <p id="settings-password-desc" >
-Leave password fields blank unless changing
+$lbl_pass2
 </p>
-<label id="settings-password-label" for="settings-password" >New Password: </label>
+<label id="settings-password-label" for="settings-password" >$lbl_pass3 </label>
 <input type="password" id="settings-password" name="npassword" />
 </div>
 <div id="settings-password-end" ></div>
 
 <div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
+<label id="settings-confirm-label" for="settings-confirm" >$lbl_pass4 </label>
 <input type="password" id="settings-confirm" name="confirm" />
 </div>
 <div id="settings-confirm-end" ></div>
@@ -161,16 +161,16 @@ Leave password fields blank unless changing
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
-<h3 class="settings-heading">Advanced Page Settings</h3>
+<h3 class="settings-heading">$lbl_advn</h3>
 
 $pagetype
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
+<input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
 
diff --git a/view/en/settings_nick_set.tpl b/view/settings_nick_set.tpl
index a36b3b9a2..4378b4884 100644
--- a/view/en/settings_nick_set.tpl
+++ b/view/settings_nick_set.tpl
@@ -1,9 +1,7 @@
 
 <div id="settings-nick-wrapper" >
 <p id="settings-nickname-desc">
-<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
+<span class="error-message">$desc <strong>'$nickname@$basepath'</strong>$subdir</span>
 </p>
-$subdir
-
 </div>
 <div id="settings-nick-end" ></div>
diff --git a/view/en/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl
index 303c24df7..303c24df7 100644
--- a/view/en/settings_nick_subdir.tpl
+++ b/view/settings_nick_subdir.tpl
diff --git a/view/sv/contact_edit.tpl b/view/sv/contact_edit.tpl
deleted file mode 100644
index f7a0d9af1..000000000
--- a/view/sv/contact_edit.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
-	<div id="contact-edit-photo-wrapper" >
-		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-		<div id="contact-edit-photo" >
-			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
-		</div>
-		<div id="contact-edit-photo-end" ></div>
-	</div>
-	<div id="contact-edit-nav-wrapper" >
-
-		<div id="contact-edit-links" >
-			<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
-			<a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
-		</div>
-		<div id="contact-drop-links" >
-			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
-		</div>
-		<div id="contact-edit-nav-end"></div>
-
-
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span></div>
-			<div id="contact-edit-poll-text">$updpub</div>
-			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
-		</div>
-	</div>
-	<div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-<div id="contact-edit-info-wrapper">
-<h4>Kontaktuppgifter / Anteckningar</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Spara" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Profilvisning</h4>
-<p>V&auml;lj vilken profil som ska visas f&ouml;r $name n&auml;r han eller hon tittar p&aring; din profil i s&auml;kert l&auml;ge.
-</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Spara" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Rykte online</h4>
-<p>
-Ibland kanske dina v&auml;nner vill f&aring; reda p&aring; hur n&aring;gon annan uppf&ouml;r sig p&aring; n&auml;tet innan de v&aring;ga inleda n&aring;gon kontakt. Du kan hj&auml;lpa till genom att ange personens 'rykte'.
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Var v&auml;nlig &auml;gna en liten stund &aring;t att fylla i n&aring;got som du k&auml;nner kan vara till hj&auml;lp f&ouml;r andra.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Skicka" />
-</form>
-</div>
\ No newline at end of file
diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl
deleted file mode 100644
index fb66ef29b..000000000
--- a/view/sv/install_db.tpl
+++ /dev/null
@@ -1,38 +0,0 @@
-<h3>Det sociala n&auml;tverket Friendika</h3>
-<h3>Installation</h3>
-
-<p>
-F&ouml;r att kunna installera Friendika m&aring;ste du ange hur man ansluter till din databas. Kontakta ditt webbhotell eller webbplatsadministrat&ouml;r om du har fr&aring;gor om dessa inst&auml;llningar. Databasen du specar nedan m&aring;ste finnas. Skapa databasen innan du forts&auml;tter, om det inte redan &auml;r gjort. 
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Servernamn d&auml;r databasen finns</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Inloggningsnamn f&ouml;r databasen</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">L&ouml;senord f&ouml;r databasen</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Databasens namn</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Ange vilken tidszon som ska vara f&ouml;rvald p&aring; din webbplats
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-<div id="install-end" ></div>
diff --git a/view/sv/profile-hide-friends.tpl b/view/sv/profile-hide-friends.tpl
deleted file mode 100644
index 367c4317f..000000000
--- a/view/sv/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-D&ouml;lj kontaktlista/v&auml;nlista f&ouml;r de som ser denna profil?
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Ja</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">Nej</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
\ No newline at end of file
diff --git a/view/sv/profile-in-directory.tpl b/view/sv/profile-in-directory.tpl
deleted file mode 100644
index 982fe990e..000000000
--- a/view/sv/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Publicera din huvudsakliga profil (default) i webbplatsens medlemskatalog? 
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Ja</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">Nej</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
\ No newline at end of file
diff --git a/view/sv/profile-in-netdir.tpl b/view/sv/profile-in-netdir.tpl
deleted file mode 100644
index 430173511..000000000
--- a/view/sv/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Publicera din huvudsakliga profil (default) i den globala medlemskatalogen? 
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Ja</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">Nej</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
\ No newline at end of file
diff --git a/view/sv/profile_advanced.php b/view/sv/profile_advanced.php
deleted file mode 100644
index 0891d7ff1..000000000
--- a/view/sv/profile_advanced.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Fullst&auml;ndigt namn:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">K&ouml;n:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">F&ouml;delsedag:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">' 
-	. ((intval($a->profile['dob'])) 
-		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
-		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
-	. "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">&Aring;lder:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Civilstatus:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
-	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexuell l&auml;ggning:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
-	$homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Hemsida URL:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Politisk &aring;sk&aring;dning:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">Om:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbys/Intressen:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Kontaktuppgifter och sociala n&auml;tverk:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musik:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">B&ouml;cker, litteratur:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">TV:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dans/kultur/underh&aring;llning:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">K&auml;rlek/romantik:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Arbete:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">Skola/utbildning:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-EOT;
-}
diff --git a/view/sv/profile_edit.tpl b/view/sv/profile_edit.tpl
deleted file mode 100644
index 5025fd5a8..000000000
--- a/view/sv/profile_edit.tpl
+++ /dev/null
@@ -1,298 +0,0 @@
-<h1>&Auml;ndra i profil</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">Visa denna profil</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Klona denna profil</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Ta bort denna profil</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profilnamn: </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div>
-</div>
-<div id="profile-edit-profile-name-end"></div>
-
-<div id="profile-edit-name-wrapper" >
-<label id="profile-edit-name-label" for="profile-edit-name" >Fullst&auml;ndigt namn: </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="$name" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Titel/Beskrivning: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-end"></div>
-
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >K&ouml;n: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >F&ouml;delsedag (&aring;/m/d): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="profile-edit-address-wrapper" >
-<label id="profile-edit-address-label" for="profile-edit-address" >Gatuadress: </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="$address" />
-</div>
-<div id="profile-edit-address-end"></div>
-
-<div id="profile-edit-locality-wrapper" >
-<label id="profile-edit-locality-label" for="profile-edit-locality" >Plats/Stad: </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" />
-</div>
-<div id="profile-edit-locality-end"></div>
-
-
-<div id="profile-edit-postal-code-wrapper" >
-<label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postnummer: </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<label id="profile-edit-country-name-label" for="profile-edit-country-name" >Land: </label>
-<select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
-<option selected="selected" >$country_name</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<label id="profile-edit-region-label" for="profile-edit-region" >Region: </label>
-<select name="region" id="profile-edit-region" onChange="Update_Globals();" >
-<option selected="selected" >$region</option>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-region-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="profile-edit-marital-wrapper" >
-<label id="profile-edit-marital-label" for="profile-edit-marital" ><span class="heart">&hearts;</span> Civilst&aring;nd: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Vem: (om aktuellt) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" />
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexuell l&auml;ggning: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<div id="profile-edit-homepage-wrapper" >
-<label id="profile-edit-homepage-label" for="profile-edit-homepage" >Hemsida URL: </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" />
-</div>
-<div id="profile-edit-homepage-end"></div>
-
-<div id="profile-edit-politic-wrapper" >
-<label id="profile-edit-politic-label" for="profile-edit-politic" >Politisk &aring;sk&aring;dning: </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" />
-</div>
-<div id="profile-edit-politic-end"></div>
-
-<div id="profile-edit-religion-wrapper" >
-<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" />
-</div>
-<div id="profile-edit-religion-end"></div>
-
-<div id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Nyckelord: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Exempel: fiske fotografering delifner" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Nyckelord: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Exempel: fiske fotografering delfiner" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Anv&auml;nds vid profils&ouml;kning, visas inte f&ouml;r andra)</div>
-<div id="profile-edit-prvkeywords-end"></div>
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-<div id="about-jot-wrapper" >
-<p id="about-jot-desc" >
-Beskriv dig sj&auml;lv... 
-</p>
-
-<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<div id="interest-jot-wrapper" >
-<p id="interest-jot-desc" >
-Hobbys/Intressen 
-</p>
-
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea>
-
-</div>
-<div id="interest-jot-end"></div>
-</div>
-
-
-<div id="contact-jot-wrapper" >
-<p id="contact-jot-desc" >
-Kontaktuppgifter och sociala n&auml;tverk 
-</p>
-
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea>
-
-</div>
-<div id="contact-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="music-jot-wrapper" >
-<p id="music-jot-desc" >
-Musik 
-</p>
-
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea>
-
-</div>
-<div id="music-jot-end"></div>
-</div>
-
-<div id="book-jot-wrapper" >
-<p id="book-jot-desc" >
-B&ouml;cker, litteratur 
-</p>
-
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea>
-
-</div>
-<div id="book-jot-end"></div>
-</div>
-
-
-
-<div id="tv-jot-wrapper" >
-<p id="tv-jot-desc" >
-TV 
-</p>
-
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea>
-
-</div>
-<div id="tv-jot-end"></div>
-</div>
-
-
-
-<div id="film-jot-wrapper" >
-<p id="film-jot-desc" >
-Film/dans/kultur/underh&aring;llning 
-</p>
-
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea>
-
-</div>
-<div id="film-jot-end"></div>
-</div>
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-<div id="romance-jot-wrapper" >
-<p id="romance-jot-desc" >
-K&auml;rlek/romantik 
-</p>
-
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea>
-
-</div>
-<div id="romance-jot-end"></div>
-</div>
-
-
-
-<div id="work-jot-wrapper" >
-<p id="work-jot-desc" >
-Arbete 
-</p>
-
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea>
-
-</div>
-<div id="work-jot-end"></div>
-</div>
-
-
-
-<div id="education-jot-wrapper" >
-<p id="education-jot-desc" >
-Skola/utbildning 
-</p>
-
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea>
-
-</div>
-<div id="education-jot-end"></div>
-</div>
-
-
-
-<div class="profile-edit-submit-wrapper" >
-<input type="submit" name="submit" class="profile-edit-submit-button" value="Spara" />
-</div>
-<div class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
\ No newline at end of file
diff --git a/view/sv/profile_listing_header.tpl b/view/sv/profile_listing_header.tpl
deleted file mode 100644
index ce81dd279..000000000
--- a/view/sv/profile_listing_header.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Profiler</h1>
-<p id="profile-listing-desc" >
-<a href="profile_photo" >Byt profilbild</a>
-</p>
-<div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Skapa ny profil</a>
-</div>
diff --git a/view/sv/profile_photo.tpl b/view/sv/profile_photo.tpl
deleted file mode 100644
index b849a270d..000000000
--- a/view/sv/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h1>Ladda upp profilbild</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Ladda upp fil: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Ladda upp">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-eller <a href='photos/$user'>v&auml;lj bild i ett album</a>
-</div>
\ No newline at end of file
diff --git a/view/sv/pwdreset.tpl b/view/sv/pwdreset.tpl
deleted file mode 100644
index 2c2d9e7e6..000000000
--- a/view/sv/pwdreset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>&Aring;terst&auml;llning av l&ouml;senord</h3>
-
-<p>
-Ditt l&ouml;senord har &aring;terst&auml;llts enligt &ouml;nskem&aring;l.
-</p>
-<p>
-Ditt nya l&ouml;senord &auml;r 
-</p>
-<p>
-$newpass
-</p>
-<p>
-H&aring;ll koll p&aring; det nya l&ouml;senordet och <a href="$baseurl" >klicka sedan h&auml;r f&ouml;r att logga in</a>.
-</p>
-<p>
-L&ouml;senordet kan &auml;ndras p&aring; sidan Inst&auml;llningar efter att du loggat in.
\ No newline at end of file
diff --git a/view/sv/registrations.tpl b/view/sv/registrations.tpl
deleted file mode 100644
index 869fa1a90..000000000
--- a/view/sv/registrations.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<li>$fullname ($email) : <a href="$approvelink">Godk&auml;nn</a> - <a href="$denylink">Avsl&aring;</a></li>
diff --git a/view/sv/settings.tpl b/view/sv/settings.tpl
deleted file mode 100644
index 2ab07af0c..000000000
--- a/view/sv/settings.tpl
+++ /dev/null
@@ -1,175 +0,0 @@
-<h1>Kontoinst&auml;llningar</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Inst&auml;llningar f&ouml;r insticksprogram</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Grundl&auml;ggande inst&auml;llningar</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Fullst&auml;ndigt namn: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >E-postadress: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Tidszon: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Standardplats: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Anv&auml;nd webbl&auml;sarens positioneringsfunktion: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Utseende (tema): </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-<h3 class="settings-heading">S&auml;kerhets- och sekretessinst&auml;llningar</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Max antal v&auml;nf&ouml;rfr&aring;gningar/dag</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(spamskydd)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >L&aring;t kontakter g&ouml;ra inl&auml;gg p&aring; din profilsida: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-<div id="settings-expire-desc">Ta automatiskt bort inl&auml;gg som &auml;r &auml;ldre &auml;n <input type="text" size="3" name="expire" value="$expire" /> dagar</div>
-<div id="settings-expire-end"></div>
-
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-
-<h3 class="settings-heading">Inst&auml;llningar f&ouml;r aviseringar</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Skicka avisering via e-post n&auml;r: </div>
-<label for="notify1" id="settings-label-notify1">Ny kontaktf&ouml;rfr&aring;gan kommer</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Egen f&ouml;rfr&aring;gan har godk&auml;nts</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">N&aring;gon skriver p&aring; din profilsida</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">N&aring;gon skriver en kommentar direkt efter din</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">Du f&aring;r ett personligt meddelande</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-<h3 class="settings-heading">L&ouml;senordsinst&auml;llningar</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-L&auml;mna f&auml;ltet tomt om du inte vill byta l&ouml;senord
-</p>
-<label id="settings-password-label" for="settings-password" >Nytt l&ouml;senord: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Bekr&auml;fta (upprepa): </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
-
-
-<h3 class="settings-heading">Avancerade inst&auml;llningar</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Spara" />
-</div>
diff --git a/view/sv/settings_nick_set.tpl b/view/sv/settings_nick_set.tpl
deleted file mode 100644
index 34cb36e49..000000000
--- a/view/sv/settings_nick_set.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">Din profiladress &auml;r <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/sv/settings_nick_subdir.tpl b/view/sv/settings_nick_subdir.tpl
deleted file mode 100644
index 2702708ab..000000000
--- a/view/sv/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>
-Det verkar som att din webbsida finns i en undermapp p&aring; webbplatsen<br />
-$hostname, s&aring; eventuellt kommer inte denna inst&auml;llning att fungera tillf&ouml;rlitligt.<br />
-</p>
-<p>Om problem uppst&aring;r &auml;r det m&ouml;jligt att problemen kan l&ouml;sas genom att anv&auml;nda<br /> profiladressen '<strong>$baseurl/profile/$nickname</strong>' ist&auml;llet.
-</p>
\ No newline at end of file
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index bfa004a65..cc55f7887 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -621,6 +621,11 @@ input#dfrn-url {
 #profile-photo-link-select-wrapper {
 	margin-top: 2em;
 }
+
+#profile-photo-submit-wrapper {
+	margin-top: 10px;
+}
+
 #profile-photo-wrapper img {
 	width:175px;
 	height:175px;
@@ -2220,4 +2225,13 @@ a.mail-list-link {
 	position: absolute;
 	top: 0;
 	left: 0;
-)
+}
+
+#group-members {
+	margin-top: 20px;
+}
+
+#group-members-end {
+	clear: both;
+}
+
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index d6ddb26dd..17b4e7fb2 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1005,8 +1005,6 @@ input#dfrn-url {
 
 .wall-item-arrowphoto-wrapper {
 	margin-top: 40px;
-	margin-right: 20px;
-	float: left;
 }
 .wall-item-wrapper {
 	margin-left: 10px;;
@@ -1037,6 +1035,16 @@ input#dfrn-url {
 	margin-left: 15px;
 }
 
+.wall-item-info.wallwall {
+	width: 285px;
+}
+
+.wwto, .wall-item-arrowphoto-wrapper, .wwfrom {
+	float: left;
+	margin-right: 10px;
+}
+
+
 .wall-item-links-wrapper {
     float: left;
 }
@@ -2240,4 +2248,14 @@ a.mail-list-link {
 	position: absolute;
 	top: 0;
 	left: 0;
-)
+}
+
+
+#group-members {
+	margin-top: 20px;
+}
+
+#group-members-end {
+	clear: both;
+}
+
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 893483259..e17b63e5a 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,6 +1,6 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<span class="wall-item-info" id="wall-item-info-$id">
+		<div class="wall-item-info" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
 				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
 				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
@@ -19,7 +19,7 @@
 				$lock
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
 			</div>
-		</span>
+		</div>
 		<div class="wall-item-author">
 				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
 				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 60383d885..655f2999a 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -1,21 +1,30 @@
 <div class="wall-item-outside-wrapper$indent wallwall" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<span class="wall-item-info" id="wall-item-info-$id">
+		<div class="wall-item-info wallwall" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$id" >
 				<a href="$owner_url" title="$olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
 				<img src="$owner_photo" class="wall-item-photo$osparkle" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$wall" /></div>
-			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" >
+			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$id" 
+				onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')"
+                onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
 				<a href="$profile_url" title="$linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$id">
 				<img src="$thumb" class="wall-item-photo$sparkle" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
+				<span onclick="openClose('wall-item-photo-menu-$id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$id">
+                    <ul>
+                        $item_photo_menu
+                    </ul>
+                </div>
+
 			</div>
 			<div class="wall-item-photo-end"></div>
 			<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
 				$lock
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>
 			</div>
-		</span>
+		</div>
 		<div class="wall-item-author">
 				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> $to <a href="$owner_url" title="$olinktitle" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> $vwall<br />
 				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>