diff --git a/.gitignore b/.gitignore
index 10a7187cf3..837b2e8767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+favicon.*
 .htconfig.php
 \#*
 wip/*
diff --git a/.htaccess b/.htaccess
index b06dd8bdc3..9322b92820 100644
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,8 @@ Options -Indexes
 AddType application/x-java-archive .jar
 AddType audio/ogg .oga
 
+#php_value suhosin.get.max_value_length = 2048
+
 <FilesMatch "\.(out|log)$">
 Deny from all
 </FilesMatch>
diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php
index 4bbd75387a..d9b205a3a5 100644
--- a/addon/oembed/oembed.php
+++ b/addon/oembed/oembed.php
@@ -18,6 +18,10 @@ function oembed_uninstall() {
 }
 
 function oembed_hook_page_header($a, &$b){
+
+	if(($a->module !== 'network') && ($a->module !== 'profile'))
+		return; 
+
   $b .= '<script src="addon/oembed/oembed.js"></script>
   <style>#oembed.hide { display: none } 
   #oembed {
@@ -33,11 +37,11 @@ function oembed_hook_page_header($a, &$b){
   <div id="oembed" class="hide"><input id="oembed_url">&nbsp;
     <input type="button" value="Embed" onclick="oembed_do()" style="float:left;">
     <a onclick="oembed(); return false;" style="float:right;"><img onmouseout="imgdull(this);" onmouseover="imgbright(this);" class="wall-item-delete-icon" src="images/b_drophide.gif" style="width: 16px; height: 16px;"></a>
-    <p style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, 
+    <div style="clear:both">Paste a link from 5min.com, Amazon Product Image, blip.tv, Clikthrough, CollegeHumor Video, 
       Daily Show with Jon Stewart, Dailymotion, dotSUB.com, Flickr Photos, Funny or Die Video, 
       Google Video, Hulu, Kinomap, LiveJournal UserPic, Metacafe, National Film Board of Canada, 
       Phodroid Photos, Photobucket, Qik Video, Revision3, Scribd, SlideShare, TwitPic, Twitter Status, 
-      Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</p> 
+      Viddler Video, Vimeo, Wikipedia, Wordpress.com, XKCD Comic, YFrog, YouTube</div> 
   </div>
   ';
 }
diff --git a/boot.php b/boot.php
index f12ec0d8d8..3b5da170cb 100644
--- a/boot.php
+++ b/boot.php
@@ -2,7 +2,7 @@
 
 set_time_limit(0);
 
-define ( 'FRIENDIKA_VERSION',      '2.1.932' );
+define ( 'FRIENDIKA_VERSION',      '2.1.933' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 define ( 'DB_UPDATE_VERSION',      1045   );
 
@@ -352,10 +352,12 @@ class App {
 
 	function init_pagehead() {
 		$this->page['title'] = $this->config['sitename'];
-		$tpl = load_view_file("view/head.tpl");
+		$tpl = load_view_file('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
 			'$baseurl' => $this->get_baseurl() . '/',
-			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION
+			'$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
+			'$delitem' => t('Delete this item?'),
+			'$comment' => t('Comment')
 		));
 	}
 
diff --git a/images/article.gif b/images/article.gif
new file mode 100644
index 0000000000..91aeef000b
Binary files /dev/null and b/images/article.gif differ
diff --git a/images/friendika-1600.png b/images/friendika-1600.png
new file mode 100644
index 0000000000..615a81dd94
Binary files /dev/null and b/images/friendika-1600.png differ
diff --git a/include/items.php b/include/items.php
index 0516593218..4a740e55b2 100644
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
-	$url = $contact['notify'] . '?dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
 
diff --git a/include/main.js b/include/main.js
index 824f2dfdfc..750cce74c0 100644
--- a/include/main.js
+++ b/include/main.js
@@ -113,12 +113,18 @@
 
 		$.get(update_url,function(data) {
 			in_progress = false;
+			$('.ccollapse-wrapper',data).each(function() {
+				var ident = $(this).attr('id');
+				if($('#' + ident).length) {
+					$('#' + ident).replaceWith($(this));
+				}
+			});
 			$('.wall-item-outside-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
 				if($('#' + ident).length == 0) { 
-                                        $('img',this).each(function() {
-                                                $(this).attr('src',$(this).attr('dst'));
-                                        });
+					$('img',this).each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
 					$('#' + prev).after($(this));
 				}
 				else { 
@@ -127,11 +133,9 @@
 					$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
 					$('#' + ident + ' ' + '.wall-item-like').replaceWith($(this).find('.wall-item-like'));
 					$('#' + ident + ' ' + '.wall-item-dislike').replaceWith($(this).find('.wall-item-dislike'));
-                                        $('#' + ident + ' ' + '.my-comment-photo').each(function() {
-                                                $(this).attr('src',$(this).attr('dst'));
-                                        });
-
-
+					$('#' + ident + ' ' + '.my-comment-photo').each(function() {
+						$(this).attr('src',$(this).attr('dst'));
+					});
 				}
 				prev = ident; 
 			});
diff --git a/include/poller.php b/include/poller.php
index 8619697d96..98c55a2a92 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['issued-id'])
 					$idtosend = '1:' . $orig_id;		
 
-				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
+				$url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 					. '&type=data&last_update=' . $last_update ;
 	
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index bacfe9b94d..686a42d082 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -63,7 +63,7 @@ function dfrn_poll_init(&$a) {
 		
 		if(count($r)) {
 
-			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+			$s = fetch_url($r[0]['poll'] . '?f=&dfrn_id=' . $my_id . '&type=profile-check');
 
 			logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
 
@@ -366,7 +366,7 @@ function dfrn_poll_content(&$a) {
 			// URL reply
 
 			$s = fetch_url($r[0]['poll'] 
-				. '?dfrn_id=' . $encrypted_id 
+				. '?f=&dfrn_id=' . $encrypted_id 
 				. '&type=profile-check'
 				. '&dfrn_version=' . DFRN_PROTOCOL_VERSION
 				. '&challenge=' . $challenge
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 3cd8473cf3..cc63550789 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -172,7 +172,7 @@ function dfrn_request_post(&$a) {
 					$dfrn_request = $contact_record['request'];
 
 				if(strlen($dfrn_request) && strlen($confirm_key))
-					$s = fetch_url($dfrn_request . '?confirm_key=' . $confirm_key);
+					$s = fetch_url($dfrn_request . '?f=&confirm_key=' . $confirm_key);
 				
 				// (ignore reply, nothing we can do it failed)
 
diff --git a/mod/network.php b/mod/network.php
index 2ff15a29b7..39679b48a1 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -70,7 +70,8 @@ function network_content(&$a, $update = 0) {
 			'$utubeurl' => t('Please enter a YouTube link:'),
 			'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
 			'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-			'$whereareu' => t('Where are you right now?') 
+			'$whereareu' => t('Where are you right now?'),
+			'$title' => t('Enter a title for this item') 
 		));
 
 
@@ -101,6 +102,7 @@ function network_content(&$a, $update = 0) {
 			'$audio' => t('Insert Vorbis [.ogg] audio'),
 			'$setloc' => t('Set your location'),
 			'$noloc' => t('Clear browser location'),
+			'$title' => t('Set title'),
 			'$wait' => t('Please wait'),
 			'$permset' => t('Permission settings'),
 			'$content' => '',
diff --git a/mod/notifications.php b/mod/notifications.php
index 93ca82bb0c..ed0831aabd 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -65,12 +65,11 @@ function notifications_content(&$a) {
 	else
 		$sql_extra = " AND `ignore` = 0 ";
 
-
-	$tpl = load_view_file('view/intros-top.tpl');
-	$o .= replace_macros($tpl,array(
-		'$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
-		'$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
-	)); 
+	$o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
+	
+	$o .= '<div id="notification-show-hide-wrapper" >';
+	$o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
+		. ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
 
 
 	$r = q("SELECT COUNT(*)	AS `total` FROM `intro` 
@@ -141,7 +140,7 @@ function notifications_content(&$a) {
 
 	if ($a->config['register_policy'] == REGISTER_APPROVE &&	
 		$a->config['admin_email'] === $a->user['email']){
-		$o .= load_view_file('view/registrations-top.tpl');
+		$o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
 		
 		$r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
 				 FROM `register`
diff --git a/mod/oexchange.php b/mod/oexchange.php
new file mode 100644
index 0000000000..f97356559e
--- /dev/null
+++ b/mod/oexchange.php
@@ -0,0 +1,53 @@
+<?php
+
+
+function oexchange_init(&$a) {
+
+	if(($a->argc > 1) && ($a->argv[1] === 'xrd')) {
+		$tpl = load_view_file('view/oexchange_xrd.tpl');
+
+		$o = replace_macros($tpl, array('$base' => $a->get_baseurl()));
+		echo $o;
+		killme();
+	}
+
+		
+
+
+}
+
+function oexchange_content(&$a) {
+
+	if(! local_user()) {
+		$o = login(false);
+		return $o;
+	}
+
+	if(($a->argc > 1) && $a->argv[1] === 'done') {
+		notice( t('Post successful.') . EOL);
+		return;
+	}
+
+	$url = (((x($_GET,'url')) && strlen($_GET['url'])) ? notags(trim($_GET['url'])) : '');
+
+	$s = fetch_url($a->get_baseurl() . '/parse_url&url=' . $url);
+
+	if(! strlen($s))
+		return;
+
+	require_once('include/html2bbcode.php');
+
+	$post = array();
+
+	$post['profile_uid'] = local_user();
+	$post['return'] = '/oexchange/done' ;
+	$post['body'] = html2bbcode($s);
+	$post['type'] = 'wall';
+
+	$_POST = $post;
+	require_once('mod/item.php');
+	item_post($a);
+
+}
+
+
diff --git a/mod/profile.php b/mod/profile.php
index 1101c69981..17f6a2d451 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -138,7 +138,8 @@ function profile_content(&$a, $update = 0) {
 				'$utubeurl' => t('Please enter a YouTube link:'),
 				'$vidurl' => t("Please enter a video\x28.ogg\x29 link/URL:"),
 				'$audurl' => t("Please enter an audio\x28.ogg\x29 link/URL:"),
-				'$whereareu' => t('Where are you right now?') 
+				'$whereareu' => t('Where are you right now?'),
+				'$title' => t('Enter a title for this item') 
 			));
 
 			require_once('include/acl_selectors.php');
@@ -169,6 +170,7 @@ function profile_content(&$a, $update = 0) {
 				'$audio' => t('Insert Vorbis [.ogg] audio'),
 				'$setloc' => t('Set your location'),
 				'$noloc' => t('Clear browser location'),
+				'$title' => t('Set title'),
 				'$wait' => t('Please wait'),
 				'$permset' => t('Permission settings'),
 				'$content' => '',
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 68c05625b3..48805fbdd3 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -196,9 +196,11 @@ function profile_photo_content(&$a) {
 		$o .= replace_macros($tpl,array(
 			'$filename' => $filename,
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-			'$image_url' => $a->get_baseurl() . '/photo/' . $filename
-			));
-
+			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
+			'$title' => t('Crop Image'),
+			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$done' => t('Done Editing')
+		));
 		return $o;
 	}
 
diff --git a/util/messages.po b/util/messages.po
index beff3e4b64..223541ad83 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,685 +6,45 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.925\n"
+"Project-Id-Version: 2.1.933\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 14:03+0100\n"
+"POT-Creation-Date: 2011-03-29 17:14-0700\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"
 
-#: ../../index.php:194
-msgid "Not Found"
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
 msgstr ""
 
-#: ../../index.php:195
-msgid "Page not found."
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../index.php:250 ../../mod/group.php:88
-msgid "Permission denied"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../index.php:251 ../../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:14 ../../mod/settings.php:19
-#: ../../mod/settings.php:210 ../../mod/photos.php:85 ../../mod/photos.php:773
-#: ../../mod/display.php:308 ../../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/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
-#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
-msgid "Permission denied."
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../boot.php:808
-msgid "Create a New Account"
+#: ../../mod/tagrm.php:93
+msgid "Remove"
 msgstr ""
 
-#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61
-msgid "Register"
-msgstr ""
-
-#: ../../boot.php:815
-msgid "Nickname or Email address: "
-msgstr ""
-
-#: ../../boot.php:816
-msgid "Password: "
-msgstr ""
-
-#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
-msgid "Login"
-msgstr ""
-
-#: ../../boot.php:821
-msgid "Nickname/Email/OpenID: "
-msgstr ""
-
-#: ../../boot.php:822
-msgid "Password (if not OpenID): "
-msgstr ""
-
-#: ../../boot.php:825
-msgid "Forgot your password?"
-msgstr ""
-
-#: ../../boot.php:826
-msgid "Password Reset"
-msgstr ""
-
-#: ../../boot.php:837 ../../include/nav.php:38
-msgid "Logout"
-msgstr ""
-
-#: ../../boot.php:1077
-msgid "prev"
-msgstr ""
-
-#: ../../boot.php:1079
-msgid "first"
-msgstr ""
-
-#: ../../boot.php:1108
-msgid "last"
-msgstr ""
-
-#: ../../boot.php:1111
-msgid "next"
-msgstr ""
-
-#: ../../boot.php:1837
+#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
 #, php-format
-msgid "%s likes this."
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../boot.php:1837
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../boot.php:1841 ../../test.php:8
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr ""
-
-#: ../../boot.php:1843
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr ""
-
-#: ../../boot.php:1849
-msgid "and"
-msgstr ""
-
-#: ../../boot.php:1852
-#, php-format
-msgid ", and %d other people"
-msgstr ""
-
-#: ../../boot.php:1853
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../boot.php:1853
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../boot.php:2014
-msgid "No contacts"
-msgstr ""
-
-#: ../../boot.php:2022
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../boot.php:2038 ../../mod/viewcontacts.php:17
-msgid "View Contacts"
-msgstr ""
-
-#: ../../boot.php:2055 ../../mod/search.php:17 ../../include/nav.php:67
-msgid "Search"
-msgstr ""
-
-#: ../../boot.php:2210 ../../mod/profile.php:8
-msgid "No profile"
-msgstr ""
-
-#: ../../boot.php:2267
-msgid "Connect"
-msgstr ""
-
-#: ../../boot.php:2277
-msgid "Location:"
-msgstr ""
-
-#: ../../boot.php:2281
-msgid ", "
-msgstr ""
-
-#: ../../boot.php:2289
-msgid "Gender:"
-msgstr ""
-
-#: ../../boot.php:2293
-msgid "Status:"
-msgstr ""
-
-#: ../../boot.php:2295
-msgid "Homepage:"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Monday"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Tuesday"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Wednesday"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Thursday"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Friday"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Saturday"
-msgstr ""
-
-#: ../../boot.php:2386
-msgid "Sunday"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "January"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "February"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "March"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "April"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "May"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "June"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "July"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "August"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "September"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "October"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "November"
-msgstr ""
-
-#: ../../boot.php:2390
-msgid "December"
-msgstr ""
-
-#: ../../boot.php:2424
-msgid "Birthday Reminders"
-msgstr ""
-
-#: ../../boot.php:2425
-msgid "Birthdays this week:"
-msgstr ""
-
-#: ../../boot.php:2426
-msgid "(Adjusted for local time)"
-msgstr ""
-
-#: ../../boot.php:2437
-msgid "[today]"
-msgstr ""
-
-#: ../../boot.php:2634
-msgid "link to source"
-msgstr ""
-
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
-msgstr ""
-
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
-msgstr ""
-
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
-msgstr ""
-
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
-msgstr ""
-
-#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858
-#: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:123
-#: ../../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/wall_upload.php:56 ../../mod/profile_photo.php:109
-#, php-format
-msgid "Image exceeds size limit of %d"
-msgstr ""
-
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:571
-msgid "Unable to process image."
-msgstr ""
-
-#: ../../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/wall_upload.php:82 ../../mod/profile_photo.php:230
-#: ../../mod/photos.php:589
-msgid "Image upload failed."
-msgstr ""
-
-#: ../../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:475 ../../mod/item.php:498
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373
-msgid "Administrator"
-msgstr ""
-
-#: ../../mod/dfrn_notify.php:179
-msgid "noreply"
-msgstr ""
-
-#: ../../mod/dfrn_notify.php:237
-msgid "New mail received at "
-msgstr ""
-
-#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
-#, php-format
-msgid "%s commented on an item at %s"
-msgstr ""
-
-#: ../../mod/profile.php:102
-msgid "Status"
-msgstr ""
-
-#: ../../mod/profile.php:103
-msgid "Profile"
-msgstr ""
-
-#: ../../mod/profile.php:104
-msgid "Photos"
-msgstr ""
-
-#: ../../mod/profile.php:137 ../../mod/network.php:69
-#: ../../mod/message.php:172
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/profile.php:138 ../../mod/network.php:70
-msgid "Please enter a YouTube link:"
-msgstr ""
-
-#: ../../mod/profile.php:139 ../../mod/network.php:71
-msgid "Please enter a video(.ogg) link/URL:"
-msgstr ""
-
-#: ../../mod/profile.php:140 ../../mod/network.php:72
-msgid "Please enter an audio(.ogg) link/URL:"
-msgstr ""
-
-#: ../../mod/profile.php:141 ../../mod/network.php:73
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../mod/profile.php:164 ../../mod/profile.php:325
-#: ../../mod/photos.php:1086 ../../mod/display.php:158
-#: ../../mod/network.php:96 ../../mod/network.php:375
-msgid "Share"
-msgstr ""
-
-#: ../../mod/profile.php:165 ../../mod/editpost.php:63
-#: ../../mod/network.php:97 ../../mod/message.php:186
-#: ../../mod/message.php:320
-msgid "Upload photo"
-msgstr ""
-
-#: ../../mod/profile.php:166 ../../mod/editpost.php:64
-#: ../../mod/network.php:98 ../../mod/message.php:187
-#: ../../mod/message.php:321
-msgid "Insert web link"
-msgstr ""
-
-#: ../../mod/profile.php:167 ../../mod/editpost.php:65
-#: ../../mod/network.php:99
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/profile.php:168 ../../mod/editpost.php:66
-#: ../../mod/network.php:100
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/profile.php:169 ../../mod/editpost.php:67
-#: ../../mod/network.php:101
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
-#: ../../mod/profile.php:170 ../../mod/editpost.php:68
-#: ../../mod/network.php:102
-msgid "Set your location"
-msgstr ""
-
-#: ../../mod/profile.php:171 ../../mod/editpost.php:69
-#: ../../mod/network.php:103
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../mod/profile.php:172 ../../mod/profile.php:326
-#: ../../mod/photos.php:1087 ../../mod/display.php:159
-#: ../../mod/editpost.php:70 ../../mod/network.php:104
-#: ../../mod/network.php:376 ../../mod/message.php:188
-#: ../../mod/message.php:322
-msgid "Please wait"
-msgstr ""
-
-#: ../../mod/profile.php:173 ../../mod/editpost.php:71
-#: ../../mod/network.php:105
-msgid "Permission settings"
-msgstr ""
-
-#: ../../mod/profile.php:180 ../../mod/editpost.php:77
-#: ../../mod/network.php:111
-msgid "CC: email addresses"
-msgstr ""
-
-#: ../../mod/profile.php:182 ../../mod/editpost.php:79
-#: ../../mod/network.php:113
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../mod/profile.php:316 ../../mod/photos.php:962
-#: ../../mod/display.php:149 ../../mod/network.php:329
-msgid "Private Message"
-msgstr ""
-
-#: ../../mod/profile.php:323 ../../mod/photos.php:1084
-#: ../../mod/display.php:156 ../../mod/network.php:373
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../mod/profile.php:324 ../../mod/photos.php:1085
-#: ../../mod/display.php:157 ../../mod/network.php:374
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../mod/profile.php:338 ../../mod/photos.php:1106
-#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
-#: ../../mod/display.php:171 ../../mod/network.php:389
-msgid "This is you"
-msgstr ""
-
-#: ../../mod/profile.php:362 ../../mod/display.php:222
-#: ../../mod/editpost.php:62 ../../mod/network.php:397
-msgid "Edit"
-msgstr ""
-
-#: ../../mod/profile.php:384 ../../mod/photos.php:1203
-#: ../../mod/display.php:238 ../../mod/network.php:398 ../../mod/group.php:137
-msgid "Delete"
-msgstr ""
-
-#: ../../mod/profile.php:405 ../../mod/search.php:116
-#: ../../mod/display.php:262 ../../mod/network.php:280
-#: ../../mod/network.php:446
-msgid "View $name's profile"
-msgstr ""
-
-#: ../../mod/profile.php:438 ../../mod/display.php:317
-#: ../../mod/register.php:424 ../../mod/network.php:484
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
-msgstr ""
-
-#: ../../mod/follow.php:173
-msgid "The profile address specified does not provide adequate information."
-msgstr ""
-
-#: ../../mod/follow.php:179
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-
-#: ../../mod/follow.php:230
-msgid "Unable to retrieve contact information."
-msgstr ""
-
-#: ../../mod/follow.php:276
-msgid "following"
-msgstr ""
-
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
-msgstr ""
-
-#: ../../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:531 ../../mod/photos.php:850
-#: ../../mod/photos.php:865 ../../mod/register.php:267
-#: ../../mod/register.php:274 ../../mod/register.php:281
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
-#, php-format
-msgid "Image size reduction [%s] failed."
-msgstr ""
-
-#: ../../mod/profile_photo.php:95
-msgid "Unable to process image"
-msgstr ""
-
-#: ../../mod/profile_photo.php:228
-msgid "Image uploaded successfully."
-msgstr ""
-
-#: ../../mod/home.php:23
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../mod/regmod.php:10
-msgid "Please login."
-msgstr ""
-
-#: ../../mod/regmod.php:54
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../mod/regmod.php:92 ../../mod/register.php:310
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../mod/regmod.php:96
-msgid "Account approved."
-msgstr ""
-
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
-#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr ""
-
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../mod/profiles.php:199
-msgid "Profile updated."
-msgstr ""
-
-#: ../../mod/profiles.php:254
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
-msgid "Profile-"
-msgstr ""
-
-#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
-msgid "New profile created."
-msgstr ""
-
-#: ../../mod/profiles.php:307
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../mod/profiles.php:370
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
-msgstr ""
-
-#: ../../mod/profiles.php:380
-msgid "Age: "
-msgstr ""
-
-#: ../../mod/profiles.php:422
-msgid "Profile Image"
-msgstr ""
-
-#: ../../mod/settings.php:37
-msgid "Passwords do not match. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:42
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:53
-msgid "Password changed."
-msgstr ""
-
-#: ../../mod/settings.php:55
-msgid "Password update failed. Please try again."
-msgstr ""
-
-#: ../../mod/settings.php:97
-msgid " Please use a shorter name."
-msgstr ""
-
-#: ../../mod/settings.php:99
-msgid " Name too short."
-msgstr ""
-
-#: ../../mod/settings.php:105
-msgid " Not valid email."
-msgstr ""
-
-#: ../../mod/settings.php:107
-msgid " Cannot change to that email."
-msgstr ""
-
-#: ../../mod/settings.php:165
-msgid "Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:215
-msgid "Plugin Settings"
-msgstr ""
-
-#: ../../mod/settings.php:216
-msgid "Account Settings"
-msgstr ""
-
-#: ../../mod/settings.php:222
-msgid "No Plugin settings configured"
-msgstr ""
-
-#: ../../mod/settings.php:269
-msgid "OpenID: "
-msgstr ""
-
-#: ../../mod/settings.php:269
-msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
-msgstr ""
-
-#: ../../mod/settings.php:301
-msgid "Profile is <strong>not published</strong>."
-msgstr ""
-
-#: ../../mod/settings.php:358
-msgid "Default Post Permissions"
-msgstr ""
-
-#: ../../mod/search.php:54
-msgid "No results."
-msgstr ""
-
-#: ../../mod/search.php:131 ../../mod/network.php:295
-msgid "View in context"
-msgstr ""
-
-#: ../../mod/photos.php:30
+#: ../../mod/photos.php:30 ../../wip/photos.php:31
+#: ../../wip/photos-chris.php:41
 msgid "Photo Albums"
 msgstr ""
 
@@ -693,75 +53,161 @@ msgstr ""
 #: ../../mod/photos.php:1244 ../../include/Photo.php:225
 #: ../../include/Photo.php:232 ../../include/Photo.php:239
 #: ../../include/items.php:982 ../../include/items.php:985
-#: ../../include/items.php:988
+#: ../../include/items.php:988 ../../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"
 msgstr ""
 
-#: ../../mod/photos.php:95
+#: ../../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
+#: ../../mod/message.php:8 ../../mod/message.php:116
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8
+#: ../../mod/display.php:308 ../../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:251
+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:116
+#: ../../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."
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:859
+#: ../../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"
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1067
+#: ../../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"
 msgstr ""
 
-#: ../../mod/photos.php:469
+#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../mod/like.php:110
+#: ../../mod/photos.php:469 ../../mod/like.php:110 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:469
+#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
 msgid "by"
 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 "
 msgstr ""
 
-#: ../../mod/photos.php:661
+#: ../../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."
+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."
+msgstr ""
+
+#: ../../mod/photos.php:661 ../../wip/photos.php:611
+#: ../../wip/photos-chris.php:658
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:808
+#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
+#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../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"
+msgstr ""
+
+#: ../../mod/photos.php:808 ../../wip/photos.php:742
+#: ../../wip/photos-chris.php:789
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:811 ../../mod/photos.php:854
+#: ../../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: "
 msgstr ""
 
-#: ../../mod/photos.php:812
+#: ../../mod/photos.php:812 ../../wip/photos.php:746
+#: ../../wip/photos-chris.php:793
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:814 ../../mod/photos.php:1062
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062 ../../wip/photos.php:749
+#: ../../wip/photos-chris.php:796
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:869
+#: ../../mod/photos.php:869 ../../wip/photos.php:804
+#: ../../wip/photos-chris.php:851
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:879 ../../mod/photos.php:1263
+#: ../../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"
 msgstr ""
 
-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:909 ../../wip/photos.php:843
+#: ../../wip/photos-chris.php:890
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:956
+#: ../../mod/photos.php:956 ../../wip/photos.php:864
+#: ../../wip/photos-chris.php:911
 msgid "Edit photo"
 msgstr ""
 
@@ -769,11 +215,17 @@ msgstr ""
 msgid "Use as profile photo"
 msgstr ""
 
+#: ../../mod/photos.php:962 ../../mod/network.php:431
+#: ../../mod/profile.php:368 ../../mod/display.php:149
+msgid "Private Message"
+msgstr ""
+
 #: ../../mod/photos.php:969
 msgid "<< Prev"
 msgstr ""
 
-#: ../../mod/photos.php:973
+#: ../../mod/photos.php:973 ../../wip/photos.php:870
+#: ../../wip/photos-chris.php:917
 msgid "View Full Size"
 msgstr ""
 
@@ -781,11 +233,13 @@ msgstr ""
 msgid "Next >>"
 msgstr ""
 
-#: ../../mod/photos.php:1036
+#: ../../mod/photos.php:1036 ../../wip/photos.php:928
+#: ../../wip/photos-chris.php:975
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1046
+#: ../../mod/photos.php:1046 ../../wip/photos.php:938
+#: ../../wip/photos-chris.php:985
 msgid "[Remove any tag]"
 msgstr ""
 
@@ -793,54 +247,74 @@ msgstr ""
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1058
+#: ../../mod/photos.php:1058 ../../wip/photos.php:948
+#: ../../wip/photos-chris.php:995
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1060
+#: ../../mod/photos.php:1060 ../../wip/photos.php:950
+#: ../../wip/photos-chris.php:997
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1064
+#: ../../mod/photos.php:1064 ../../wip/photos.php:952
+#: ../../wip/photos-chris.php:999
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1249
+#: ../../mod/photos.php:1084 ../../mod/network.php:475
+#: ../../mod/profile.php:375 ../../mod/display.php:156
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../mod/photos.php:1085 ../../mod/network.php:476
+#: ../../mod/profile.php:376 ../../mod/display.php:157
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../mod/photos.php:1086 ../../mod/network.php:96
+#: ../../mod/network.php:477 ../../mod/profile.php:164
+#: ../../mod/profile.php:377 ../../mod/display.php:158
+msgid "Share"
+msgstr ""
+
+#: ../../mod/photos.php:1087 ../../mod/editpost.php:70
+#: ../../mod/network.php:104 ../../mod/network.php:478
+#: ../../mod/message.php:188 ../../mod/message.php:322
+#: ../../mod/profile.php:172 ../../mod/profile.php:378
+#: ../../mod/display.php:159
+msgid "Please wait"
+msgstr ""
+
+#: ../../mod/photos.php:1106 ../../mod/photos.php:1146
+#: ../../mod/photos.php:1175 ../../mod/network.php:491
+#: ../../mod/profile.php:390 ../../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"
+msgstr ""
+
+#: ../../mod/photos.php:1203 ../../mod/network.php:500 ../../mod/group.php:137
+#: ../../mod/profile.php:436 ../../mod/display.php:238
+msgid "Delete"
+msgstr ""
+
+#: ../../mod/photos.php:1249 ../../wip/photos.php:1127
+#: ../../wip/photos-chris.php:1174
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1253
+#: ../../mod/photos.php:1253 ../../wip/photos.php:1131
+#: ../../wip/photos-chris.php:1178
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1269
+#: ../../mod/photos.php:1269 ../../wip/photos.php:1147
+#: ../../wip/photos-chris.php:1194
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
-msgid "Item not found."
-msgstr ""
-
-#: ../../mod/display.php:263 ../../mod/network.php:447
-msgid "View $owner_name's profile"
-msgstr ""
-
-#: ../../mod/display.php:264 ../../mod/network.php:448
-msgid "to"
-msgstr ""
-
-#: ../../mod/display.php:265 ../../mod/network.php:449
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../mod/display.php:266 ../../mod/network.php:450
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: ../../mod/display.php:305
-msgid "Item has been removed."
-msgstr ""
-
 #: ../../mod/editpost.php:17 ../../mod/editpost.php:27
 msgid "Item not found"
 msgstr ""
@@ -849,368 +323,223 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/invite.php:28
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/editpost.php:62 ../../mod/network.php:499
+#: ../../mod/profile.php:414 ../../mod/display.php:222
+msgid "Edit"
 msgstr ""
 
-#: ../../mod/invite.php:32
-#, php-format
-msgid "Please join my network on %s"
+#: ../../mod/editpost.php:63 ../../mod/network.php:97
+#: ../../mod/message.php:186 ../../mod/message.php:320
+#: ../../mod/profile.php:165
+msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/invite.php:38
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/editpost.php:64 ../../mod/network.php:98
+#: ../../mod/message.php:187 ../../mod/message.php:321
+#: ../../mod/profile.php:166
+msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/invite.php:42
+#: ../../mod/editpost.php:65 ../../mod/network.php:99
+#: ../../mod/profile.php:167
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editpost.php:66 ../../mod/network.php:100
+#: ../../mod/profile.php:168
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editpost.php:67 ../../mod/network.php:101
+#: ../../mod/profile.php:169
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/editpost.php:68 ../../mod/network.php:102
+#: ../../mod/profile.php:170
+msgid "Set your location"
+msgstr ""
+
+#: ../../mod/editpost.php:69 ../../mod/network.php:103
+#: ../../mod/profile.php:171
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../mod/editpost.php:71 ../../mod/network.php:105
+#: ../../mod/profile.php:173
+msgid "Permission settings"
+msgstr ""
+
+#: ../../mod/editpost.php:77 ../../mod/network.php:111
+#: ../../mod/profile.php:180
+msgid "CC: email addresses"
+msgstr ""
+
+#: ../../mod/editpost.php:79 ../../mod/network.php:113
+#: ../../mod/profile.php:182
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
+msgid "Profile location is not valid or does not contain profile information."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+msgid "Warning: profile location has no identifiable owner name."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+msgid "Warning: profile location has no profile photo."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
 #, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
+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/invite.php:57
-msgid "Send invitations"
+#: ../../mod/dfrn_request.php:164
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/invite.php:58
-msgid "Enter email addresses, one per line:"
+#: ../../mod/dfrn_request.php:188
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/invite.php:59 ../../mod/message.php:183 ../../mod/message.php:317
-msgid "Your message:"
+#: ../../mod/dfrn_request.php:216
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/invite.php:60
+#: ../../mod/dfrn_request.php:241
 #, php-format
-msgid "Please join my social network on %s"
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/invite.php:61
-msgid "To accept this invitation, please visit:"
+#: ../../mod/dfrn_request.php:242
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/invite.php:62
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/dfrn_request.php:243
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/contacts.php:12
-msgid "Invite Friends"
+#: ../../mod/dfrn_request.php:273
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/contacts.php:15
-msgid "Find People With Shared Interests"
+#: ../../mod/dfrn_request.php:292
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/contacts.php:19
-msgid "Connect/Follow"
+#: ../../mod/dfrn_request.php:305
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/contacts.php:20
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../mod/dfrn_request.php:309
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/contacts.php:21
-msgid "Follow"
+#: ../../mod/dfrn_request.php:330
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
-msgid "Could not access contact record."
+#: ../../mod/dfrn_request.php:336
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/contacts.php:57
-msgid "Could not locate selected profile."
-msgstr ""
-
-#: ../../mod/contacts.php:88
-msgid "Contact updated."
-msgstr ""
-
-#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
+#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been blocked"
+#: ../../mod/dfrn_request.php:423
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been unblocked"
+#: ../../mod/dfrn_request.php:477
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../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/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:352
-msgid "Mutual Friendship"
-msgstr ""
-
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
-msgid "is a fan of yours"
-msgstr ""
-
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
-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:264
-msgid "Visit $name's profile"
-msgstr ""
-
-#: ../../mod/contacts.php:265
-msgid "Block/Unblock contact"
-msgstr ""
-
-#: ../../mod/contacts.php:266
-msgid "Ignore contact"
-msgstr ""
-
-#: ../../mod/contacts.php:267
-msgid "Delete contact"
-msgstr ""
-
-#: ../../mod/contacts.php:269
-msgid "Last updated: "
-msgstr ""
-
-#: ../../mod/contacts.php:270
-msgid "Update public posts: "
-msgstr ""
-
-#: ../../mod/contacts.php:272
-msgid "Update now"
-msgstr ""
-
-#: ../../mod/contacts.php:275
-msgid "Unblock this contact"
-msgstr ""
-
-#: ../../mod/contacts.php:275
-msgid "Block this contact"
-msgstr ""
-
-#: ../../mod/contacts.php:276
-msgid "Unignore this contact"
-msgstr ""
-
-#: ../../mod/contacts.php:276
-msgid "Ignore this contact"
-msgstr ""
-
-#: ../../mod/contacts.php:279
-msgid "Currently blocked"
-msgstr ""
-
-#: ../../mod/contacts.php:280
-msgid "Currently ignored"
-msgstr ""
-
-#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140
-#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
-msgid "Contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:313
-msgid "Show Blocked Connections"
-msgstr ""
-
-#: ../../mod/contacts.php:313
-msgid "Hide Blocked Connections"
-msgstr ""
-
-#: ../../mod/contacts.php:315 ../../mod/directory.php:38
-msgid "Finding: "
-msgstr ""
-
-#: ../../mod/contacts.php:316
-msgid "Find"
-msgstr ""
-
-#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44
-msgid "Visit $username's profile"
-msgstr ""
-
-#: ../../mod/contacts.php:377
-msgid "Edit contact"
-msgstr ""
-
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
-msgstr ""
-
-#: ../../mod/register.php:47
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: ../../mod/register.php:62
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../mod/register.php:74
-msgid "Please use a shorter name."
-msgstr ""
-
-#: ../../mod/register.php:76
-msgid "Name too short."
-msgstr ""
-
-#: ../../mod/register.php:89
-msgid "That doesn\\'t appear to be your full (First Last) name."
-msgstr ""
-
-#: ../../mod/register.php:92
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: ../../mod/register.php:95
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../../mod/register.php:101
-msgid "Cannot use that email."
-msgstr ""
-
-#: ../../mod/register.php:106
+#: ../../mod/dfrn_request.php:491
 msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/register.php:112
-msgid "Nickname is already registered. Please choose another."
+#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/register.php:131
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../mod/dfrn_request.php:543
+msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/register.php:198
-msgid "An error occurred during registration. Please try again."
+#: ../../mod/dfrn_request.php:545 ../../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:389
+#: ../../mod/dfrn_notify.php:475 ../../mod/dfrn_confirm.php:649
+#: ../../include/items.php:1373
+msgid "Administrator"
 msgstr ""
 
-#: ../../mod/register.php:216
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../mod/dfrn_request.php:615
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/register.php:315
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: ../../mod/dfrn_request.php:616
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/register.php:319
-msgid "Failed to send email message. Here is the message that failed."
+#: ../../mod/dfrn_request.php:617
+msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/register.php:324
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: ../../mod/register.php:347
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../mod/register.php:351
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: ../../mod/register.php:399
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
-msgstr ""
-
-#: ../../mod/register.php:400
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
-msgstr ""
-
-#: ../../mod/register.php:401
-msgid "Your OpenID (optional): "
-msgstr ""
-
-#: ../../mod/register.php:415
-msgid "Include your profile in member directory?"
-msgstr ""
-
-#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618
+#: ../../mod/dfrn_request.php:618 ../../mod/register.php:436
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619
+#: ../../mod/dfrn_request.php:619 ../../mod/register.php:437
 msgid "No"
 msgstr ""
 
-#: ../../mod/register.php:431
-msgid "Registration"
+#: ../../mod/dfrn_request.php:620
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/register.php:439
-msgid "Your Full Name (e.g. Joe Smith): "
-msgstr ""
-
-#: ../../mod/register.php:440
-msgid "Your Email Address: "
-msgstr ""
-
-#: ../../mod/register.php:441
+#: ../../mod/dfrn_request.php:621
 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>'."
+"Please enter your profile address from one of the following supported social "
+"networks:"
 msgstr ""
 
-#: ../../mod/register.php:442
-msgid "Choose a nickname: "
+#: ../../mod/dfrn_request.php:622
+msgid "Friendika"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:623
+msgid "StatusNet/Federated Social Web"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:624
+msgid "Private (secure) network"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:625
+msgid "Public (insecure) network"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:626
+msgid "Your profile address:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:627
+msgid "Submit Request"
 msgstr ""
 
 #: ../../mod/install.php:33
@@ -1345,6 +674,372 @@ msgstr ""
 msgid "Errors encountered creating database tables."
 msgstr ""
 
+#: ../../mod/match.php:10
+msgid "Profile Match"
+msgstr ""
+
+#: ../../mod/match.php:50
+msgid "No matches"
+msgstr ""
+
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
+msgstr ""
+
+#: ../../mod/home.php:23
+#, 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"
+msgstr ""
+
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
+msgid "Ignore"
+msgstr ""
+
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
+msgstr ""
+
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
+msgstr ""
+
+#: ../../mod/notifications.php:104
+msgid "Claims to be known to you: "
+msgstr ""
+
+#: ../../mod/notifications.php:104
+msgid "yes"
+msgstr ""
+
+#: ../../mod/notifications.php:104
+msgid "no"
+msgstr ""
+
+#: ../../mod/notifications.php:110
+msgid "Approve as: "
+msgstr ""
+
+#: ../../mod/notifications.php:111
+msgid "Friend"
+msgstr ""
+
+#: ../../mod/notifications.php:112
+msgid "Fan/Admirer"
+msgstr ""
+
+#: ../../mod/notifications.php:119
+msgid "Notification type: "
+msgstr ""
+
+#: ../../mod/notifications.php:120
+msgid "Friend/Connect Request"
+msgstr ""
+
+#: ../../mod/notifications.php:120
+msgid "New Follower"
+msgstr ""
+
+#: ../../mod/notifications.php:130
+msgid "Approve"
+msgstr ""
+
+#: ../../mod/notifications.php:139
+msgid "No notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
+msgstr ""
+
+#: ../../mod/notifications.php:163
+msgid "No registrations."
+msgstr ""
+
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
+msgstr ""
+
+#: ../../mod/contacts.php:19
+msgid "Connect/Follow"
+msgstr ""
+
+#: ../../mod/contacts.php:20
+msgid "Example: bob@example.com, http://example.com/barbara"
+msgstr ""
+
+#: ../../mod/contacts.php:21
+msgid "Follow"
+msgstr ""
+
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
+msgid "Could not access contact record."
+msgstr ""
+
+#: ../../mod/contacts.php:57
+msgid "Could not locate selected profile."
+msgstr ""
+
+#: ../../mod/contacts.php:88
+msgid "Contact updated."
+msgstr ""
+
+#: ../../mod/contacts.php:146
+msgid "Contact has been blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:146
+msgid "Contact has been unblocked"
+msgstr ""
+
+#: ../../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/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:352
+msgid "Mutual Friendship"
+msgstr ""
+
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:356
+msgid "is a fan of yours"
+msgstr ""
+
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:360
+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:264
+msgid "Visit $name's profile"
+msgstr ""
+
+#: ../../mod/contacts.php:265
+msgid "Block/Unblock contact"
+msgstr ""
+
+#: ../../mod/contacts.php:266
+msgid "Ignore contact"
+msgstr ""
+
+#: ../../mod/contacts.php:267
+msgid "Delete contact"
+msgstr ""
+
+#: ../../mod/contacts.php:269
+msgid "Last updated: "
+msgstr ""
+
+#: ../../mod/contacts.php:270
+msgid "Update public posts: "
+msgstr ""
+
+#: ../../mod/contacts.php:272
+msgid "Update now"
+msgstr ""
+
+#: ../../mod/contacts.php:275
+msgid "Unblock this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:275
+msgid "Block this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:276
+msgid "Unignore this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:276
+msgid "Ignore this contact"
+msgstr ""
+
+#: ../../mod/contacts.php:279
+msgid "Currently blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:280
+msgid "Currently ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:311 ../../include/nav.php:111
+#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
+msgid "Contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:313
+msgid "Show Blocked Connections"
+msgstr ""
+
+#: ../../mod/contacts.php:313
+msgid "Hide Blocked Connections"
+msgstr ""
+
+#: ../../mod/contacts.php:315 ../../mod/directory.php:38
+msgid "Finding: "
+msgstr ""
+
+#: ../../mod/contacts.php:316
+msgid "Find"
+msgstr ""
+
+#: ../../mod/contacts.php:376 ../../mod/viewcontacts.php:44
+msgid "Visit $username's profile"
+msgstr ""
+
+#: ../../mod/contacts.php:377
+msgid "Edit contact"
+msgstr ""
+
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../mod/settings.php:38
+msgid "Passwords do not match. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:43
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:54
+msgid "Password changed."
+msgstr ""
+
+#: ../../mod/settings.php:56
+msgid "Password update failed. Please try again."
+msgstr ""
+
+#: ../../mod/settings.php:98
+msgid " Please use a shorter name."
+msgstr ""
+
+#: ../../mod/settings.php:100
+msgid " Name too short."
+msgstr ""
+
+#: ../../mod/settings.php:106
+msgid " Not valid email."
+msgstr ""
+
+#: ../../mod/settings.php:108
+msgid " Cannot change to that email."
+msgstr ""
+
+#: ../../mod/settings.php:166
+msgid "Settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:216
+msgid "Plugin Settings"
+msgstr ""
+
+#: ../../mod/settings.php:217
+msgid "Account Settings"
+msgstr ""
+
+#: ../../mod/settings.php:223
+msgid "No Plugin settings configured"
+msgstr ""
+
+#: ../../mod/settings.php:270
+msgid "OpenID: "
+msgstr ""
+
+#: ../../mod/settings.php:270
+msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
+msgstr ""
+
+#: ../../mod/settings.php:302
+msgid "Profile is <strong>not published</strong>."
+msgstr ""
+
+#: ../../mod/settings.php:345
+msgid "Export Personal Data"
+msgstr ""
+
+#: ../../mod/settings.php:363
+msgid "Default Post Permissions"
+msgstr ""
+
+#: ../../mod/manage.php:37
+#, php-format
+msgid "Welcome back %s"
+msgstr ""
+
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
+msgstr ""
+
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
+msgstr ""
+
 #: ../../mod/network.php:18
 msgid "Normal View"
 msgstr ""
@@ -1353,6 +1048,27 @@ msgstr ""
 msgid "New Item View"
 msgstr ""
 
+#: ../../mod/network.php:69 ../../mod/message.php:172
+#: ../../mod/profile.php:137
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/network.php:70 ../../mod/profile.php:138
+msgid "Please enter a YouTube link:"
+msgstr ""
+
+#: ../../mod/network.php:71 ../../mod/profile.php:139
+msgid "Please enter a video(.ogg) link/URL:"
+msgstr ""
+
+#: ../../mod/network.php:72 ../../mod/profile.php:140
+msgid "Please enter an audio(.ogg) link/URL:"
+msgstr ""
+
+#: ../../mod/network.php:73 ../../mod/profile.php:141
+msgid "Where are you right now?"
+msgstr ""
+
 #: ../../mod/network.php:156
 msgid "No such group"
 msgstr ""
@@ -1365,218 +1081,214 @@ msgstr ""
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/notifications.php:28
-msgid "Invalid request identifier."
+#: ../../mod/network.php:319 ../../mod/network.php:548
+#: ../../mod/profile.php:457 ../../mod/display.php:262
+#: ../../mod/search.php:116
+msgid "View $name's profile"
 msgstr ""
 
-#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
-msgid "Discard"
+#: ../../mod/network.php:334 ../../mod/search.php:131
+msgid "View in context"
 msgstr ""
 
-#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
-msgid "Ignore"
+#: ../../mod/network.php:397
+msgid "See more posts like this"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Show Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:72
-msgid "Hide Ignored Requests"
-msgstr ""
-
-#: ../../mod/notifications.php:105
-msgid "Claims to be known to you: "
-msgstr ""
-
-#: ../../mod/notifications.php:105
-msgid "yes"
-msgstr ""
-
-#: ../../mod/notifications.php:105
-msgid "no"
-msgstr ""
-
-#: ../../mod/notifications.php:111
-msgid "Approve as: "
-msgstr ""
-
-#: ../../mod/notifications.php:112
-msgid "Friend"
-msgstr ""
-
-#: ../../mod/notifications.php:113
-msgid "Fan/Admirer"
-msgstr ""
-
-#: ../../mod/notifications.php:120
-msgid "Notification type: "
-msgstr ""
-
-#: ../../mod/notifications.php:121
-msgid "Friend/Connect Request"
-msgstr ""
-
-#: ../../mod/notifications.php:121
-msgid "New Follower"
-msgstr ""
-
-#: ../../mod/notifications.php:131
-msgid "Approve"
-msgstr ""
-
-#: ../../mod/notifications.php:140
-msgid "No notifications."
-msgstr ""
-
-#: ../../mod/notifications.php:164
-msgid "No registrations."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
-msgid "Profile location is not valid or does not contain profile information."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
-msgid "Warning: profile location has no identifiable owner name."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
-msgid "Warning: profile location has no profile photo."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#: ../../mod/network.php:416 ../../mod/profile.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."
+msgid "See all %d comments"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:188
-msgid "Unrecoverable protocol error."
+#: ../../mod/network.php:549 ../../mod/display.php:263
+msgid "View $owner_name's profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:216
-msgid "Profile unavailable."
+#: ../../mod/network.php:550 ../../mod/display.php:264
+msgid "to"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:241
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../mod/network.php:551 ../../mod/display.php:265
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:242
-msgid "Spam protection measures have been invoked."
+#: ../../mod/network.php:552 ../../mod/display.php:266
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:243
-msgid "Friends are advised to please try again in 24 hours."
-msgstr ""
-
-#: ../../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
+#: ../../mod/network.php:593 ../../mod/register.php:442
+#: ../../mod/profile.php:490 ../../mod/display.php:317
 msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
-msgid "[Name Withheld]"
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:543
-msgid "Introduction received at "
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:615
-msgid "Friend/Connection Request"
+#: ../../mod/group.php:43 ../../mod/group.php:123
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:616
-msgid "Please answer the following:"
+#: ../../mod/group.php:56
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:617
-msgid "Does $name know you?"
+#: ../../mod/group.php:79
+msgid "Membership list updated."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:620
-msgid "Add a personal note:"
+#: ../../mod/group.php:88 ../../index.php:250
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/group.php:107
+msgid "Group removed."
+msgstr ""
+
+#: ../../mod/group.php:109
+msgid "Unable to remove group."
+msgstr ""
+
+#: ../../mod/viewcontacts.php:17 ../../boot.php:2041
+msgid "View Contacts"
+msgstr ""
+
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
+msgstr ""
+
+#: ../../mod/register.php:47
+msgid "Invalid OpenID url"
+msgstr ""
+
+#: ../../mod/register.php:62
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../mod/register.php:74
+msgid "Please use a shorter name."
+msgstr ""
+
+#: ../../mod/register.php:76
+msgid "Name too short."
+msgstr ""
+
+#: ../../mod/register.php:89
+msgid "That doesn\\'t appear to be your full (First Last) name."
+msgstr ""
+
+#: ../../mod/register.php:92
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+
+#: ../../mod/register.php:95
+msgid "Not a valid email address."
+msgstr ""
+
+#: ../../mod/register.php:101
+msgid "Cannot use that email."
+msgstr ""
+
+#: ../../mod/register.php:106
 msgid ""
-"Please enter your profile address from one of the following supported social "
-"networks:"
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:622
-msgid "Friendika"
+#: ../../mod/register.php:112 ../../mod/register.php:212
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:623
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/register.php:131
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:624
-msgid "Private (secure) network"
+#: ../../mod/register.php:198
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:625
-msgid "Public (insecure) network"
+#: ../../mod/register.php:234
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:626
-msgid "Your profile address:"
+#: ../../mod/register.php:328 ../../mod/regmod.php:92
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
-msgid "Submit Request"
+#: ../../mod/register.php:333
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
-msgid "Cancel"
+#: ../../mod/register.php:337
+msgid "Failed to send email message. Here is the message that failed."
+msgstr ""
+
+#: ../../mod/register.php:342
+msgid "Your registration can not be processed."
+msgstr ""
+
+#: ../../mod/register.php:365
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../mod/register.php:369
+msgid "Your registration is pending approval by the site owner."
+msgstr ""
+
+#: ../../mod/register.php:417
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../mod/register.php:419
+msgid "Your OpenID (optional): "
+msgstr ""
+
+#: ../../mod/register.php:433
+msgid "Include your profile in member directory?"
+msgstr ""
+
+#: ../../mod/register.php:449
+msgid "Registration"
+msgstr ""
+
+#: ../../mod/register.php:457
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr ""
+
+#: ../../mod/register.php:458
+msgid "Your Email Address: "
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../mod/register.php:460
+msgid "Choose a nickname: "
+msgstr ""
+
+#: ../../mod/register.php:463 ../../include/nav.php:61 ../../boot.php:811
+msgid "Register"
 msgstr ""
 
 #: ../../mod/like.php:110
@@ -1593,31 +1305,56 @@ msgstr ""
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/lostpass.php:38
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/friendika.php:12 ../../wip/friendika.php:12
+msgid "This is Friendika version"
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/friendika.php:13 ../../wip/friendika.php:13
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/removeme.php:43
+#: ../../mod/friendika.php:15
 msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+"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/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../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/apps.php:6
-msgid "Applications"
+#: ../../mod/friendika.php:19 ../../wip/friendika.php:15
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/directory.php:32
-msgid "Global Directory"
+#: ../../mod/friendika.php:20 ../../wip/friendika.php:16
+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/regmod.php:10
+msgid "Please login."
+msgstr ""
+
+#: ../../mod/regmod.php:54
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../mod/regmod.php:96
+msgid "Account approved."
 msgstr ""
 
 #: ../../mod/item.php:37
@@ -1628,6 +1365,12 @@ msgstr ""
 msgid "Empty post discarded."
 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"
+msgstr ""
+
 #: ../../mod/item.php:474
 #, php-format
 msgid "%s commented on your item at %s"
@@ -1663,20 +1406,57 @@ msgstr ""
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:312
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../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."
 msgstr ""
 
-#: ../../mod/tagrm.php:93
-msgid "Remove"
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
+msgstr ""
+
+#: ../../mod/profile_photo.php:200
+msgid "Crop Image"
+msgstr ""
+
+#: ../../mod/profile_photo.php:201
+msgid "Please adjust the image cropping for optimum viewing."
+msgstr ""
+
+#: ../../mod/profile_photo.php:202
+msgid "Done Editing"
+msgstr ""
+
+#: ../../mod/profile_photo.php:230
+msgid "Image uploaded successfully."
+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/message.php:18
@@ -1735,6 +1515,10 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
+#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/message.php:222
 msgid "No messages."
 msgstr ""
@@ -1755,6 +1539,177 @@ msgstr ""
 msgid "Send Reply"
 msgstr ""
 
+#: ../../mod/profile.php:8 ../../boot.php:2213
+msgid "No profile"
+msgstr ""
+
+#: ../../mod/profile.php:102
+msgid "Status"
+msgstr ""
+
+#: ../../mod/profile.php:103
+msgid "Profile"
+msgstr ""
+
+#: ../../mod/profile.php:104
+msgid "Photos"
+msgstr ""
+
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
+msgstr ""
+
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
+msgstr ""
+
+#: ../../mod/follow.php:173
+msgid "The profile address specified does not provide adequate information."
+msgstr ""
+
+#: ../../mod/follow.php:179
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
+msgstr ""
+
+#: ../../mod/follow.php:230
+msgid "Unable to retrieve contact information."
+msgstr ""
+
+#: ../../mod/follow.php:276
+msgid "following"
+msgstr ""
+
+#: ../../mod/display.php:305
+msgid "Item has been removed."
+msgstr ""
+
+#: ../../mod/dfrn_notify.php:179
+msgid "noreply"
+msgstr ""
+
+#: ../../mod/dfrn_notify.php:237
+msgid "New mail received at "
+msgstr ""
+
+#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#, php-format
+msgid "%s commented on an item at %s"
+msgstr ""
+
+#: ../../mod/apps.php:6
+msgid "Applications"
+msgstr ""
+
+#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2058
+msgid "Search"
+msgstr ""
+
+#: ../../mod/search.php:54
+msgid "No results."
+msgstr ""
+
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
+msgstr ""
+
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
+msgstr ""
+
+#: ../../mod/profiles.php:199
+msgid "Profile updated."
+msgstr ""
+
+#: ../../mod/profiles.php:254
+msgid "Profile deleted."
+msgstr ""
+
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
+msgstr ""
+
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
+msgstr ""
+
+#: ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
+msgstr ""
+
+#: ../../mod/profiles.php:370
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr ""
+
+#: ../../mod/profiles.php:380 ../../mod/directory.php:89
+msgid "Age: "
+msgstr ""
+
+#: ../../mod/profiles.php:422
+msgid "Profile Image"
+msgstr ""
+
+#: ../../mod/directory.php:32
+msgid "Global Directory"
+msgstr ""
+
+#: ../../mod/directory.php:92
+msgid "Gender: "
+msgstr ""
+
+#: ../../mod/directory.php:118
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: ../../mod/invite.php:28
+#, php-format
+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/invite.php:57
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../mod/invite.php:60
+#, php-format
+msgid "Please join my social network on %s"
+msgstr ""
+
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
+msgstr ""
+
+#: ../../mod/invite.php:62
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
+msgstr ""
+
 #: ../../mod/dfrn_confirm.php:231
 msgid "Response from remote site was not understood."
 msgstr ""
@@ -1824,162 +1779,44 @@ msgstr ""
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
-#: ../../include/auth.php:130 ../../include/auth.php:183
-msgid "Login failed."
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
 msgstr ""
 
-#: ../../mod/openid.php:73 ../../include/auth.php:194
-msgid "Welcome back "
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
-#, php-format
-msgid "%s welcomes %s"
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:32
-msgid "No contacts."
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../mod/group.php:79
-msgid "Membership list updated."
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
 msgstr ""
 
-#: ../../mod/group.php:107
-msgid "Group removed."
-msgstr ""
-
-#: ../../mod/group.php:109
-msgid "Unable to remove group."
-msgstr ""
-
-#: ../../mod/match.php:10
-msgid "Profile Match"
-msgstr ""
-
-#: ../../mod/match.php:49
-msgid "No matches"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:64
-msgid "Post to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:122
-msgid "Twitter Posting Settings"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:129
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr ""
-
-#: ../../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/twitter/twitter.php:149
-msgid "Log in with Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:151
-msgid "Copy the PIN from Twitter here"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197
-msgid "Currently connected to: "
-msgstr ""
-
-#: ../../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/twitter/twitter.php:168
-msgid "Send public postings to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:78
-msgid "Post to StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:146
-msgid "StatusNet Posting Settings"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../addon/statusnet/statusnet.php:154
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:157
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:160
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../addon/statusnet/statusnet.php:182
-msgid "Log in with StatusNet"
-msgstr ""
-
-#: ../../addon/statusnet/statusnet.php:184
-msgid "Copy the security code from StatusNet here"
-msgstr ""
-
-#: ../../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 ""
-
-#: ../../addon/statusnet/statusnet.php:200
-msgid "Send public postings to StatusNet"
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
 msgstr ""
 
 #: ../../addon/tictac/tictac.php:14
@@ -2036,63 +1873,27 @@ msgstr ""
 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 ""
-"Use the following controls only if the Java uploader [above] fails to launch."
-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"
-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
+#: ../../wip/addon/randplace/randplace.php:170
 msgid "Randplace Settings"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:173
+#: ../../wip/addon/randplace/randplace.php:172
 msgid "Enable Randplace Plugin"
 msgstr ""
 
+#: ../../addon/java_upload/java_upload.php:33 ../../wip/photos.php:747
+#: ../../wip/photos-chris.php:794
+msgid "Select files to upload: "
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:35 ../../wip/photos.php:752
+#: ../../wip/photos-chris.php:799
+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"
 msgstr ""
@@ -2125,6 +1926,110 @@ msgstr ""
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
+#: ../../addon/statusnet/statusnet.php:78
+msgid "Post to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:146
+msgid "StatusNet Posting Settings"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../addon/statusnet/statusnet.php:154
+msgid "OAuth Consumer Key"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:157
+msgid "OAuth Consumer Secret"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:160
+msgid "Base API Path (remember the trailing /)"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../addon/statusnet/statusnet.php:182
+msgid "Log in with StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:184
+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 "
+"associated StatusNet account as well."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:200
+msgid "Send public postings to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:204 ../../addon/twitter/twitter.php:172
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:129
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: ../../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/twitter/twitter.php:149
+msgid "Log in with Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: ../../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/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
+msgstr ""
+
 #: ../../include/contact_selectors.php:32
 msgid "Unknown | Not categorised"
 msgstr ""
@@ -2385,16 +2290,56 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/acl_selectors.php:132
-msgid "Visible To:"
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
-msgid "Groups"
+#: ../../include/group.php:130
+msgid "Create a new group"
 msgstr ""
 
-#: ../../include/acl_selectors.php:147
-msgid "Except For:"
+#: ../../include/group.php:131
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/nav.php:38 ../../boot.php:839
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:44 ../../boot.php:819 ../../boot.php:825
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:56 ../../include/nav.php:91
+msgid "Home"
+msgstr ""
+
+#: ../../include/nav.php:64
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:77
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:87
+msgid "Network"
+msgstr ""
+
+#: ../../include/nav.php:96
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:104
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:107
+msgid "Settings"
+msgstr ""
+
+#: ../../include/nav.php:109
+msgid "Profiles"
 msgstr ""
 
 #: ../../include/auth.php:27
@@ -2469,43 +2414,23 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: ../../include/nav.php:56 ../../include/nav.php:91
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:64
-msgid "Apps"
-msgstr ""
-
-#: ../../include/nav.php:77
-msgid "Directory"
-msgstr ""
-
-#: ../../include/nav.php:87
-msgid "Network"
-msgstr ""
-
-#: ../../include/nav.php:96
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:104
-msgid "Manage"
-msgstr ""
-
-#: ../../include/nav.php:107
-msgid "Settings"
-msgstr ""
-
-#: ../../include/nav.php:109
-msgid "Profiles"
-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:1027
 msgid "Birthday:"
 msgstr ""
@@ -2514,14 +2439,252 @@ msgstr ""
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/group.php:130
-msgid "Create a new group"
+#: ../../boot.php:359
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/group.php:131
-msgid "Everybody"
+#: ../../boot.php:360
+msgid "Comment"
 msgstr ""
 
-#: ../../include/oembed.php:57
-msgid "Embedding disabled"
+#: ../../boot.php:810
+msgid "Create a New Account"
+msgstr ""
+
+#: ../../boot.php:817
+msgid "Nickname or Email address: "
+msgstr ""
+
+#: ../../boot.php:818
+msgid "Password: "
+msgstr ""
+
+#: ../../boot.php:823
+msgid "Nickname/Email/OpenID: "
+msgstr ""
+
+#: ../../boot.php:824
+msgid "Password (if not OpenID): "
+msgstr ""
+
+#: ../../boot.php:827
+msgid "Forgot your password?"
+msgstr ""
+
+#: ../../boot.php:828
+msgid "Password Reset"
+msgstr ""
+
+#: ../../boot.php:1080
+msgid "prev"
+msgstr ""
+
+#: ../../boot.php:1082
+msgid "first"
+msgstr ""
+
+#: ../../boot.php:1111
+msgid "last"
+msgstr ""
+
+#: ../../boot.php:1114
+msgid "next"
+msgstr ""
+
+#: ../../boot.php:1840
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../boot.php:1840
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../boot.php:1844
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgstr ""
+
+#: ../../boot.php:1846
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgstr ""
+
+#: ../../boot.php:1852
+msgid "and"
+msgstr ""
+
+#: ../../boot.php:1855
+#, php-format
+msgid ", and %d other people"
+msgstr ""
+
+#: ../../boot.php:1856
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../boot.php:1856
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../boot.php:2017
+msgid "No contacts"
+msgstr ""
+
+#: ../../boot.php:2025
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../boot.php:2270
+msgid "Connect"
+msgstr ""
+
+#: ../../boot.php:2280
+msgid "Location:"
+msgstr ""
+
+#: ../../boot.php:2284
+msgid ", "
+msgstr ""
+
+#: ../../boot.php:2292
+msgid "Gender:"
+msgstr ""
+
+#: ../../boot.php:2296
+msgid "Status:"
+msgstr ""
+
+#: ../../boot.php:2298
+msgid "Homepage:"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Monday"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Tuesday"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Wednesday"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Thursday"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Friday"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Saturday"
+msgstr ""
+
+#: ../../boot.php:2389
+msgid "Sunday"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "January"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "February"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "March"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "April"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "May"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "June"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "July"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "August"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "September"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "October"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "November"
+msgstr ""
+
+#: ../../boot.php:2393
+msgid "December"
+msgstr ""
+
+#: ../../boot.php:2427
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../boot.php:2428
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../boot.php:2429
+msgid "(Adjusted for local time)"
+msgstr ""
+
+#: ../../boot.php:2440
+msgid "[today]"
+msgstr ""
+
+#: ../../boot.php:2637
+msgid "link to source"
+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."
+msgstr ""
+
+#: ../../wip/addon/js_upload/js_upload.php:214
+msgid "The upload was cancelled, or server error encountered"
+msgstr ""
+
+#: ../../wip/addon/js_upload/js_upload.php:167
+msgid "Server error. Upload directory isn"
+msgstr ""
+
+#: ../../index.php:194
+msgid "Not Found"
+msgstr ""
+
+#: ../../index.php:195
+msgid "Page not found."
 msgstr ""
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 9d38e4da9c..9f3f13c882 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -25,7 +25,7 @@ echo "extract strings to $OUTFILE.."
 find ../../ -name "*.php" | xargs xgettext $KEYWORDS $OPTS -o "$OUTFILE" --from-code=UTF-8
 
 echo "setup base info.."
-sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distribuited Social Network/g" "$OUTFILE"
+sed -i "s/SOME DESCRIPTIVE TITLE./FRIENDIKA Distributed Social Network/g" "$OUTFILE"
 sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2010, 2011 Mike Macgirvin/g" "$OUTFILE"
 sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2010/g" "$OUTFILE"
 sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE"
diff --git a/util/strings.php b/util/strings.php
index a1f8f9a153..ee6ec4b1c6 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -8,6 +8,8 @@ $a->strings['Not Found'] = 'Not Found';
 $a->strings['Page not found.' ] = 'Page not found.' ;
 $a->strings['Permission denied'] = 'Permission denied';
 $a->strings['Permission denied.'] = 'Permission denied.';
+$a->strings['Delete this item?'] = 'Delete this item?';
+$a->strings['Comment'] = 'Comment';
 $a->strings['Create a New Account'] = 'Create a New Account';
 $a->strings['Register'] = 'Register';
 $a->strings['Nickname or Email address: '] = 'Nickname or Email address: ';
@@ -172,6 +174,9 @@ $a->strings["%d required parameter was not found at the given location"] = array
 	1 => "%d required parameters were not found at the given location",
 );
 $a->strings['Global Directory'] = 'Global Directory';
+$a->strings['Age: '] = 'Age: ';
+$a->strings['Gender: '] = 'Gender: ';
+$a->strings["No entries \x28some entries may be hidden\x29."] = "No entries \x28some entries may be hidden\x29.";
 $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
@@ -204,6 +209,14 @@ $a->strings['The profile address specified does not provide adequate information
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
 $a->strings['following'] = 'following';
+$a->strings['This is Friendika version'] = 'This is Friendika version';
+$a->strings['running at web location'] = 'running at web location';
+$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>'] = '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>';
+$a->strings['Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.'] = 'Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.';
+$a->strings['Bug reports and issues: please visit'] = 'Bug reports and issues: please visit';
+$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com';
+$a->strings['Installed plugins/addons/apps'] = 'Installed plugins/addons/apps';
+$a->strings['No installed plugins/addons/apps'] = 'No installed plugins/addons/apps';
 $a->strings['Group created.'] = 'Group created.';
 $a->strings['Could not create group.'] = 'Could not create group.';
 $a->strings['Group not found.'] = 'Group not found.';
@@ -303,9 +316,12 @@ $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
 $a->strings['View in context'] = 'View in context';
+$a->strings['See more posts like this'] = 'See more posts like this';
+$a->strings['See all %d comments'] = 'See all %d comments';
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
+$a->strings['Pending Friend/Connect Notifications'] = 'Pending Friend/Connect Notifications';
 $a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
 $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
 $a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
@@ -319,6 +335,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $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['No registrations.'] = 'No registrations.';
 $a->strings['Login failed.'] = 'Login failed.';
 $a->strings["Welcome back "] = "Welcome back ";
@@ -360,6 +377,9 @@ $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['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';
 $a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
 $a->strings['Profile Name is required.'] = 'Profile Name is required.';
 $a->strings['Profile updated.'] = 'Profile updated.';
@@ -368,7 +388,6 @@ $a->strings['Profile-'] = 'Profile-';
 $a->strings['New profile created.'] = 'New profile created.';
 $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.';
 $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['Age: '] = 'Age: ';
 $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.';
@@ -418,6 +437,7 @@ $a->strings['No Plugin settings configured'] = 'No Plugin settings configured';
 $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['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
+$a->strings['Export Personal Data'] = 'Export Personal Data';
 $a->strings['Default Post Permissions'] = 'Default Post Permissions';
 $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
@@ -725,6 +745,7 @@ $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';
@@ -743,6 +764,7 @@ $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';
@@ -759,6 +781,7 @@ $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';
@@ -787,6 +810,7 @@ $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';
@@ -849,6 +873,7 @@ $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/en/cropbody.tpl b/view/cropbody.tpl
similarity index 83%
rename from view/en/cropbody.tpl
rename to view/cropbody.tpl
index 39395af8e1..c9c0f84de1 100644
--- a/view/en/cropbody.tpl
+++ b/view/cropbody.tpl
@@ -1,9 +1,9 @@
-<h1>Crop Image</h1>
+<h1>$title</h1>
 <p id="cropimage-desc">
-Please adjust the image cropping for optimum viewing.
+$desc
 </p>
 <div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
 </div>
 <div id="cropimage-preview-wrapper" >
 <div id="previewWrap" ></div>
@@ -41,7 +41,6 @@ Please adjust the image cropping for optimum viewing.
 
 <form action="profile_photo/$resource" id="crop-image-form" method="post" />
 
-<input type="hidden" name="imagename" value="$hash" />
 <input type="hidden" name="cropfinal" value="1" />
 <input type="hidden" name="xstart" id="x1" />
 <input type="hidden" name="ystart" id="y1" />
@@ -51,7 +50,7 @@ Please adjust the image cropping for optimum viewing.
 <input type="hidden" name="width"  id="width" />
 
 <div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
+<input type="submit" name="submit" value="$done" />
 </div>
 
 </form>
diff --git a/view/de/cropbody.tpl b/view/de/cropbody.tpl
deleted file mode 100644
index 0211fe3089..0000000000
--- a/view/de/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>Bild zuschneiden</h1>
-<p id="cropimage-desc">
-Zur optimalen Darstellung des Bildes kann es nun auf einen Bereich
-zugeschnitten werden. Bitte wähle diesen Bereich.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
-</div>
-
-</form>
diff --git a/view/de/head.tpl b/view/de/head.tpl
deleted file mode 100644
index 17b7706f82..0000000000
--- a/view/de/head.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/de/intros-top.tpl b/view/de/intros-top.tpl
deleted file mode 100644
index e65da1a3f2..0000000000
--- a/view/de/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Schwebende Freundschafts/Kontakt Benachrichtigungen</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/de/profile.php b/view/de/profile.php
deleted file mode 100644
index 40b6abd557..0000000000
--- a/view/de/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">In Verbindung treten</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Standort:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Geschlecht: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/de/registrations-top.tpl b/view/de/registrations-top.tpl
deleted file mode 100644
index d788b515d4..0000000000
--- a/view/de/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Schwebende Neuanmeldungen</h1>
-
-
diff --git a/view/de/settings_nick_unset.tpl b/view/de/settings_nick_unset.tpl
deleted file mode 100644
index 2a56fda7ae..0000000000
--- a/view/de/settings_nick_unset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Deine Profil URL ist im Moment <strong>'$baseurl/profile/$uid'</strong>.
-Wenn du einen Spitznamen wählst kann man diese URL freundlicher ausdrücken
-z.B. <strong>'spitzname@$basepath'</strong>.
-<br />
-Einmal gewählt kann der Spitzname nicht mehr geändert werden. Er
-<strong>muss</strong> mit einem Buchstaben beginnen. Es sind ausschließlich
-Buchstaben, Zahlen sowie Binde- und Unterstriche erlaubt.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Spitzname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/en/head.tpl b/view/en/head.tpl
deleted file mode 100644
index 8f97a11e50..0000000000
--- a/view/en/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<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" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/en/intros-top.tpl b/view/en/intros-top.tpl
deleted file mode 100644
index d8b7394a4a..0000000000
--- a/view/en/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Pending Friend/Connect Notifications</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/en/profile.php b/view/en/profile.php
deleted file mode 100644
index fa7372668c..0000000000
--- a/view/en/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Location:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/en/registrations-top.tpl b/view/en/registrations-top.tpl
deleted file mode 100644
index d8faf3439e..0000000000
--- a/view/en/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>User registrations waiting for confirm</h1>
-
-
diff --git a/view/en/settings_nick_unset.tpl b/view/en/settings_nick_unset.tpl
deleted file mode 100644
index 903768b594..0000000000
--- a/view/en/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
-Setting a nickname will allow a friendly profile URL such as
-<strong>'nickname@$basepath'</strong>.
-<br />
-Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/fr/cropbody.tpl b/view/fr/cropbody.tpl
deleted file mode 100644
index 6c509ce1da..0000000000
--- a/view/fr/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Crop Image</h1>
-<p id="cropimage-desc">
-Merci d'ajuster le cadre de l'image pour un affichage optimal.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Edition terminée" />
-</div>
-
-</form>
diff --git a/view/fr/head.tpl b/view/fr/head.tpl
deleted file mode 100644
index 4636b542ca..0000000000
--- a/view/fr/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<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" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Effacer cet élément?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/fr/intros-top.tpl b/view/fr/intros-top.tpl
deleted file mode 100644
index 85dd628b66..0000000000
--- a/view/fr/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Demandes d'amitié/mise en relation en attente</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/fr/profile.php b/view/fr/profile.php
deleted file mode 100644
index 9c5d6dce6d..0000000000
--- a/view/fr/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Localisation:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Genre: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/fr/registrations-top.tpl b/view/fr/registrations-top.tpl
deleted file mode 100644
index 3988f78220..0000000000
--- a/view/fr/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>
-
-
diff --git a/view/fr/settings_nick_unset.tpl b/view/fr/settings_nick_unset.tpl
deleted file mode 100644
index 60c7a4a45d..0000000000
--- a/view/fr/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Votre adresse (URL) de profil est actuellement <strong>'$baseurl/profile/$uid'</strong>.
-Choisir un pseudo vous donnera une URL plus simple à retenir, comme 
-<strong>'nickname@$basepath'</strong>.
-<br />
-Une fois défini, il ne pourra plus changer. Le pseudo <strong>doit</strong> débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.
-</p>
-<label id="settings-nick-label" for="settings-nick" >Pseudo: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/sv/head.tpl b/view/head.tpl
similarity index 88%
rename from view/sv/head.tpl
rename to view/head.tpl
index 828fcb13da..7a5710b2ac 100644
--- a/view/sv/head.tpl
+++ b/view/head.tpl
@@ -11,9 +11,9 @@
 <script type="text/javascript" src="$baseurl/include/main.js" ></script>
 <script>
 
-	function confirmDelete() { return confirm("Ta bort?"); }
+	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
+		if(obj.value == '$comment') {
 			obj.value = '';
 			obj.className = "comment-edit-text-full";
 			openMenu("comment-edit-submit-wrapper-" + id);
@@ -21,10 +21,12 @@
 	}
 	function commentClose(obj,id) {
 		if(obj.value == '') {
-			obj.value = 'Comment';
+			obj.value = '$comment';
 			obj.className="comment-edit-text-empty";
 			closeMenu("comment-edit-submit-wrapper-" + id);
 		}
 	}
 
 </script>
+
+
diff --git a/view/it/cropbody.tpl b/view/it/cropbody.tpl
deleted file mode 100644
index fe072f0b50..0000000000
--- a/view/it/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Ritaglia Immagine</h1>
-<p id="cropimage-desc">
-Sistema il ritaglio dell'immagine per una visualizzazione ottimale.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Fatto" />
-</div>
-
-</form>
diff --git a/view/it/head.tpl b/view/it/head.tpl
deleted file mode 100644
index 8e4e0ccd7f..0000000000
--- a/view/it/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<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" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Cancellare questo elemento?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
diff --git a/view/it/intros-top.tpl b/view/it/intros-top.tpl
deleted file mode 100644
index d096dcfb86..0000000000
--- a/view/it/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Notifiche di Amicizia/Collegamento in Attesa</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/it/profile.php b/view/it/profile.php
deleted file mode 100644
index 5ecffb3a5d..0000000000
--- a/view/it/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connetti</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Location:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
diff --git a/view/it/registrations-top.tpl b/view/it/registrations-top.tpl
deleted file mode 100644
index 8134aa2103..0000000000
--- a/view/it/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Registrazioni in attesa di conferma</h1>
-
-
diff --git a/view/it/settings_nick_unset.tpl b/view/it/settings_nick_unset.tpl
deleted file mode 100644
index 8f4cba4757..0000000000
--- a/view/it/settings_nick_unset.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-L'URL del tuo profilo &egrave; <strong>'$baseurl/profile/$uid'</strong>.
-Impostare un soprannome permetter&agrave; di avere un URL più aimchevole, come
-<strong>'soprannome@$basepath'</strong>.
-<br />
-Una volta impostato, non potr&agreve; pi&ugrave; essere cambiato. Il soprannome <strong>deve</strong>
-cominciare con una lettera; nel soprannome sono permessi solo lettere, numeri, trattini (-) e underscore (_).
-</p>
-<label id="settings-nick-label" for="settings-nick" >Soprannome: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 774b37c860..eebaf803ac 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -126,6 +126,13 @@ tinyMCE.init({
 		}
 	}
 
+	function jotTitle() {
+		reply = prompt("$title", $('#jot-title').val());
+		if(reply && reply.length) {
+			$('#jot-title').val(reply);
+		}
+	}
+
 	function jotShare(id) {
 		$('#like-rotator-' + id).show();
 		$.get('share/' + id, function(data) {
diff --git a/view/jot.tpl b/view/jot.tpl
index fd85b9267e..f5010301f6 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -12,6 +12,7 @@
 		<input type="hidden" name="return" value="$return_path" />
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
+		<input type="hidden" name="title" id="jot-title" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >$content</textarea>
@@ -40,6 +41,10 @@
 	<div id="profile-nolocation-wrapper" style="display: none;" >
 		<img id="profile-nolocation" src="images/noglobe.gif" alt="$noloc" title="$noloc" onclick="jotClearLocation();" />
 	</div> 
+	<div id="profile-title-wrapper" style="display: $visitor;" >
+		<img id="profile-title" src="images/article.gif" alt="$title" title="$title" onclick="jotTitle();" />
+	</div> 
+
 	<div id="profile-jot-plugin-wrapper">
   	$jotplugins
 	</div>
diff --git a/view/oexchange_xrd.tpl b/view/oexchange_xrd.tpl
new file mode 100644
index 0000000000..c7e6df4988
--- /dev/null
+++ b/view/oexchange_xrd.tpl
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+        
+    <Subject>$base</Subject>
+
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/vendor">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/title">Friendika Social Network</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/name">Friendika</Property>
+    <Property 
+        type="http://www.oexchange.org/spec/0.8/prop/prompt">Send to Friendika</Property>
+
+    <Link 
+        rel="icon" 
+        href="$base/images/friendika-16.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel="icon32" 
+        href="$base/images/friendika-32.png"
+        type="image/png" 
+        />
+
+    <Link 
+        rel= "http://www.oexchange.org/spec/0.8/rel/offer" 
+        href="$base/oexchange"
+        type="text/html" 
+        />
+</XRD>
+
diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl
deleted file mode 100644
index a91a7eafcf..0000000000
--- a/view/sv/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Besk&auml;r bilden</h1>
-<p id="cropimage-desc">
-V&auml;lj hur du vill att bilden ska besk&auml;ras.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Spara" />
-</div>
-
-</form>
\ No newline at end of file
diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl
deleted file mode 100644
index 0aa01c5da4..0000000000
--- a/view/sv/intros-top.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>V&auml;ntande f&ouml;rfr&aring;gningar om v&auml;nskap/kontakt</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
diff --git a/view/sv/profile.php b/view/sv/profile.php
deleted file mode 100644
index 6c551e1851..0000000000
--- a/view/sv/profile.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Plats:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
-				<span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>
-				<span class="country-name"><?php echo $profile['country-name']; ?></span>
-			</div>
-		</div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">K&ouml;n: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Civilstatus: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Webbplats: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl
deleted file mode 100644
index 24e13abca4..0000000000
--- a/view/sv/registrations-top.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Registreringar från användare som inv&auml;ntar godk&auml;nnande</h1>
diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl
deleted file mode 100644
index 5e115ff68e..0000000000
--- a/view/sv/settings_nick_unset.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Din profiladress &auml;r f&ouml;r n&auml;rvarande<strong>'$baseurl/profile/$uid'</strong>.
-Genom att ange ett smeknamn/nick kan din adress bli enklare, s&aring; h&auml;r:
-<strong>'nickname@$basepath'</strong>.
-<br />
-N&auml;r smeknamn/nick har angetts kan det <strong>inte</strong> &auml;ndras. Det <strong>m&aring;ste</strong> inledas med en bokstav, och bara bokst&auml;ver, siffror, bindestreck och understrykningstecken f&aring;r anv&auml;ndas.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0d89fa3b1c..042cc380ff 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -215,7 +215,8 @@ div.wall-item-content-wrapper.shiny {
 #profile-youtube, 
 #profile-video, 
 #profile-audio,
-#profile-link, 
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -1056,41 +1057,45 @@ input#dfrn-url {
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-video-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-audio-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 150px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2099,7 +2104,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 
 .tool-link {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 4d2ca6d636..a618381575 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -111,7 +111,8 @@ blockquote:before {
 #profile-youtube, 
 #profile-video,
 #profile-audio, 
-#profile-link, 
+#profile-link,
+#profile-title, 
 #wall-image-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
@@ -1119,41 +1120,46 @@ padding: 5px 10px 0px;
 }
 #profile-upload-wrapper {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 
 #profile-rotator {
 	float: left;
-	margin-left: 50px;
+	margin-left: 30px;
 }
 #profile-link-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-youtube-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-video-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-audio-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-location-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
 }
 #profile-nolocation-wrapper {
 	float: left;
-	margin-left: 20px;
+	margin-left: 15px;
+}
+
+#profile-title-wrapper {
+	float: left;
+	margin-left: 15px;
 }
 
 #profile-jot-perms {
 	float: left;
-	margin-left: 150px;
+	margin-left: 100px;
 	font-weight: bold;
 	font-size: 1.2em;
 }
@@ -2115,7 +2121,7 @@ a.mail-list-link {
 
 .tool-wrapper {
   float: left;
-  margin-left: 20px;
+  margin-left: 15px;
 }
 .tool-link {
   cursor: pointer;
diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl
index fae70dec9e..f843df31e3 100644
--- a/view/xrd_host.tpl
+++ b/view/xrd_host.tpl
@@ -7,5 +7,6 @@
     <Link rel='lrdd' template='http://$domain/xrd/?uri={uri}' />
     <Link rel='acct-mgmt' href='http://$domain/amcd' />
     <Link rel='http://services.mozilla.com/amcd/0.1' href='http://$domain/amcd' />
-
+	<Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" 
+		href="http://$domain/oexchange/xrd" />
 </XRD>