Merge branch 'master' of git://github.com/friendika/friendika

12 files changed, 1793 insertions, 1693 deletions

diff --git a/boot.php b/boot.php
index 25c7fd14d..79e520150 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.990' );
+define ( 'FRIENDIKA_VERSION',      '2.2.991' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1058      );
 
diff --git a/doc/Connectors.md b/doc/Connectors.md
index 45bce8d9a..d9ad0e9b0 100644
--- a/doc/Connectors.md
+++ b/doc/Connectors.md
@@ -26,6 +26,8 @@ These are described as the "federated social web" or OStatus contacts.
 
 Please note that there are **no** privacy provisions on the OStatus network. Any message which is delivered to **any** OStatus member is visible to anybody in the world and will negate any privacy settings that you have in effect. These messages will also turn up in public searches. 
 
+Since OStatus communications do not use authentication, if you select the profile privacy option to hide your profile and messages from unknown viewers, OStatus members will **not** be able to recieve your communications. 
+
 To connect with an OStatus member insert their profile URL or Identity address into the Connect box on your [Contacts](contacts) page.
 
 The StatusNet connector may be used if you wish posts to appear on an OStatus site using an existing OStatus account. 
diff --git a/images/content-types.png b/images/content-types.png
new file mode 100644
index 000000000..be2ccbf01
--- /dev/null
+++ b/images/content-types.png
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 65fd29eb3..5d6f2c371 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -419,7 +419,7 @@ function dfrn_notify_post(&$a) {
 								'$email'		=> $importer['email'],				// email address to send to
 								'$url'			=> $datarray['author-link'],			// full url for the site
 								'$from'			=> $from,					// name of the person sending the message
-								'$body'			=> 'q1' .$msg['htmlversion'],			// html version of the message
+								'$body'			=> $msg['htmlversion'],			// html version of the message
 								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
 							));
 			
@@ -440,10 +440,10 @@ function dfrn_notify_post(&$a) {
 							require_once("include/EmailNotification.php");
 							EmailNotification::sendTextHtmlEmail(
 								$msg['notificationfromname'],
-								t("Administrator@") . $a->get_hostname(),
+								t("Administrator") . '@' . $a->get_hostname(),
 								t("noreply") . '@' . $a->get_hostname(),
 								$importer['email'],
-								$from . t(" commented on an item at ") . $a->config['sitename'],
+								sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
 								$email_html_body_tpl,
 								$email_text_body_tpl
 							);
@@ -504,7 +504,7 @@ function dfrn_notify_post(&$a) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 				}
-				$r = item_store($datarray);
+				$posted_id = item_store($datarray);
 
 				// find out if our user is involved in this conversation and wants to be notified.
 			
@@ -544,11 +544,11 @@ function dfrn_notify_post(&$a) {
 							$email_html_body_tpl = replace_macros($tpl,array(
 								'$sitename'		=> $a->config['sitename'],				// name of this site
 								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-								'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
-								'$url'			=> $conv['author-link'],				// full url for the site
+								'$thumb'		=> $datarray['author-avatar'],				// thumbnail url for sender icon
+								'$url'			=> $datarray['author-link'],				// full url for the site
 								'$from'			=> $from,						// name of the person sending the message
 								'$body'			=> $msg['htmlversion'],					// html version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 							));
 			
 							// load the template for private message notifications
@@ -556,11 +556,11 @@ function dfrn_notify_post(&$a) {
 							$email_text_body_tpl = replace_macros($tpl,array(
 								'$sitename'		=> $a->config['sitename'],				// name of this site
 								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-								'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
-								'$url'			=> $conv['author-link'],				// full url for the site
+								'$thumb'		=> $datarray['author-avatar'],				// thumbnail url for sender icon
+								'$url'			=> $datarray['author-link'],				// full url for the site
 								'$from'			=> $from,						// name of the person sending the message
 								'$body'			=> $msg['textversion'],					// text version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 							));
 
 							// use the EmailNotification library to send the message
@@ -570,7 +570,7 @@ function dfrn_notify_post(&$a) {
 								t("Administrator@") . $a->get_hostname(),
 								t("noreply") . '@' . $a->get_hostname(),
 								$importer['email'],
-								$from . t(" commented on an item at ") . $a->config['sitename'],
+								sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
 								$email_html_body_tpl,
 								$email_text_body_tpl
 							);
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index ef8469523..7d8568188 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -31,6 +31,12 @@ function dfrn_poll_init(&$a) {
 			killme();
 		}
 
+		$r = q("SELECT `hidewall` FROM `profile` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1",
+			dbesc($a->argv[1])
+		);
+		if(count($r) && $r[0]['hidewall'])
+			killme();
+ 
 		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
 		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a, '', $a->argv[1],$last_update);
diff --git a/mod/item.php b/mod/item.php
index 6120b140b..82f33eaeb 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -443,7 +443,7 @@ function item_post(&$a) {
 	else
 		$post_id = 0;
 
-dbg(1);
+
 	$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
 		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
@@ -533,10 +533,10 @@ dbg(1);
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
 					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $author['url'],					// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$url'			=> $author['url'],						// full url for the site
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 			
 				// load the template for private message notifications
@@ -546,10 +546,10 @@ dbg(1);
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
 					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $author['url'],					// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$url'			=> $author['url'],						// profile url for the author
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 
 				// use the EmailNotification library to send the message
@@ -559,7 +559,7 @@ dbg(1);
 					t("Administrator@") . $a->get_hostname(),
 					t("noreply") . '@' . $a->get_hostname(),
 					$user['email'],
-					$from . t(" commented on an item at ") . $a->config['sitename'],
+					sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
 					$email_html_body_tpl,
 					$email_text_body_tpl
 				);
@@ -598,10 +598,10 @@ dbg(1);
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$url'			=> $author['url'],					// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$url'			=> $author['url'],						// full url for the site
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 			
 				// load the template for private message notifications
@@ -610,10 +610,10 @@ dbg(1);
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$url'			=> $author['url'],					// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$url'			=> $author['url'],						// full url for the site
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 
 				// use the EmailNotification library to send the message
@@ -623,7 +623,7 @@ dbg(1);
 					t("Administrator@") . $a->get_hostname(),
 					t("noreply") . '@' . $a->get_hostname(),
 					$user['email'],
-					$from . t(" commented on an item at ") . $a->config['sitename'],
+					sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']),
 					$email_html_body_tpl,
 					$email_text_body_tpl
 				);
diff --git a/mod/profiles.php b/mod/profiles.php
index b64c1294e..f0821a4f8 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -363,7 +363,7 @@ function profiles_content(&$a) {
 
 		$opt_tpl = get_markup_template("profile-hide-wall.tpl");
 		$hide_wall = replace_macros($opt_tpl,array(
-			'$desc' => t('Hide your messages from unknown viewers of this profile?'),
+			'$desc' => t('Hide profile details and all your messages from unknown viewers?'),
 			'$yes_str' => t('Yes'),
 			'$no_str' => t('No'),
 			'$yes_selected' => (($r[0]['hidewall']) ? " checked=\"checked\" " : ""),
diff --git a/util/messages.po b/util/messages.po
index 32d2e7770..19c39b249 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,2273 +6,2318 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.2.988\n"
+"Project-Id-Version: 2.2.991\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-23 12:00+0200\n"
+"POT-Creation-Date: 2011-05-25 17:11-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:213
-msgid "Not Found"
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
 msgstr ""
 
-#: ../../index.php:214
-msgid "Page not found."
+#: ../../mod/crepair.php:42
+msgid "Contact settings applied."
 msgstr ""
 
-#: ../../index.php:269 ../../mod/profperm.php:19 ../../mod/group.php:67
-msgid "Permission denied"
+#: ../../mod/crepair.php:44
+msgid "Contact update failed."
 msgstr ""
 
-#: ../../index.php:270 ../../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:144
-#: ../../mod/profile_photo.php:155 ../../mod/regmod.php:16
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
-#: ../../mod/settings.php:15 ../../mod/settings.php:20
-#: ../../mod/settings.php:251 ../../mod/photos.php:89 ../../mod/photos.php:802
-#: ../../mod/display.php:138 ../../mod/editpost.php:10 ../../mod/invite.php:13
-#: ../../mod/invite.php:54 ../../mod/contacts.php:106
-#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
-#: ../../mod/notifications.php:56 ../../mod/crepair.php:54
-#: ../../mod/notes.php:20 ../../mod/item.php:57 ../../mod/item.php:751
+#: ../../mod/crepair.php:54 ../../mod/wall_attach.php:43
+#: ../../mod/photos.php:89 ../../mod/photos.php:802 ../../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:251
+#: ../../mod/manage.php:75 ../../mod/network.php:6 ../../mod/notes.php:20
+#: ../../mod/attach.php:64 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:21 ../../mod/register.php:27
+#: ../../mod/regmod.php:18 ../../mod/item.php:57 ../../mod/item.php:801
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133
+#: ../../mod/profile_photo.php:144 ../../mod/profile_photo.php:155
 #: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:21
-#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:242
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8
+#: ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:230 ../../mod/invite.php:13 ../../mod/invite.php:54
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:242
+#: ../../index.php:256
 msgid "Permission denied."
 msgstr ""
 
-#: ../../boot.php:385
-msgid "Delete this item?"
+#: ../../mod/crepair.php:68 ../../mod/contacts.php:214
+#: ../../mod/dfrn_confirm.php:114
+msgid "Contact not found."
 msgstr ""
 
-#: ../../boot.php:386 ../../mod/photos.php:1134 ../../mod/photos.php:1173
-#: ../../mod/photos.php:1204 ../../include/conversation.php:380
-msgid "Comment"
+#: ../../mod/crepair.php:74
+msgid "Repair Contact Settings"
 msgstr ""
 
-#: ../../boot.php:834
-msgid "Create a New Account"
+#: ../../mod/crepair.php:76
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact will stop working."
 msgstr ""
 
-#: ../../boot.php:835 ../../mod/register.php:471 ../../include/nav.php:59
-msgid "Register"
+#: ../../mod/crepair.php:77
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: ../../boot.php:841
-msgid "Nickname or Email address: "
+#: ../../mod/crepair.php:85
+msgid "Name"
 msgstr ""
 
-#: ../../boot.php:842
-msgid "Password: "
+#: ../../mod/crepair.php:86
+msgid "Account Nickname"
 msgstr ""
 
-#: ../../boot.php:843 ../../boot.php:849 ../../include/nav.php:44
-msgid "Login"
+#: ../../mod/crepair.php:87
+msgid "Account URL"
 msgstr ""
 
-#: ../../boot.php:847
-msgid "Nickname/Email/OpenID: "
+#: ../../mod/crepair.php:88
+msgid "Friend Request URL"
 msgstr ""
 
-#: ../../boot.php:848
-msgid "Password (if not OpenID): "
+#: ../../mod/crepair.php:89
+msgid "Friend Confirm URL"
 msgstr ""
 
-#: ../../boot.php:851
-msgid "Forgot your password?"
+#: ../../mod/crepair.php:90
+msgid "Notification Endpoint URL"
 msgstr ""
 
-#: ../../boot.php:852 ../../mod/lostpass.php:78
-msgid "Password Reset"
+#: ../../mod/crepair.php:91
+msgid "Poll/Feed URL"
 msgstr ""
 
-#: ../../boot.php:865 ../../include/nav.php:41
-msgid "Logout"
+#: ../../mod/crepair.php:100 ../../mod/photos.php:830 ../../mod/photos.php:887
+#: ../../mod/photos.php:1095 ../../mod/photos.php:1135
+#: ../../mod/photos.php:1174 ../../mod/photos.php:1205
+#: ../../mod/install.php:133 ../../mod/contacts.php:264
+#: ../../mod/settings.php:426 ../../mod/manage.php:106 ../../mod/group.php:76
+#: ../../mod/group.php:159 ../../mod/profiles.php:383 ../../mod/invite.php:68
+#: ../../addon/facebook/facebook.php:289
+#: ../../addon/randplace/randplace.php:179 ../../addon/oembed/oembed.php:49
+#: ../../addon/statusnet/statusnet.php:216
+#: ../../addon/statusnet/statusnet.php:230
+#: ../../addon/statusnet/statusnet.php:256
+#: ../../addon/statusnet/statusnet.php:263
+#: ../../addon/statusnet/statusnet.php:285 ../../addon/twitter/twitter.php:156
+#: ../../addon/twitter/twitter.php:175 ../../include/conversation.php:383
+msgid "Submit"
 msgstr ""
 
-#: ../../boot.php:1113
-msgid "prev"
+#: ../../mod/help.php:27
+msgid "Help:"
 msgstr ""
 
-#: ../../boot.php:1115
-msgid "first"
+#: ../../mod/help.php:31 ../../include/nav.php:64
+msgid "Help"
 msgstr ""
 
-#: ../../boot.php:1144
-msgid "last"
+#: ../../mod/wall_attach.php:57
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../boot.php:1147
-msgid "next"
+#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
+msgid "File upload failed."
 msgstr ""
 
-#: ../../boot.php:2046
-msgid "No contacts"
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:644 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
 msgstr ""
 
-#: ../../boot.php:2054
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
+msgstr ""
+
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
+msgstr ""
+
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
+msgstr ""
+
+#: ../../mod/tagrm.php:93
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
 #, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s welcomes %s"
+msgstr ""
 
-#: ../../boot.php:2059 ../../mod/viewcontacts.php:25
-msgid "View Contacts"
+#: ../../mod/photos.php:34
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../boot.php:2114 ../../mod/search.php:26 ../../include/nav.php:70
-msgid "Search"
+#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:810
+#: ../../mod/photos.php:879 ../../mod/photos.php:894 ../../mod/photos.php:1282
+#: ../../mod/photos.php:1293 ../../include/Photo.php:233
+#: ../../include/Photo.php:240 ../../include/Photo.php:247
+#: ../../include/items.php:1041 ../../include/items.php:1044
+#: ../../include/items.php:1047
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../boot.php:2270 ../../mod/profile.php:11
-msgid "No profile"
+#: ../../mod/photos.php:99
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../boot.php:2329
-msgid "Connect"
+#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:879
+#: ../../mod/photos.php:894 ../../mod/register.php:290
+#: ../../mod/register.php:297 ../../mod/register.php:304
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../boot.php:2344
-msgid "Location:"
+#: ../../mod/photos.php:120
+msgid "Album not found."
 msgstr ""
 
-#: ../../boot.php:2348
-msgid ", "
+#: ../../mod/photos.php:138 ../../mod/photos.php:888
+msgid "Delete Album"
 msgstr ""
 
-#: ../../boot.php:2356 ../../include/profile_advanced.php:23
-msgid "Gender:"
+#: ../../mod/photos.php:201 ../../mod/photos.php:1096
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../boot.php:2360
-msgid "Status:"
+#: ../../mod/photos.php:473
+msgid "was tagged in a"
 msgstr ""
 
-#: ../../boot.php:2362 ../../include/profile_advanced.php:103
-msgid "Homepage:"
+#: ../../mod/photos.php:473 ../../mod/like.php:110
+#: ../../include/conversation.php:20
+msgid "photo"
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Monday"
+#: ../../mod/photos.php:473
+msgid "by"
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Tuesday"
+#: ../../mod/photos.php:563 ../../addon/js_upload/js_upload.php:306
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Wednesday"
+#: ../../mod/photos.php:577 ../../mod/profile_photo.php:118
+#: ../../mod/wall_upload.php:65
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Thursday"
+#: ../../mod/photos.php:597 ../../mod/profile_photo.php:241
+#: ../../mod/wall_upload.php:82
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Friday"
+#: ../../mod/photos.php:680 ../../mod/dfrn_request.php:591
+#: ../../mod/viewcontacts.php:16 ../../mod/display.php:7
+#: ../../mod/search.php:13 ../../mod/directory.php:20
+msgid "Public access denied."
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Saturday"
+#: ../../mod/photos.php:690
+msgid "No photos selected"
 msgstr ""
 
-#: ../../boot.php:2453
-msgid "Sunday"
+#: ../../mod/photos.php:837
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "January"
+#: ../../mod/photos.php:840 ../../mod/photos.php:883
+msgid "New album name: "
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "February"
+#: ../../mod/photos.php:841
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "March"
+#: ../../mod/photos.php:843 ../../mod/photos.php:1091
+msgid "Permissions"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "April"
+#: ../../mod/photos.php:898
+msgid "Edit Album"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "May"
+#: ../../mod/photos.php:908 ../../mod/photos.php:1311
+msgid "View Photo"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "June"
+#: ../../mod/photos.php:937
+msgid "Photo not available"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "July"
+#: ../../mod/photos.php:986
+msgid "Edit photo"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "August"
+#: ../../mod/photos.php:987
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "September"
+#: ../../mod/photos.php:993 ../../include/conversation.php:316
+msgid "Private Message"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "October"
+#: ../../mod/photos.php:1000
+msgid "<< Prev"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "November"
+#: ../../mod/photos.php:1004
+msgid "View Full Size"
 msgstr ""
 
-#: ../../boot.php:2457
-msgid "December"
+#: ../../mod/photos.php:1009
+msgid "Next >>"
 msgstr ""
 
-#: ../../boot.php:2472
-msgid "g A l F d"
+#: ../../mod/photos.php:1071
+msgid "Tags: "
 msgstr ""
 
-#: ../../boot.php:2490
-msgid "Birthday Reminders"
+#: ../../mod/photos.php:1074
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../boot.php:2491
-msgid "Birthdays this week:"
+#: ../../mod/photos.php:1084
+msgid "New album name"
 msgstr ""
 
-#: ../../boot.php:2492
-msgid "(Adjusted for local time)"
+#: ../../mod/photos.php:1087
+msgid "Caption"
 msgstr ""
 
-#: ../../boot.php:2503
-msgid "[today]"
+#: ../../mod/photos.php:1089
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../boot.php:2707
-msgid "link to source"
+#: ../../mod/photos.php:1093
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/photos.php:1113 ../../include/conversation.php:364
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/photos.php:1114 ../../include/conversation.php:365
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+#: ../../mod/photos.php:1115 ../../include/conversation.php:366
+#: ../../include/conversation.php:731
+msgid "Share"
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/photos.php:1116 ../../mod/editpost.php:97
+#: ../../mod/message.php:190 ../../mod/message.php:324
+#: ../../include/conversation.php:367 ../../include/conversation.php:741
+msgid "Please wait"
 msgstr ""
 
-#: ../../mod/manage.php:106 ../../mod/profiles.php:370
-#: ../../mod/settings.php:426 ../../mod/photos.php:830
-#: ../../mod/photos.php:887 ../../mod/photos.php:1095
-#: ../../mod/photos.php:1135 ../../mod/photos.php:1174
-#: ../../mod/photos.php:1205 ../../mod/invite.php:68
-#: ../../mod/contacts.php:264 ../../mod/install.php:133
-#: ../../mod/crepair.php:100 ../../mod/group.php:76 ../../mod/group.php:159
-#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
-#: ../../addon/statusnet/statusnet.php:216
-#: ../../addon/statusnet/statusnet.php:230
-#: ../../addon/statusnet/statusnet.php:256
-#: ../../addon/statusnet/statusnet.php:263
-#: ../../addon/statusnet/statusnet.php:285
-#: ../../addon/facebook/facebook.php:289
-#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:381
-msgid "Submit"
+#: ../../mod/photos.php:1132 ../../mod/photos.php:1171
+#: ../../mod/photos.php:1202 ../../include/conversation.php:380
+msgid "This is you"
 msgstr ""
 
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/photos.php:1134 ../../mod/photos.php:1173
+#: ../../mod/photos.php:1204 ../../include/conversation.php:382
+#: ../../boot.php:386
+msgid "Comment"
 msgstr ""
 
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:577
-msgid "Unable to process image."
+#: ../../mod/photos.php:1232 ../../mod/group.php:146
+#: ../../include/conversation.php:179 ../../include/conversation.php:393
+msgid "Delete"
 msgstr ""
 
-#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/item.php:214
-#: ../../mod/message.php:93
-msgid "Wall Photos"
+#: ../../mod/photos.php:1298
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:241
-#: ../../mod/photos.php:597
-msgid "Image upload failed."
+#: ../../mod/photos.php:1302
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:189 ../../mod/regmod.php:94
-#: ../../mod/register.php:333 ../../mod/register.php:373
-#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40
-#: ../../mod/lostpass.php:102 ../../mod/dfrn_confirm.php:657
-#: ../../include/items.php:1449
-msgid "Administrator"
+#: ../../mod/photos.php:1315
+msgid "View Album"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:191 ../../mod/dfrn_notify.php:396
-#: ../../mod/dfrn_notify.php:439 ../../mod/dfrn_notify.php:523
-#: ../../mod/dfrn_notify.php:564 ../../mod/item.php:471 ../../mod/item.php:514
-#: ../../mod/item.php:534 ../../mod/item.php:575
-msgid "noreply"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:249
-msgid "New mail received at "
+#: ../../mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:438 ../../mod/dfrn_notify.php:563
-#: ../../mod/item.php:513 ../../mod/item.php:574
-msgid "Administrator@"
+#: ../../mod/editpost.php:75 ../../include/conversation.php:717
+msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:441 ../../mod/dfrn_notify.php:566
-#: ../../mod/item.php:516 ../../mod/item.php:577
-msgid " commented on an item at "
+#: ../../mod/editpost.php:88 ../../include/group.php:169
+#: ../../include/conversation.php:391
+msgid "Edit"
 msgstr ""
 
-#: ../../mod/profile.php:112
-msgid "Status"
+#: ../../mod/editpost.php:89 ../../mod/message.php:188
+#: ../../mod/message.php:322 ../../include/conversation.php:732
+msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/profile.php:113 ../../mod/profperm.php:94
-#: ../../include/profile_advanced.php:7
-msgid "Profile"
+#: ../../mod/editpost.php:90 ../../include/conversation.php:733
+msgid "Attach file"
 msgstr ""
 
-#: ../../mod/profile.php:114
-msgid "Photos"
+#: ../../mod/editpost.php:91 ../../mod/message.php:189
+#: ../../mod/message.php:323 ../../include/conversation.php:734
+msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/profile.php:262 ../../mod/display.php:147
-#: ../../mod/register.php:450 ../../mod/network.php:262
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+#: ../../mod/editpost.php:92 ../../include/conversation.php:735
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:340
-msgid "Disallowed profile URL."
+#: ../../mod/editpost.php:93 ../../include/conversation.php:736
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/follow.php:43
-msgid "The profile address specified does not provide adequate information."
+#: ../../mod/editpost.php:94 ../../include/conversation.php:737
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/follow.php:45
-msgid "No compatible communication protocols or feeds were discovered."
+#: ../../mod/editpost.php:95 ../../include/conversation.php:738
+msgid "Set your location"
 msgstr ""
 
-#: ../../mod/follow.php:47
-msgid "An author or name was not found."
+#: ../../mod/editpost.php:96 ../../include/conversation.php:739
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/follow.php:49
-msgid "No browser URL could be matched to this address."
+#: ../../mod/editpost.php:98 ../../include/conversation.php:742
+msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/follow.php:57
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../mod/editpost.php:106 ../../include/conversation.php:750
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/follow.php:112
-msgid "Unable to retrieve contact information."
+#: ../../mod/editpost.php:107 ../../include/conversation.php:751
+msgid "Public post"
 msgstr ""
 
-#: ../../mod/follow.php:158
-msgid "following"
+#: ../../mod/editpost.php:109 ../../include/conversation.php:753
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/dfrn_request.php:96
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245
-#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:879
-#: ../../mod/photos.php:894 ../../mod/register.php:288
-#: ../../mod/register.php:295 ../../mod/register.php:302
-msgid "Profile Photos"
+#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:248
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356
+msgid "Warning: profile location has no identifiable owner name."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:358
+msgid "Warning: profile location has no profile photo."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:361
 #, php-format
-msgid "Image size reduction [%s] failed."
+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:168
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/profile_photo.php:95
-msgid "Unable to process image"
+#: ../../mod/dfrn_request.php:192
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/profile_photo.php:193
-msgid "Upload File:"
+#: ../../mod/dfrn_request.php:220
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/profile_photo.php:194
-msgid "Upload Profile Photo"
+#: ../../mod/dfrn_request.php:245
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/profile_photo.php:195
-msgid "Upload"
+#: ../../mod/dfrn_request.php:246
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/profile_photo.php:196 ../../mod/settings.php:398
-msgid "or"
+#: ../../mod/dfrn_request.php:247
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/profile_photo.php:196
-msgid "skip this step"
+#: ../../mod/dfrn_request.php:277
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/profile_photo.php:196
-msgid "select a photo from your photo albums"
+#: ../../mod/dfrn_request.php:296
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/profile_photo.php:209
-msgid "Crop Image"
+#: ../../mod/dfrn_request.php:309
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/profile_photo.php:210
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/dfrn_request.php:313
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/profile_photo.php:211
-msgid "Done Editing"
+#: ../../mod/dfrn_request.php:334
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/profile_photo.php:239
-msgid "Image uploaded successfully."
+#: ../../mod/dfrn_request.php:340 ../../mod/follow.php:20
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/home.php:23
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/dfrn_request.php:406 ../../mod/contacts.php:90
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/regmod.php:10
-msgid "Please login."
+#: ../../mod/dfrn_request.php:427
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/regmod.php:54
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/dfrn_request.php:481
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/regmod.php:92 ../../mod/register.php:331
+#: ../../mod/dfrn_request.php:495
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:507
 #, php-format
-msgid "Registration details for %s"
+msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/regmod.php:99
-msgid "Account approved."
+#: ../../mod/dfrn_request.php:508
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
-#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/dfrn_request.php:509
+msgid "Confirm"
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/dfrn_request.php:542 ../../include/items.php:1440
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/profiles.php:199
-msgid "Profile updated."
+#: ../../mod/dfrn_request.php:549
+msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/profiles.php:254
-msgid "Profile deleted."
+#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40
+#: ../../mod/lostpass.php:102 ../../mod/register.php:335
+#: ../../mod/register.php:385 ../../mod/regmod.php:98
+#: ../../mod/dfrn_notify.php:191 ../../mod/dfrn_notify.php:443
+#: ../../mod/dfrn_confirm.php:658 ../../include/items.php:1449
+msgid "Administrator"
 msgstr ""
 
-#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
-msgid "Profile-"
+#: ../../mod/dfrn_request.php:630
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
-msgid "New profile created."
+#: ../../mod/dfrn_request.php:631
+msgid ""
+"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, "
+"testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/profiles.php:307
-msgid "Profile unavailable to clone."
+#: ../../mod/dfrn_request.php:632
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/profiles.php:354
-msgid "Hide my contact/friend list from viewers of this profile?"
+#: ../../mod/dfrn_request.php:633
+msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/profiles.php:355 ../../mod/settings.php:350
-#: ../../mod/settings.php:362 ../../mod/register.php:444
-#: ../../mod/dfrn_request.php:634
+#: ../../mod/dfrn_request.php:634 ../../mod/settings.php:350
+#: ../../mod/settings.php:362 ../../mod/register.php:459
+#: ../../mod/profiles.php:358 ../../mod/profiles.php:367
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/profiles.php:356 ../../mod/settings.php:351
-#: ../../mod/settings.php:363 ../../mod/register.php:445
-#: ../../mod/dfrn_request.php:635
+#: ../../mod/dfrn_request.php:635 ../../mod/settings.php:351
+#: ../../mod/settings.php:363 ../../mod/register.php:460
+#: ../../mod/profiles.php:359 ../../mod/profiles.php:368
 msgid "No"
 msgstr ""
 
-#: ../../mod/profiles.php:369
-msgid "Edit Profile Details"
+#: ../../mod/dfrn_request.php:636
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/profiles.php:371
-msgid "View this profile"
+#: ../../mod/dfrn_request.php:637
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
 msgstr ""
 
-#: ../../mod/profiles.php:372
-msgid "Create a new profile using these settings"
+#: ../../mod/dfrn_request.php:638
+msgid "Friendika"
 msgstr ""
 
-#: ../../mod/profiles.php:373
-msgid "Clone this profile"
+#: ../../mod/dfrn_request.php:639
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/profiles.php:374
-msgid "Delete this profile"
+#: ../../mod/dfrn_request.php:640
+msgid "Private (secure) network"
 msgstr ""
 
-#: ../../mod/profiles.php:375
-msgid "Profile Name:"
+#: ../../mod/dfrn_request.php:641
+msgid "Public (insecure) network"
 msgstr ""
 
-#: ../../mod/profiles.php:376
-msgid "Your Full Name:"
+#: ../../mod/dfrn_request.php:642
+msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:377
-msgid "Title/Description:"
+#: ../../mod/dfrn_request.php:643
+msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/profiles.php:378
-msgid "Your Gender:"
+#: ../../mod/install.php:33
+msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../mod/profiles.php:379
-msgid "Birthday (y/m/d):"
+#: ../../mod/install.php:38
+msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/profiles.php:380
-msgid "Street Address:"
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/profiles.php:381
-msgid "Locality/City:"
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
 msgstr ""
 
-#: ../../mod/profiles.php:382
-msgid "Postal/Zip Code:"
+#: ../../mod/install.php:75
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/profiles.php:383
-msgid "Country:"
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/profiles.php:384
-msgid "Region/State:"
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/profiles.php:385
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: ../../mod/install.php:84
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/profiles.php:386
-msgid "Who: (if applicable)"
+#: ../../mod/install.php:85
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/profiles.php:387
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/install.php:98
+msgid "Welcome to Friendika."
 msgstr ""
 
-#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90
-msgid "Sexual Preference:"
+#: ../../mod/install.php:121
+msgid "Friendika Social Network"
 msgstr ""
 
-#: ../../mod/profiles.php:389
-msgid "Homepage URL:"
+#: ../../mod/install.php:122
+msgid "Installation"
 msgstr ""
 
-#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115
-msgid "Political Views:"
+#: ../../mod/install.php:123
+msgid ""
+"In order to install Friendika we need to know how to contact your database."
 msgstr ""
 
-#: ../../mod/profiles.php:391
-msgid "Religious Views:"
+#: ../../mod/install.php:124
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/profiles.php:392
-msgid "Public Keywords:"
+#: ../../mod/install.php:125
+msgid ""
+"The database you specify below must already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/profiles.php:393
-msgid "Private Keywords:"
+#: ../../mod/install.php:126
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/profiles.php:394
-msgid "Example: fishing photography software"
+#: ../../mod/install.php:127
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/profiles.php:395
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: ../../mod/install.php:128
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/profiles.php:396
-msgid "(Used for searching profiles, never shown to others)"
+#: ../../mod/install.php:129
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/profiles.php:397
-msgid "Tell us about yourself..."
+#: ../../mod/install.php:130
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/profiles.php:398
-msgid "Hobbies/Interests"
+#: ../../mod/install.php:148
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/profiles.php:399
-msgid "Contact information and Social Networks"
+#: ../../mod/install.php:149
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
 msgstr ""
 
-#: ../../mod/profiles.php:400
-msgid "Musical interests"
+#: ../../mod/install.php:156
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/profiles.php:401
-msgid "Books, literature"
+#: ../../mod/install.php:157
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/profiles.php:402
-msgid "Television"
+#: ../../mod/install.php:179
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/profiles.php:403
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/install.php:180
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/profiles.php:404
-msgid "Love/romance"
+#: ../../mod/install.php:189
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:405
-msgid "Work/employment"
+#: ../../mod/install.php:191
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:406
-msgid "School/education"
+#: ../../mod/install.php:193
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:411
+#: ../../mod/install.php:195
+msgid "Error: openssl PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:197
+msgid "Error: mysqli PHP module required but not installed."
+msgstr ""
+
+#: ../../mod/install.php:208
 msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/profiles.php:421 ../../mod/directory.php:112
-msgid "Age: "
+#: ../../mod/install.php:209
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/profiles.php:456 ../../include/nav.php:108
-msgid "Profiles"
+#: ../../mod/install.php:210
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
 msgstr ""
 
-#: ../../mod/profiles.php:457
-msgid "Change profile photo"
+#: ../../mod/install.php:211
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:458
-msgid "Create New Profile"
+#: ../../mod/install.php:220
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/profiles.php:468
-msgid "Profile Image"
+#: ../../mod/install.php:235
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/profiles.php:470
-msgid "Visible to everybody"
+#: ../../mod/match.php:10
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/profiles.php:471
-msgid "Edit visibility"
+#: ../../mod/match.php:50
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/settings.php:38
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/settings.php:43
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/settings.php:54
-msgid "Password changed."
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/settings.php:56
-msgid "Password update failed. Please try again."
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/settings.php:138
-msgid " Please use a shorter name."
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/settings.php:140
-msgid " Name too short."
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/settings.php:146
-msgid " Not valid email."
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
 msgstr ""
 
-#: ../../mod/settings.php:148
-msgid " Cannot change to that email."
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/settings.php:206
-msgid "Settings updated."
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/settings.php:256 ../../mod/settings.php:418
-#: ../../addon/widgets/widgets.php:120
-msgid "Plugin Settings"
+#: ../../mod/notifications.php:104
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/settings.php:257 ../../mod/settings.php:417
-msgid "Account Settings"
+#: ../../mod/notifications.php:104
+msgid "yes"
 msgstr ""
 
-#: ../../mod/settings.php:263
-msgid "No Plugin settings configured"
+#: ../../mod/notifications.php:104
+msgid "no"
 msgstr ""
 
-#: ../../mod/settings.php:323
-msgid "Normal Account"
+#: ../../mod/notifications.php:110
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/settings.php:324
-msgid "This account is a normal personal profile"
+#: ../../mod/notifications.php:111
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/settings.php:325
-msgid "Soapbox Account"
+#: ../../mod/notifications.php:112
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/settings.php:326
-msgid "Automatically approve all connection/friend requests as read-only fans"
+#: ../../mod/notifications.php:119
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/settings.php:327
-msgid "Community/Celebrity Account"
+#: ../../mod/notifications.php:120
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/settings.php:328
-msgid "Automatically approve all connection/friend requests as read-write fans"
+#: ../../mod/notifications.php:120
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/settings.php:329
-msgid "Automatic Friend Account"
+#: ../../mod/notifications.php:130 ../../mod/notifications.php:153
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/settings.php:330
-msgid "Automatically approve all connection/friend requests as friends"
+#: ../../mod/notifications.php:139
+msgid "No notifications."
 msgstr ""
 
-#: ../../mod/settings.php:339
-msgid "OpenID: "
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/settings.php:339
-msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
+#: ../../mod/notifications.php:154
+msgid "Deny"
 msgstr ""
 
-#: ../../mod/settings.php:349
-msgid "Publish your default profile in site directory?"
+#: ../../mod/notifications.php:159
+msgid "No registrations."
 msgstr ""
 
-#: ../../mod/settings.php:361
-msgid "Publish your default profile in global social directory?"
+#: ../../mod/contacts.php:12
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../mod/settings.php:377
-msgid "Profile is <strong>not published</strong>."
+#: ../../mod/contacts.php:15
+msgid "Find People With Shared Interests"
 msgstr ""
 
-#: ../../mod/settings.php:403
-msgid "Your Identity Address is"
+#: ../../mod/contacts.php:19
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../mod/settings.php:413
-msgid "Export Personal Data"
+#: ../../mod/contacts.php:20
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../mod/settings.php:419
-msgid "Basic Settings"
+#: ../../mod/contacts.php:21
+msgid "Follow"
 msgstr ""
 
-#: ../../mod/settings.php:420 ../../include/profile_advanced.php:10
-msgid "Full Name:"
+#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/settings.php:421
-msgid "Email Address:"
+#: ../../mod/contacts.php:57
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/settings.php:422
-msgid "Your Timezone:"
+#: ../../mod/contacts.php:88
+msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/settings.php:423
-msgid "Default Post Location:"
+#: ../../mod/contacts.php:146
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/settings.php:424
-msgid "Use Browser Location:"
+#: ../../mod/contacts.php:146
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/settings.php:425
-msgid "Display Theme:"
+#: ../../mod/contacts.php:160
+msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/settings.php:427
-msgid "Security and Privacy Settings"
+#: ../../mod/contacts.php:160
+msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/settings.php:428
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/contacts.php:181
+msgid "stopped following"
 msgstr ""
 
-#: ../../mod/settings.php:429
-msgid "(to prevent spam abuse)"
+#: ../../mod/contacts.php:200
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/settings.php:430
-msgid "Allow friends to post to your profile page:"
+#: ../../mod/contacts.php:228 ../../mod/contacts.php:363
+msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/settings.php:431
-msgid "Automatically expire (delete) posts older than"
+#: ../../mod/contacts.php:232 ../../mod/contacts.php:367
+msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/settings.php:432 ../../include/datetime.php:154
-msgid "days"
+#: ../../mod/contacts.php:237 ../../mod/contacts.php:371
+msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/settings.php:433
-msgid "Notification Settings"
+#: ../../mod/contacts.php:252
+msgid "Privacy Unavailable"
 msgstr ""
 
-#: ../../mod/settings.php:434
-msgid "Send a notification email when:"
+#: ../../mod/contacts.php:253
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/settings.php:435
-msgid "You receive an introduction"
+#: ../../mod/contacts.php:256
+msgid "Never"
 msgstr ""
 
-#: ../../mod/settings.php:436
-msgid "Your introductions are confirmed"
+#: ../../mod/contacts.php:260
+msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/settings.php:437
-msgid "Someone writes on your profile wall"
+#: ../../mod/contacts.php:260
+msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/settings.php:438
-msgid "Someone writes a followup comment"
+#: ../../mod/contacts.php:263
+msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/settings.php:439
-msgid "You receive a private message"
+#: ../../mod/contacts.php:265
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/settings.php:440
-msgid "Password Settings"
+#: ../../mod/contacts.php:266
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/settings.php:441
-msgid "Leave password fields blank unless changing"
+#: ../../mod/contacts.php:267
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/settings.php:442
-msgid "New Password:"
+#: ../../mod/contacts.php:268
+msgid "Online Reputation"
 msgstr ""
 
-#: ../../mod/settings.php:443
-msgid "Confirm:"
+#: ../../mod/contacts.php:269
+msgid ""
+"Occasionally your friends may wish to inquire about this person's online "
+"legitimacy."
 msgstr ""
 
-#: ../../mod/settings.php:444
-msgid "Advanced Page Settings"
+#: ../../mod/contacts.php:270
+msgid ""
+"You may help them choose whether or not to interact with this person by "
+"providing a <em>reputation</em> to guide them."
 msgstr ""
 
-#: ../../mod/settings.php:459
-msgid "Default Post Permissions"
+#: ../../mod/contacts.php:271
+msgid ""
+"Please take a moment to elaborate on this selection if you feel it could be "
+"helpful to others."
 msgstr ""
 
-#: ../../mod/settings.php:460
-msgid "(click to open/close)"
+#: ../../mod/contacts.php:272
+msgid "Visit $name's profile"
 msgstr ""
 
-#: ../../mod/settings.php:473
-msgid "Email/Mailbox Setup"
+#: ../../mod/contacts.php:273
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/settings.php:474
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+#: ../../mod/contacts.php:274
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/settings.php:475
-msgid "IMAP server name:"
+#: ../../mod/contacts.php:275
+msgid "Repair contact URL settings"
 msgstr ""
 
-#: ../../mod/settings.php:477
-msgid "IMAP port:"
+#: ../../mod/contacts.php:276
+msgid "Repair contact URL settings (WARNING: Advanced)"
 msgstr ""
 
-#: ../../mod/settings.php:479
-msgid "Security (TLS or SSL):"
+#: ../../mod/contacts.php:277
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/settings.php:481
-msgid "Email login name:"
+#: ../../mod/contacts.php:278
+msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/settings.php:483
-msgid "Email password:"
+#: ../../mod/contacts.php:280
+msgid "Last updated: "
 msgstr ""
 
-#: ../../mod/settings.php:484
-msgid "Reply-to address (Optional):"
+#: ../../mod/contacts.php:281
+msgid "Update public posts: "
 msgstr ""
 
-#: ../../mod/settings.php:486
-msgid "Send public posts to all email contacts:"
+#: ../../mod/contacts.php:283
+msgid "Update now"
 msgstr ""
 
-#: ../../mod/settings.php:488
-msgid "Email access is disabled on this site."
+#: ../../mod/contacts.php:286
+msgid "Unblock this contact"
 msgstr ""
 
-#: ../../mod/search.php:13 ../../mod/photos.php:680 ../../mod/display.php:7
-#: ../../mod/dfrn_request.php:591 ../../mod/directory.php:20
-#: ../../mod/viewcontacts.php:16
-msgid "Public access denied."
+#: ../../mod/contacts.php:286
+msgid "Block this contact"
 msgstr ""
 
-#: ../../mod/search.php:69
-msgid "No results."
+#: ../../mod/contacts.php:287
+msgid "Unignore this contact"
 msgstr ""
 
-#: ../../mod/photos.php:34
-msgid "Photo Albums"
+#: ../../mod/contacts.php:287
+msgid "Ignore this contact"
 msgstr ""
 
-#: ../../mod/photos.php:38 ../../mod/photos.php:110 ../../mod/photos.php:810
-#: ../../mod/photos.php:879 ../../mod/photos.php:894 ../../mod/photos.php:1282
-#: ../../mod/photos.php:1293 ../../include/Photo.php:233
-#: ../../include/Photo.php:240 ../../include/Photo.php:247
-#: ../../include/items.php:1041 ../../include/items.php:1044
-#: ../../include/items.php:1047
-msgid "Contact Photos"
+#: ../../mod/contacts.php:290
+msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/photos.php:99
-msgid "Contact information unavailable"
+#: ../../mod/contacts.php:291
+msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/photos.php:120
-msgid "Album not found."
+#: ../../mod/contacts.php:322 ../../include/nav.php:109
+#: ../../include/acl_selectors.php:141 ../../include/acl_selectors.php:156
+msgid "Contacts"
 msgstr ""
 
-#: ../../mod/photos.php:138 ../../mod/photos.php:888
-msgid "Delete Album"
+#: ../../mod/contacts.php:324
+msgid "Show Blocked Connections"
 msgstr ""
 
-#: ../../mod/photos.php:201 ../../mod/photos.php:1096
-msgid "Delete Photo"
+#: ../../mod/contacts.php:324
+msgid "Hide Blocked Connections"
 msgstr ""
 
-#: ../../mod/photos.php:473
-msgid "was tagged in a"
+#: ../../mod/contacts.php:326 ../../mod/directory.php:55
+msgid "Finding: "
 msgstr ""
 
-#: ../../mod/photos.php:473 ../../mod/like.php:110
-#: ../../include/conversation.php:20
-msgid "photo"
+#: ../../mod/contacts.php:327 ../../mod/directory.php:57
+msgid "Find"
 msgstr ""
 
-#: ../../mod/photos.php:473
-msgid "by"
+#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:52
+msgid "Visit $username's profile"
 msgstr ""
 
-#: ../../mod/photos.php:563 ../../addon/js_upload/js_upload.php:306
-msgid "Image exceeds size limit of "
+#: ../../mod/contacts.php:388 ../../include/conversation.php:597
+msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/photos.php:690
-msgid "No photos selected"
+#: ../../mod/lostpass.php:27
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/photos.php:837
-msgid "Upload Photos"
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/photos.php:840 ../../mod/photos.php:883
-msgid "New album name: "
+#: ../../mod/lostpass.php:60
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/photos.php:841
-msgid "or existing album name: "
+#: ../../mod/lostpass.php:78 ../../boot.php:852
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/photos.php:843 ../../mod/photos.php:1091
-msgid "Permissions"
+#: ../../mod/lostpass.php:79
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/photos.php:898
-msgid "Edit Album"
+#: ../../mod/lostpass.php:80
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/photos.php:908 ../../mod/photos.php:1311
-msgid "View Photo"
+#: ../../mod/lostpass.php:81
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/photos.php:937
-msgid "Photo not available"
+#: ../../mod/lostpass.php:82
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/photos.php:986
-msgid "Edit photo"
+#: ../../mod/lostpass.php:83
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/photos.php:987
-msgid "Use as profile photo"
+#: ../../mod/lostpass.php:114
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/photos.php:993 ../../include/conversation.php:314
-msgid "Private Message"
+#: ../../mod/lostpass.php:115
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/photos.php:1000
-msgid "<< Prev"
+#: ../../mod/lostpass.php:116
+msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/photos.php:1004
-msgid "View Full Size"
+#: ../../mod/lostpass.php:117
+msgid "Reset"
 msgstr ""
 
-#: ../../mod/photos.php:1009
-msgid "Next >>"
+#: ../../mod/settings.php:38
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/photos.php:1071
-msgid "Tags: "
+#: ../../mod/settings.php:43
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/photos.php:1074
-msgid "[Remove any tag]"
+#: ../../mod/settings.php:54
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/photos.php:1084
-msgid "New album name"
+#: ../../mod/settings.php:56
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/photos.php:1087
-msgid "Caption"
+#: ../../mod/settings.php:138
+msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/photos.php:1089
-msgid "Add a Tag"
+#: ../../mod/settings.php:140
+msgid " Name too short."
 msgstr ""
 
-#: ../../mod/photos.php:1093
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/settings.php:146
+msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/photos.php:1113 ../../include/conversation.php:362
-msgid "I like this (toggle)"
+#: ../../mod/settings.php:148
+msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/photos.php:1114 ../../include/conversation.php:363
-msgid "I don't like this (toggle)"
+#: ../../mod/settings.php:206
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/photos.php:1115 ../../include/conversation.php:364
-#: ../../include/conversation.php:726
-msgid "Share"
+#: ../../mod/settings.php:256 ../../mod/settings.php:418
+#: ../../addon/widgets/widgets.php:123
+msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/photos.php:1116 ../../mod/editpost.php:96
-#: ../../mod/message.php:190 ../../mod/message.php:324
-#: ../../include/conversation.php:365 ../../include/conversation.php:735
-msgid "Please wait"
+#: ../../mod/settings.php:257 ../../mod/settings.php:417
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/photos.php:1132 ../../mod/photos.php:1171
-#: ../../mod/photos.php:1202 ../../include/conversation.php:378
-msgid "This is you"
+#: ../../mod/settings.php:263
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/photos.php:1232 ../../mod/group.php:146
-#: ../../include/conversation.php:179 ../../include/conversation.php:391
-msgid "Delete"
+#: ../../mod/settings.php:323
+msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/photos.php:1298
-msgid "Recent Photos"
+#: ../../mod/settings.php:324
+msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/photos.php:1302
-msgid "Upload New Photos"
+#: ../../mod/settings.php:325
+msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/photos.php:1315
-msgid "View Album"
+#: ../../mod/settings.php:326
+msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/display.php:25 ../../mod/display.php:142 ../../mod/item.php:680
-msgid "Item not found."
+#: ../../mod/settings.php:327
+msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/display.php:135
-msgid "Item has been removed."
+#: ../../mod/settings.php:328
+msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
+#: ../../mod/settings.php:329
+msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
+#: ../../mod/settings.php:330
+msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:712
-msgid "Post to Email"
+#: ../../mod/settings.php:339
+msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:389
-#: ../../include/group.php:169
-msgid "Edit"
+#: ../../mod/settings.php:339
+msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/editpost.php:89 ../../mod/message.php:188
-#: ../../mod/message.php:322 ../../include/conversation.php:727
-msgid "Upload photo"
+#: ../../mod/settings.php:349
+msgid "Publish your default profile in site directory?"
 msgstr ""
 
-#: ../../mod/editpost.php:90 ../../mod/message.php:189
-#: ../../mod/message.php:323 ../../include/conversation.php:728
-msgid "Insert web link"
+#: ../../mod/settings.php:361
+msgid "Publish your default profile in global social directory?"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../include/conversation.php:729
-msgid "Insert YouTube video"
+#: ../../mod/settings.php:377
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:730
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/settings.php:398 ../../mod/profile_photo.php:196
+msgid "or"
 msgstr ""
 
-#: ../../mod/editpost.php:93 ../../include/conversation.php:731
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/settings.php:403
+msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/editpost.php:94 ../../include/conversation.php:732
-msgid "Set your location"
+#: ../../mod/settings.php:413
+msgid "Export Personal Data"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../include/conversation.php:733
-msgid "Clear browser location"
+#: ../../mod/settings.php:419
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:736
-msgid "Permission settings"
+#: ../../mod/settings.php:420 ../../include/profile_advanced.php:10
+msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:744
-msgid "CC: email addresses"
+#: ../../mod/settings.php:421
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:745
-msgid "Public post"
+#: ../../mod/settings.php:422
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:747
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/settings.php:423
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
-msgid "[Embedded content - reload page to view]"
+#: ../../mod/settings.php:424
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/invite.php:28
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/settings.php:425
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/invite.php:32
-#, php-format
-msgid "Please join my network on %s"
+#: ../../mod/settings.php:427
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/invite.php:42
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/settings.php:428
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/invite.php:46
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/settings.php:429
+msgid "(to prevent spam abuse)"
+msgstr ""
 
-#: ../../mod/invite.php:61
-msgid "Send invitations"
+#: ../../mod/settings.php:430
+msgid "Allow friends to post to your profile page:"
 msgstr ""
 
-#: ../../mod/invite.php:62
-msgid "Enter email addresses, one per line:"
+#: ../../mod/settings.php:431
+msgid "Automatically expire (delete) posts older than"
 msgstr ""
 
-#: ../../mod/invite.php:63 ../../mod/message.php:185 ../../mod/message.php:319
-msgid "Your message:"
+#: ../../mod/settings.php:432 ../../include/datetime.php:154
+msgid "days"
 msgstr ""
 
-#: ../../mod/invite.php:64
-#, php-format
-msgid "Please join my social network on %s"
+#: ../../mod/settings.php:433
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/invite.php:65
-msgid "To accept this invitation, please visit:"
+#: ../../mod/settings.php:434
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/invite.php:66
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/settings.php:435
+msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/contacts.php:12
-msgid "Invite Friends"
+#: ../../mod/settings.php:436
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/contacts.php:15
-msgid "Find People With Shared Interests"
+#: ../../mod/settings.php:437
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/contacts.php:19
-msgid "Connect/Follow"
+#: ../../mod/settings.php:438
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/contacts.php:20
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../mod/settings.php:439
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/contacts.php:21
-msgid "Follow"
+#: ../../mod/settings.php:440
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:43 ../../mod/contacts.php:124
-msgid "Could not access contact record."
+#: ../../mod/settings.php:441
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/contacts.php:57
-msgid "Could not locate selected profile."
+#: ../../mod/settings.php:442
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/contacts.php:88
-msgid "Contact updated."
+#: ../../mod/settings.php:443
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:406
-msgid "Failed to update contact record."
+#: ../../mod/settings.php:444
+msgid "Advanced Page Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been blocked"
+#: ../../mod/settings.php:459
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/contacts.php:146
-msgid "Contact has been unblocked"
+#: ../../mod/settings.php:460
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/contacts.php:160
-msgid "Contact has been ignored"
+#: ../../mod/settings.php:473
+msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/contacts.php:160
-msgid "Contact has been unignored"
+#: ../../mod/settings.php:474
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/contacts.php:181
-msgid "stopped following"
+#: ../../mod/settings.php:475
+msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/contacts.php:200
-msgid "Contact has been removed."
+#: ../../mod/settings.php:477
+msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/contacts.php:214 ../../mod/crepair.php:68
-#: ../../mod/dfrn_confirm.php:114
-msgid "Contact not found."
+#: ../../mod/settings.php:479
+msgid "Security (TLS or SSL):"
 msgstr ""
 
-#: ../../mod/contacts.php:228 ../../mod/contacts.php:363
-msgid "Mutual Friendship"
+#: ../../mod/settings.php:481
+msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/contacts.php:232 ../../mod/contacts.php:367
-msgid "is a fan of yours"
+#: ../../mod/settings.php:483
+msgid "Email password:"
 msgstr ""
 
-#: ../../mod/contacts.php:237 ../../mod/contacts.php:371
-msgid "you are a fan of"
+#: ../../mod/settings.php:484
+msgid "Reply-to address (Optional):"
 msgstr ""
 
-#: ../../mod/contacts.php:252
-msgid "Privacy Unavailable"
+#: ../../mod/settings.php:486
+msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/contacts.php:253
-msgid "Private communications are not available for this contact."
+#: ../../mod/settings.php:488
+msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/contacts.php:256
-msgid "Never"
+#: ../../mod/manage.php:37
+#, php-format
+msgid "Welcome back %s"
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "(Update was successful)"
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "(Update was not successful)"
+#: ../../mod/manage.php:90
+msgid ""
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
 msgstr ""
 
-#: ../../mod/contacts.php:263
-msgid "Contact Editor"
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/contacts.php:265
-msgid "Profile Visibility"
+#: ../../mod/network.php:18
+msgid "Normal View"
 msgstr ""
 
-#: ../../mod/contacts.php:266
+#: ../../mod/network.php:20
+msgid "New Item View"
+msgstr ""
+
+#: ../../mod/network.php:64
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+msgid "Warning: This group contains %s member from an insecure network."
+msgid_plural ""
+"Warning: This group contains %s members from an insecure network."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/network.php:67
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "Contact Information / Notes"
+#: ../../mod/network.php:129
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/contacts.php:268
-msgid "Online Reputation"
+#: ../../mod/network.php:140
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/contacts.php:269
-msgid ""
-"Occasionally your friends may wish to inquire about this person's online "
-"legitimacy."
+#: ../../mod/network.php:144
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/contacts.php:270
-msgid ""
-"You may help them choose whether or not to interact with this person by "
-"providing a <em>reputation</em> to guide them."
+#: ../../mod/network.php:154
+msgid "Contact: "
 msgstr ""
 
-#: ../../mod/contacts.php:271
-msgid ""
-"Please take a moment to elaborate on this selection if you feel it could be "
-"helpful to others."
+#: ../../mod/network.php:156
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/contacts.php:272
-msgid "Visit $name's profile"
+#: ../../mod/network.php:161
+msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/contacts.php:273
-msgid "Block/Unblock contact"
+#: ../../mod/network.php:262 ../../mod/register.php:465
+#: ../../mod/profile.php:265 ../../mod/display.php:147
+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/contacts.php:274
-msgid "Ignore contact"
+#: ../../mod/notes.php:41 ../../mod/apps.php:8
+msgid "Private Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:275
-msgid "Repair contact URL settings"
+#: ../../mod/notes.php:60
+msgid "Save"
 msgstr ""
 
-#: ../../mod/contacts.php:276
-msgid "Repair contact URL settings (WARNING: Advanced)"
+#: ../../mod/attach.php:6
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/contacts.php:277
-msgid "View conversations"
+#: ../../mod/attach.php:16
+msgid "Item was not found."
 msgstr ""
 
-#: ../../mod/contacts.php:278
-msgid "Delete contact"
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/contacts.php:280
-msgid "Last updated: "
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/contacts.php:281
-msgid "Update public posts: "
+#: ../../mod/group.php:43 ../../mod/group.php:115
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/contacts.php:283
-msgid "Update now"
+#: ../../mod/group.php:56
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/contacts.php:286
-msgid "Unblock this contact"
+#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:255
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/contacts.php:286
-msgid "Block this contact"
+#: ../../mod/group.php:74
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/contacts.php:287
-msgid "Unignore this contact"
+#: ../../mod/group.php:75 ../../mod/group.php:158
+msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/contacts.php:287
-msgid "Ignore this contact"
+#: ../../mod/group.php:90
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/contacts.php:290
-msgid "Currently blocked"
+#: ../../mod/group.php:92
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/contacts.php:291
-msgid "Currently ignored"
+#: ../../mod/group.php:156 ../../mod/profperm.php:96
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/contacts.php:322 ../../include/acl_selectors.php:141
-#: ../../include/acl_selectors.php:156 ../../include/nav.php:109
-msgid "Contacts"
+#: ../../mod/group.php:157
+msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:324
-msgid "Show Blocked Connections"
+#: ../../mod/group.php:172
+msgid "Members"
 msgstr ""
 
-#: ../../mod/contacts.php:324
-msgid "Hide Blocked Connections"
+#: ../../mod/group.php:186
+msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:326 ../../mod/directory.php:55
-msgid "Finding: "
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:46
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/contacts.php:327 ../../mod/directory.php:57
-msgid "Find"
+#: ../../mod/profperm.php:92
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:52
-msgid "Visit $username's profile"
+#: ../../mod/profperm.php:94 ../../mod/profile.php:116
+#: ../../include/profile_advanced.php:7
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/contacts.php:388 ../../include/conversation.php:592
-msgid "Edit contact"
+#: ../../mod/profperm.php:105
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/profperm.php:116
+msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/viewcontacts.php:25 ../../boot.php:2059
+msgid "View Contacts"
+msgstr ""
+
+#: ../../mod/viewcontacts.php:40
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/register.php:47
+#: ../../mod/register.php:49
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/register.php:74
+#: ../../mod/register.php:76
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:76
+#: ../../mod/register.php:78
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:91
+#: ../../mod/register.php:93
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:95
+#: ../../mod/register.php:97
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:98
+#: ../../mod/register.php:100
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:109
+#: ../../mod/register.php:111
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:115 ../../mod/register.php:215
+#: ../../mod/register.php:117 ../../mod/register.php:217
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:134
+#: ../../mod/register.php:136
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:201
+#: ../../mod/register.php:203
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:237
+#: ../../mod/register.php:239
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:339
+#: ../../mod/register.php:333 ../../mod/regmod.php:96
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../mod/register.php:341
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:343
+#: ../../mod/register.php:345
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:348
+#: ../../mod/register.php:350
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:371
+#: ../../mod/register.php:383
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:377
+#: ../../mod/register.php:392
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:425
+#: ../../mod/register.php:440
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:426
+#: ../../mod/register.php:441
 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:427
+#: ../../mod/register.php:442
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:441
+#: ../../mod/register.php:456
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:457
+#: ../../mod/register.php:472
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:465
+#: ../../mod/register.php:480
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:466
+#: ../../mod/register.php:481
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:467
+#: ../../mod/register.php:482
 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:468
+#: ../../mod/register.php:483
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
-msgstr ""
-
-#: ../../mod/help.php:27
-msgid "Help:"
+#: ../../mod/register.php:486 ../../include/nav.php:59 ../../boot.php:835
+msgid "Register"
 msgstr ""
 
-#: ../../mod/help.php:31 ../../include/nav.php:64
-msgid "Help"
+#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:759
+#: ../../include/conversation.php:20
+msgid "status"
 msgstr ""
 
-#: ../../mod/install.php:33
-msgid "Could not create/connect to database."
+#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:763
+#: ../../include/conversation.php:25
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/install.php:38
-msgid "Connected to database."
+#: ../../mod/like.php:129 ../../include/conversation.php:28
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/install.php:72
-msgid "Proceed with Installation"
+#: ../../mod/friendika.php:43
+msgid "This is Friendika version"
 msgstr ""
 
-#: ../../mod/install.php:74
-msgid "Your Friendika site database has been installed."
+#: ../../mod/friendika.php:44
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/install.php:75
+#: ../../mod/friendika.php:46
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
-#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:199
-msgid "Please see the file \"INSTALL.txt\"."
+"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/install.php:78
-msgid "Proceed to registration"
+#: ../../mod/friendika.php:48
+msgid ""
+"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
+"a> to learn more about the Friendika project."
 msgstr ""
 
-#: ../../mod/install.php:84
-msgid "Database import failed."
+#: ../../mod/friendika.php:50
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/install.php:85
+#: ../../mod/friendika.php:51
 msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
+"dot com"
 msgstr ""
 
-#: ../../mod/install.php:98
-msgid "Welcome to Friendika."
+#: ../../mod/friendika.php:56
+msgid "Installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/install.php:121
-msgid "Friendika Social Network"
+#: ../../mod/friendika.php:64
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/install.php:122
-msgid "Installation"
+#: ../../mod/regmod.php:12
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/install.php:123
-msgid ""
-"In order to install Friendika we need to know how to contact your database."
+#: ../../mod/regmod.php:56
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/install.php:124
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/regmod.php:105
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/install.php:125
-msgid ""
-"The database you specify below must already exist. If it does not, please "
-"create it before continuing."
+#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
+msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/install.php:126
-msgid "Database Server Name"
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/install.php:127
-msgid "Database Login Name"
+#: ../../mod/item.php:128
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/install.php:128
-msgid "Database Login Password"
+#: ../../mod/item.php:214 ../../mod/message.php:93
+#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:95
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/install.php:129
-msgid "Database Name"
+#: ../../mod/item.php:517 ../../mod/item.php:560 ../../mod/item.php:583
+#: ../../mod/item.php:624 ../../mod/dfrn_notify.php:193
+#: ../../mod/dfrn_notify.php:401 ../../mod/dfrn_notify.php:444
+#: ../../mod/dfrn_notify.php:530 ../../mod/dfrn_notify.php:571
+msgid "noreply"
 msgstr ""
 
-#: ../../mod/install.php:130
-msgid "Please select a default timezone for your website"
+#: ../../mod/item.php:559 ../../mod/item.php:623 ../../mod/dfrn_notify.php:570
+msgid "Administrator@"
 msgstr ""
 
-#: ../../mod/install.php:148
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/item.php:562 ../../mod/item.php:626 ../../mod/dfrn_notify.php:573
+msgid " commented on an item at "
 msgstr ""
 
-#: ../../mod/install.php:149
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
+#: ../../mod/item.php:655
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/install.php:156
+#: ../../mod/item.php:674
+#, php-format
 msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+"This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/install.php:157
-msgid "This is required for message delivery to work."
+#: ../../mod/item.php:676
+#, php-format
+msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/install.php:179
+#: ../../mod/item.php:677
 msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/install.php:180
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/item.php:679
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/install.php:189
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/item.php:730 ../../mod/display.php:25 ../../mod/display.php:142
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/install.php:191
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/install.php:193
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:248
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/install.php:195
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/install.php:197
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/install.php:208
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../mod/profile_photo.php:193
+msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/install.php:209
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../mod/profile_photo.php:194
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/install.php:210
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+#: ../../mod/profile_photo.php:195
+msgid "Upload"
 msgstr ""
 
-#: ../../mod/install.php:211
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+#: ../../mod/profile_photo.php:196
+msgid "skip this step"
 msgstr ""
 
-#: ../../mod/install.php:220
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
+#: ../../mod/profile_photo.php:196
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/install.php:235
-msgid "Errors encountered creating database tables."
+#: ../../mod/profile_photo.php:209
+msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/network.php:18
-msgid "Normal View"
+#: ../../mod/profile_photo.php:210
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/network.php:20
-msgid "New Item View"
+#: ../../mod/profile_photo.php:211
+msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/network.php:64
-#, php-format
-msgid "Warning: This group contains %s member from an insecure network."
-msgid_plural ""
-"Warning: This group contains %s members from an insecure network."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/network.php:67
-msgid "Private messages to this group are at risk of public disclosure."
+#: ../../mod/profile_photo.php:239
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/network.php:129
-msgid "No such group"
+#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/network.php:140
-msgid "Group is empty"
+#: ../../mod/removeme.php:43
+msgid ""
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: ../../mod/network.php:144
-msgid "Group: "
+#: ../../mod/removeme.php:44
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/network.php:154
-msgid "Contact: "
+#: ../../mod/message.php:18
+msgid "No recipient selected."
 msgstr ""
 
-#: ../../mod/network.php:156
-msgid "Private messages to this person are at risk of public disclosure."
+#: ../../mod/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../mod/network.php:161
-msgid "Invalid contact."
+#: ../../mod/message.php:34
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:46
-msgid "Invalid profile identifier."
+#: ../../mod/message.php:102
+msgid "Message sent."
 msgstr ""
 
-#: ../../mod/profperm.php:92
-msgid "Profile Visibility Editor"
+#: ../../mod/message.php:105
+msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/profperm.php:96 ../../mod/group.php:156
-msgid "Click on a contact to add or remove."
+#: ../../mod/message.php:125 ../../include/nav.php:101
+msgid "Messages"
 msgstr ""
 
-#: ../../mod/profperm.php:105
-msgid "Visible To"
+#: ../../mod/message.php:126
+msgid "Inbox"
 msgstr ""
 
-#: ../../mod/profperm.php:116
-msgid "All Contacts (with secure profile access)"
+#: ../../mod/message.php:127
+msgid "Outbox"
 msgstr ""
 
-#: ../../mod/notifications.php:28
-msgid "Invalid request identifier."
+#: ../../mod/message.php:128
+msgid "New Message"
 msgstr ""
 
-#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
-msgid "Discard"
+#: ../../mod/message.php:142
+msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
-msgid "Ignore"
+#: ../../mod/message.php:158
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/notifications.php:68
-msgid "Pending Friend/Connect Notifications"
+#: ../../mod/message.php:172 ../../include/conversation.php:684
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Show Ignored Requests"
+#: ../../mod/message.php:180
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Hide Ignored Requests"
+#: ../../mod/message.php:181 ../../mod/message.php:315
+msgid "To:"
 msgstr ""
 
-#: ../../mod/notifications.php:104
-msgid "Claims to be known to you: "
+#: ../../mod/message.php:182 ../../mod/message.php:316
+msgid "Subject:"
 msgstr ""
 
-#: ../../mod/notifications.php:104
-msgid "yes"
+#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:63
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/notifications.php:104
-msgid "no"
+#: ../../mod/message.php:224
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/notifications.php:110
-msgid "Approve as: "
+#: ../../mod/message.php:237
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/notifications.php:111
-msgid "Friend"
+#: ../../mod/message.php:240
+msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/notifications.php:112
-msgid "Fan/Admirer"
+#: ../../mod/message.php:267
+msgid "Message not available."
 msgstr ""
 
-#: ../../mod/notifications.php:119
-msgid "Notification type: "
+#: ../../mod/message.php:304
+msgid "Delete message"
 msgstr ""
 
-#: ../../mod/notifications.php:120
-msgid "Friend/Connect Request"
+#: ../../mod/message.php:314
+msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/notifications.php:120
-msgid "New Follower"
+#: ../../mod/profile.php:11 ../../boot.php:2270
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/notifications.php:130 ../../mod/notifications.php:153
-msgid "Approve"
+#: ../../mod/profile.php:59
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/notifications.php:139
-msgid "No notifications."
+#: ../../mod/profile.php:115
+msgid "Status"
 msgstr ""
 
-#: ../../mod/notifications.php:143
-msgid "User registrations waiting for confirm"
+#: ../../mod/profile.php:117
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/notifications.php:154
-msgid "Deny"
+#: ../../mod/openid.php:62 ../../mod/openid.php:122 ../../include/auth.php:114
+#: ../../include/auth.php:139 ../../include/auth.php:192
+msgid "Login failed."
 msgstr ""
 
-#: ../../mod/notifications.php:159
-msgid "No registrations."
+#: ../../mod/openid.php:78 ../../include/auth.php:208
+msgid "Welcome "
 msgstr ""
 
-#: ../../mod/crepair.php:42
-msgid "Contact settings applied."
+#: ../../mod/openid.php:79 ../../include/auth.php:209
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: ../../mod/crepair.php:44
-msgid "Contact update failed."
+#: ../../mod/openid.php:82 ../../include/auth.php:212
+msgid "Welcome back "
 msgstr ""
 
-#: ../../mod/crepair.php:74
-msgid "Repair Contact Settings"
+#: ../../mod/follow.php:43
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/crepair.php:76
-msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact will stop working."
+#: ../../mod/follow.php:45
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../mod/crepair.php:77
-msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
+#: ../../mod/follow.php:47
+msgid "An author or name was not found."
 msgstr ""
 
-#: ../../mod/crepair.php:85
-msgid "Name"
+#: ../../mod/follow.php:49
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../mod/crepair.php:86
-msgid "Account Nickname"
+#: ../../mod/follow.php:57
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/crepair.php:87
-msgid "Account URL"
+#: ../../mod/follow.php:112
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/crepair.php:88
-msgid "Friend Request URL"
+#: ../../mod/follow.php:158
+msgid "following"
 msgstr ""
 
-#: ../../mod/crepair.php:89
-msgid "Friend Confirm URL"
+#: ../../mod/display.php:135
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/crepair.php:90
-msgid "Notification Endpoint URL"
+#: ../../mod/dfrn_notify.php:251
+msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/crepair.php:91
-msgid "Poll/Feed URL"
+#: ../../mod/dfrn_notify.php:446
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:96
-msgid "This introduction has already been accepted."
+#: ../../mod/apps.php:6
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351
-msgid "Profile location is not valid or does not contain profile information."
+#: ../../mod/search.php:26 ../../include/nav.php:70 ../../boot.php:2114
+msgid "Search"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356
-msgid "Warning: profile location has no identifiable owner name."
+#: ../../mod/search.php:69
+msgid "No results."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:358
-msgid "Warning: profile location has no profile photo."
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:240
+#: ../../mod/profiles.php:345 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:361
-#, 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:168
-msgid "Introduction complete."
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:192
-msgid "Unrecoverable protocol error."
+#: ../../mod/profiles.php:202
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:220
-msgid "Profile unavailable."
+#: ../../mod/profiles.php:257
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:245
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../mod/profiles.php:273 ../../mod/profiles.php:304
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:246
-msgid "Spam protection measures have been invoked."
+#: ../../mod/profiles.php:292 ../../mod/profiles.php:331
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:247
-msgid "Friends are advised to please try again in 24 hours."
+#: ../../mod/profiles.php:310
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:277
-msgid "Invalid locator"
+#: ../../mod/profiles.php:357
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:296
-msgid "Unable to resolve your name at the provided location."
+#: ../../mod/profiles.php:366
+msgid "Hide profile details and all your messages from unknown viewers?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
-msgid "You have already introduced yourself here."
+#: ../../mod/profiles.php:382
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:313
-#, php-format
-msgid "Apparently you are already friends with %s."
+#: ../../mod/profiles.php:384
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:334
-msgid "Invalid profile URL."
+#: ../../mod/profiles.php:385
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:427
-msgid "Your introduction has been sent."
+#: ../../mod/profiles.php:386
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:481
-msgid "Please login to confirm introduction."
+#: ../../mod/profiles.php:387
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:495
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+#: ../../mod/profiles.php:388
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:507
-#, php-format
-msgid "Welcome home %s."
+#: ../../mod/profiles.php:389
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:508
-#, php-format
-msgid "Please confirm your introduction/connection request to %s."
+#: ../../mod/profiles.php:390
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:509
-msgid "Confirm"
+#: ../../mod/profiles.php:391
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:542 ../../include/items.php:1440
-msgid "[Name Withheld]"
+#: ../../mod/profiles.php:392
+msgid "Birthday (y/m/d):"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:549
-msgid "Introduction received at "
+#: ../../mod/profiles.php:393
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:630
-msgid "Friend/Connection Request"
+#: ../../mod/profiles.php:394
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:631
-msgid ""
-"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, "
-"testuser@identi.ca"
+#: ../../mod/profiles.php:395
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:632
-msgid "Please answer the following:"
+#: ../../mod/profiles.php:396
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:633
-msgid "Does $name know you?"
+#: ../../mod/profiles.php:397
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:636
-msgid "Add a personal note:"
+#: ../../mod/profiles.php:398
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:637
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
+#: ../../mod/profiles.php:399
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:638
-msgid "Friendika"
+#: ../../mod/profiles.php:400
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:639
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/profiles.php:401 ../../include/profile_advanced.php:90
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:640
-msgid "Private (secure) network"
+#: ../../mod/profiles.php:402
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:641
-msgid "Public (insecure) network"
+#: ../../mod/profiles.php:403 ../../include/profile_advanced.php:115
+msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:642
-msgid "Your Identity Address:"
+#: ../../mod/profiles.php:404
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:643
-msgid "Submit Request"
+#: ../../mod/profiles.php:405
+msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:644 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
-msgid "Cancel"
+#: ../../mod/profiles.php:406
+msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:759
-#: ../../include/conversation.php:20
-msgid "status"
+#: ../../mod/profiles.php:407
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:763
-#: ../../include/conversation.php:25
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../mod/profiles.php:408
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/like.php:129 ../../include/conversation.php:28
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../mod/profiles.php:409
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/lostpass.php:27
-msgid "Password reset request issued. Check your email."
+#: ../../mod/profiles.php:410
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/lostpass.php:38
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/profiles.php:411
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/lostpass.php:60
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../mod/profiles.php:412
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/lostpass.php:79
-msgid "Your password has been reset as requested."
+#: ../../mod/profiles.php:413
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/lostpass.php:80
-msgid "Your new password is"
+#: ../../mod/profiles.php:414
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/lostpass.php:81
-msgid "Save or copy your new password - and then"
+#: ../../mod/profiles.php:415
+msgid "Television"
 msgstr ""
 
-#: ../../mod/lostpass.php:82
-msgid "click here to login"
+#: ../../mod/profiles.php:416
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/lostpass.php:83
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+#: ../../mod/profiles.php:417
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/lostpass.php:114
-msgid "Forgot your Password?"
+#: ../../mod/profiles.php:418
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/lostpass.php:115
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../mod/profiles.php:419
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/lostpass.php:116
-msgid "Nickname or Email: "
+#: ../../mod/profiles.php:424
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/lostpass.php:117
-msgid "Reset"
+#: ../../mod/profiles.php:435 ../../mod/directory.php:112
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/profiles.php:470 ../../include/nav.php:108
+msgid "Profiles"
 msgstr ""
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/profiles.php:471
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../mod/profiles.php:472
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/apps.php:6
-msgid "Applications"
+#: ../../mod/profiles.php:482
+msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/apps.php:8 ../../mod/notes.php:41
-msgid "Private Notes"
+#: ../../mod/profiles.php:484
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../mod/notes.php:60
-msgid "Save"
+#: ../../mod/profiles.php:485
+msgid "Edit visibility"
 msgstr ""
 
 #: ../../mod/directory.php:40
@@ -2299,177 +2344,48 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/friendika.php:43
-msgid "This is Friendika version"
-msgstr ""
-
-#: ../../mod/friendika.php:44
-msgid "running at web location"
-msgstr ""
-
-#: ../../mod/friendika.php:46
-msgid ""
-"Shared content within the Friendika network is provided under the <a href="
-"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
-"3.0 license</a>"
-msgstr ""
-
-#: ../../mod/friendika.php:48
-msgid ""
-"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
-"a> to learn more about the Friendika project."
-msgstr ""
-
-#: ../../mod/friendika.php:50
-msgid "Bug reports and issues: please visit"
-msgstr ""
-
-#: ../../mod/friendika.php:51
-msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
-"dot com"
-msgstr ""
-
-#: ../../mod/friendika.php:56
-msgid "Installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/friendika.php:64
-msgid "No installed plugins/addons/apps"
-msgstr ""
-
-#: ../../mod/item.php:37
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../mod/item.php:128
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../mod/item.php:605
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../mod/item.php:624
+#: ../../mod/invite.php:28
 #, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendika social network."
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../mod/item.php:626
+#: ../../mod/invite.php:32
 #, php-format
-msgid "You may visit them online at %s"
-msgstr ""
-
-#: ../../mod/item.php:627
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../mod/item.php:629
+#: ../../mod/invite.php:42
 #, php-format
-msgid "%s posted an update."
-msgstr ""
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/message.php:18
-msgid "No recipient selected."
-msgstr ""
-
-#: ../../mod/message.php:23
-msgid "[no subject]"
-msgstr ""
-
-#: ../../mod/message.php:34
-msgid "Unable to locate contact information."
-msgstr ""
-
-#: ../../mod/message.php:102
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/message.php:105
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:125 ../../include/nav.php:101
-msgid "Messages"
-msgstr ""
-
-#: ../../mod/message.php:126
-msgid "Inbox"
-msgstr ""
-
-#: ../../mod/message.php:127
-msgid "Outbox"
-msgstr ""
-
-#: ../../mod/message.php:128
-msgid "New Message"
-msgstr ""
-
-#: ../../mod/message.php:142
-msgid "Message deleted."
-msgstr ""
-
-#: ../../mod/message.php:158
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../mod/message.php:172 ../../include/conversation.php:679
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:180
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:181 ../../mod/message.php:315
-msgid "To:"
-msgstr ""
-
-#: ../../mod/message.php:182 ../../mod/message.php:316
-msgid "Subject:"
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../mod/message.php:224
-msgid "No messages."
-msgstr ""
+#: ../../mod/invite.php:46
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/message.php:237
-msgid "Delete conversation"
+#: ../../mod/invite.php:61
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/message.php:240
-msgid "D, d M Y - g:i A"
+#: ../../mod/invite.php:62
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/message.php:267
-msgid "Message not available."
+#: ../../mod/invite.php:64
+#, php-format
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/message.php:304
-msgid "Delete message"
+#: ../../mod/invite.php:65
+msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/message.php:314
-msgid "Send Reply"
+#: ../../mod/invite.php:66
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:231
@@ -2537,136 +2453,190 @@ msgstr ""
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:655
+#: ../../mod/dfrn_confirm.php:656
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:118 ../../include/auth.php:114
-#: ../../include/auth.php:139 ../../include/auth.php:192
-msgid "Login failed."
+#: ../../addon/facebook/facebook.php:248
+msgid "Facebook disabled"
 msgstr ""
 
-#: ../../mod/openid.php:78 ../../include/auth.php:208
-msgid "Welcome "
+#: ../../addon/facebook/facebook.php:253
+msgid "Updating contacts"
 msgstr ""
 
-#: ../../mod/openid.php:79 ../../include/auth.php:209
-msgid "Please upload a profile photo."
+#: ../../addon/facebook/facebook.php:262
+msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../mod/openid.php:82 ../../include/auth.php:212
-msgid "Welcome back "
+#: ../../addon/facebook/facebook.php:269
+msgid "Facebook Connect"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:84 ../../mod/dfrn_poll.php:510
-#, php-format
-msgid "%s welcomes %s"
+#: ../../addon/facebook/facebook.php:275
+msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:40
-msgid "No contacts."
+#: ../../addon/facebook/facebook.php:282
+msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../addon/facebook/facebook.php:288
+msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../addon/facebook/facebook.php:350
+msgid "Facebook"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:115
-msgid "Group not found."
+#: ../../addon/facebook/facebook.php:351
+msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../addon/facebook/facebook.php:365
+msgid "Post to Facebook"
 msgstr ""
 
-#: ../../mod/group.php:74
-msgid "Create a group of contacts/friends."
+#: ../../addon/facebook/facebook.php:434
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
 msgstr ""
 
-#: ../../mod/group.php:75 ../../mod/group.php:158
-msgid "Group Name: "
+#: ../../addon/facebook/facebook.php:500
+msgid "Image: "
 msgstr ""
 
-#: ../../mod/group.php:90
-msgid "Group removed."
+#: ../../addon/facebook/facebook.php:561
+msgid "View on Friendika"
 msgstr ""
 
-#: ../../mod/group.php:92
-msgid "Unable to remove group."
+#: ../../addon/widgets/widgets.php:41
+msgid "Widgets key: "
 msgstr ""
 
-#: ../../mod/group.php:157
-msgid "Group Editor"
+#: ../../addon/widgets/widgets.php:45
+msgid "Generate new key"
 msgstr ""
 
-#: ../../mod/group.php:172
-msgid "Members"
+#: ../../addon/widgets/widget_friends.php:30
+msgid "Connect on Friendika!"
 msgstr ""
 
-#: ../../mod/group.php:186
-msgid "All Contacts"
+#: ../../addon/tictac/tictac.php:14
+msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: ../../mod/match.php:10
-msgid "Profile Match"
+#: ../../addon/tictac/tictac.php:47
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../mod/match.php:50
-msgid "No matches"
+#: ../../addon/tictac/tictac.php:52
+msgid "New game"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:64
-msgid "Post to Twitter"
+#: ../../addon/tictac/tictac.php:53
+msgid "New game with handicap"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:122
-msgid "Twitter Posting Settings"
+#: ../../addon/tictac/tictac.php:54
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:129
+#: ../../addon/tictac/tictac.php:55
 msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/tictac/tictac.php:57
 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."
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:149
-msgid "Log in with Twitter"
+#: ../../addon/tictac/tictac.php:176
+msgid "You go first..."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:151
-msgid "Copy the PIN from Twitter here"
+#: ../../addon/tictac/tictac.php:181
+msgid "I'm going first this time..."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:271
-msgid "Currently connected to: "
+#: ../../addon/tictac/tictac.php:187
+msgid "You won!"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:166
+#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
+msgid "\"Cat\" game!"
+msgstr ""
+
+#: ../../addon/tictac/tictac.php:216
+msgid "I won!"
+msgstr ""
+
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
+msgstr ""
+
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:33
+msgid "Select files to upload: "
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:35
 msgid ""
-"If enabled all your <strong>public</strong> postings will be posted to the "
-"associated Twitter account as well."
+"Use the following controls only if the Java uploader [above] fails to launch."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
-msgid "Send public postings to Twitter"
+#: ../../addon/js_upload/js_upload.php:39
+msgid "Upload a file"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:282
-msgid "Clear OAuth configuration"
+#: ../../addon/js_upload/js_upload.php:40
+msgid "Drop files here to upload"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:42
+msgid "Failed"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:288
+msgid "No files were uploaded."
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:294
+msgid "Uploaded file is empty"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:299
+msgid "Uploaded file is too large"
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:317
+msgid "File has an invalid extension, it should be one of "
+msgstr ""
+
+#: ../../addon/js_upload/js_upload.php:328
+msgid "Upload was cancelled, or server error encountered"
+msgstr ""
+
+#: ../../addon/oembed/oembed.php:29
+msgid "OEmbed settings updated"
+msgstr ""
+
+#: ../../addon/oembed/oembed.php:42
+msgid "Use OEmbed for YouTube videos: "
+msgstr ""
+
+#: ../../addon/oembed/oembed.php:76
+msgid "URL to embed:"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:78
@@ -2755,6 +2725,10 @@ msgstr ""
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
+#: ../../addon/statusnet/statusnet.php:271 ../../addon/twitter/twitter.php:165
+msgid "Currently connected to: "
+msgstr ""
+
 #: ../../addon/statusnet/statusnet.php:272
 msgid ""
 "If enabled all your <strong>public</strong> postings will be posted to the "
@@ -2769,177 +2743,121 @@ msgstr ""
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:14
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:47
-msgid "3D Tic-Tac-Toe"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:52
-msgid "New game"
+#: ../../addon/statusnet/statusnet.php:282 ../../addon/twitter/twitter.php:172
+msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:53
-msgid "New game with handicap"
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:54
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:55
+#: ../../addon/twitter/twitter.php:129
 msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:57
+#: ../../addon/twitter/twitter.php:148
 msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:176
-msgid "You go first..."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:181
-msgid "I'm going first this time..."
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:187
-msgid "You won!"
-msgstr ""
-
-#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218
-msgid "\"Cat\" game!"
+"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/tictac/tictac.php:216
-msgid "I won!"
+#: ../../addon/twitter/twitter.php:149
+msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:33
-msgid "Select files to upload: "
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:35
+#: ../../addon/twitter/twitter.php:166
 msgid ""
-"Use the following controls only if the Java uploader [above] fails to launch."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:248
-msgid "Facebook disabled"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:253
-msgid "Updating contacts"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:262
-msgid "Facebook API key is missing."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:269
-msgid "Facebook Connect"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:275
-msgid "Install Facebook connector for this account."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:282
-msgid "Remove Facebook connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:288
-msgid "Post to Facebook by default"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:350
-msgid "Facebook"
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated Twitter account as well."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:351
-msgid "Facebook Connector Settings"
+#: ../../addon/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:365
-msgid "Post to Facebook"
+#: ../../include/profile_advanced.php:23 ../../boot.php:2356
+msgid "Gender:"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:434
-msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1086
+msgid "Birthday:"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:500
-msgid "Image: "
+#: ../../include/profile_advanced.php:45
+msgid "j F, Y"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:561
-msgid "View on Friendika"
+#: ../../include/profile_advanced.php:46
+msgid "j F"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:38
-msgid "Widgets key: "
+#: ../../include/profile_advanced.php:59
+msgid "Age:"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:42
-msgid "Generate new key"
+#: ../../include/profile_advanced.php:70
+msgid "<span class=\"heart\">&hearts;</span> Status:"
 msgstr ""
 
-#: ../../addon/widgets/widget_friends.php:30
-msgid "Connect on Friendika!"
+#: ../../include/profile_advanced.php:103 ../../boot.php:2362
+msgid "Homepage:"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:171
-msgid "Randplace Settings"
+#: ../../include/profile_advanced.php:127
+msgid "Religion:"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:173
-msgid "Enable Randplace Plugin"
+#: ../../include/profile_advanced.php:138
+msgid "About:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:39
-msgid "Upload a file"
+#: ../../include/profile_advanced.php:150
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:40
-msgid "Drop files here to upload"
+#: ../../include/profile_advanced.php:162
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:42
-msgid "Failed"
+#: ../../include/profile_advanced.php:174
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:288
-msgid "No files were uploaded."
+#: ../../include/profile_advanced.php:186
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:294
-msgid "Uploaded file is empty"
+#: ../../include/profile_advanced.php:198
+msgid "Television:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:299
-msgid "Uploaded file is too large"
+#: ../../include/profile_advanced.php:210
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:317
-msgid "File has an invalid extension, it should be one of "
+#: ../../include/profile_advanced.php:222
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:328
-msgid "Upload was cancelled, or server error encountered"
+#: ../../include/profile_advanced.php:234
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/notifier.php:414
-msgid "(no subject)"
+#: ../../include/profile_advanced.php:246
+msgid "School/education:"
 msgstr ""
 
 #: ../../include/contact_selectors.php:32
@@ -3202,32 +3120,56 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/acl_selectors.php:133
-msgid "Visible To:"
+#: ../../include/oembed.php:95
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/acl_selectors.php:133
-msgid "everybody"
+#: ../../include/group.php:146
+msgid "Create a new group"
 msgstr ""
 
-#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152
-msgid "Groups"
+#: ../../include/group.php:147
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/acl_selectors.php:148
-msgid "Except For:"
+#: ../../include/nav.php:41 ../../boot.php:865
+msgid "Logout"
 msgstr ""
 
-#: ../../include/auth.php:27
-msgid "Logged out."
+#: ../../include/nav.php:44 ../../boot.php:843 ../../boot.php:849
+msgid "Login"
 msgstr ""
 
-#: ../../include/bbcode.php:83
-msgid "Image/photo"
+#: ../../include/nav.php:55 ../../include/nav.php:92
+msgid "Home"
 msgstr ""
 
-#: ../../include/poller.php:380
-msgid "From: "
+#: ../../include/nav.php:68
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:80
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:90
+msgid "Network"
+msgstr ""
+
+#: ../../include/nav.php:98
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:104
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:107
+msgid "Settings"
+msgstr ""
+
+#: ../../include/auth.php:27
+msgid "Logged out."
 msgstr ""
 
 #: ../../include/datetime.php:44 ../../include/datetime.php:46
@@ -3294,233 +3236,340 @@ msgstr ""
 msgid " ago"
 msgstr ""
 
-#: ../../include/profile_advanced.php:36 ../../include/items.php:1086
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:45
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/profile_advanced.php:46
-msgid "j F"
-msgstr ""
-
-#: ../../include/profile_advanced.php:59
-msgid "Age:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:70
-msgid "<span class=\"heart\">&hearts;</span> Status:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:127
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:138
-msgid "About:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:150
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:162
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:174
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:186
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:198
-msgid "Television:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:210
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:222
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:234
-msgid "Work/employment:"
+#: ../../include/poller.php:380
+msgid "From: "
 msgstr ""
 
-#: ../../include/profile_advanced.php:246
-msgid "School/education:"
+#: ../../include/bbcode.php:83
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/nav.php:55 ../../include/nav.php:92
-msgid "Home"
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/nav.php:68
-msgid "Apps"
+#: ../../include/acl_selectors.php:133
+msgid "Visible To:"
 msgstr ""
 
-#: ../../include/nav.php:80
-msgid "Directory"
+#: ../../include/acl_selectors.php:133
+msgid "everybody"
 msgstr ""
 
-#: ../../include/nav.php:90
-msgid "Network"
+#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152
+msgid "Groups"
 msgstr ""
 
-#: ../../include/nav.php:98
-msgid "Notifications"
+#: ../../include/acl_selectors.php:148
+msgid "Except For:"
 msgstr ""
 
-#: ../../include/nav.php:104
-msgid "Manage"
+#: ../../include/notifier.php:414
+msgid "(no subject)"
 msgstr ""
 
-#: ../../include/nav.php:107
-msgid "Settings"
+#: ../../include/items.php:1447
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/conversation.php:189 ../../include/conversation.php:446
-#: ../../include/conversation.php:447
+#: ../../include/conversation.php:191 ../../include/conversation.php:451
+#: ../../include/conversation.php:452
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../include/conversation.php:205
+#: ../../include/conversation.php:207
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:276
+#: ../../include/conversation.php:278
 msgid "See more posts like this"
 msgstr ""
 
-#: ../../include/conversation.php:301
+#: ../../include/conversation.php:303
 #, php-format
 msgid "See all %d comments"
 msgstr ""
 
-#: ../../include/conversation.php:448
+#: ../../include/conversation.php:453
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:449
+#: ../../include/conversation.php:454
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:450
+#: ../../include/conversation.php:455
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:588
+#: ../../include/conversation.php:593
 msgid "View status"
 msgstr ""
 
-#: ../../include/conversation.php:589
+#: ../../include/conversation.php:594
 msgid "View profile"
 msgstr ""
 
-#: ../../include/conversation.php:590
+#: ../../include/conversation.php:595
 msgid "View photos"
 msgstr ""
 
-#: ../../include/conversation.php:591
+#: ../../include/conversation.php:596
 msgid "View recent"
 msgstr ""
 
-#: ../../include/conversation.php:593
+#: ../../include/conversation.php:598
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:643
+#: ../../include/conversation.php:648
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:643
+#: ../../include/conversation.php:648
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:647
+#: ../../include/conversation.php:652
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:654
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:655
+#: ../../include/conversation.php:660
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:658
+#: ../../include/conversation.php:663
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:659
+#: ../../include/conversation.php:664
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:659
+#: ../../include/conversation.php:664
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:678
+#: ../../include/conversation.php:683
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:680
+#: ../../include/conversation.php:685
 msgid "Please enter a YouTube link:"
 msgstr ""
 
-#: ../../include/conversation.php:681
+#: ../../include/conversation.php:686
 msgid "Please enter a video(.ogg) link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:682
+#: ../../include/conversation.php:687
 msgid "Please enter an audio(.ogg) link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:683
+#: ../../include/conversation.php:688
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:684
+#: ../../include/conversation.php:689
 msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../include/conversation.php:734
+#: ../../include/conversation.php:740
 msgid "Set title"
 msgstr ""
 
-#: ../../include/dba.php:31
+#: ../../boot.php:385
+msgid "Delete this item?"
+msgstr ""
+
+#: ../../boot.php:834
+msgid "Create a New Account"
+msgstr ""
+
+#: ../../boot.php:841
+msgid "Nickname or Email address: "
+msgstr ""
+
+#: ../../boot.php:842
+msgid "Password: "
+msgstr ""
+
+#: ../../boot.php:847
+msgid "Nickname/Email/OpenID: "
+msgstr ""
+
+#: ../../boot.php:848
+msgid "Password (if not OpenID): "
+msgstr ""
+
+#: ../../boot.php:851
+msgid "Forgot your password?"
+msgstr ""
+
+#: ../../boot.php:1113
+msgid "prev"
+msgstr ""
+
+#: ../../boot.php:1115
+msgid "first"
+msgstr ""
+
+#: ../../boot.php:1144
+msgid "last"
+msgstr ""
+
+#: ../../boot.php:1147
+msgid "next"
+msgstr ""
+
+#: ../../boot.php:2046
+msgid "No contacts"
+msgstr ""
+
+#: ../../boot.php:2054
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../boot.php:2329
+msgid "Connect"
 msgstr ""
 
-#: ../../include/items.php:1447
-msgid "You have a new follower at "
+#: ../../boot.php:2344
+msgid "Location:"
 msgstr ""
 
-#: ../../include/group.php:146
-msgid "Create a new group"
+#: ../../boot.php:2348
+msgid ", "
 msgstr ""
 
-#: ../../include/group.php:147
-msgid "Everybody"
+#: ../../boot.php:2360
+msgid "Status:"
 msgstr ""
 
-#: ../../include/oembed.php:57
-msgid "Embedding disabled"
+#: ../../boot.php:2457
+msgid "Monday"
+msgstr ""
+
+#: ../../boot.php:2457
+msgid "Tuesday"
+msgstr ""
+
+#: ../../boot.php:2457
+msgid "Wednesday"
+msgstr ""
+
+#: ../../boot.php:2457
+msgid "Thursday"
+msgstr ""
+
+#: ../../boot.php:2457
+msgid "Friday"
+msgstr ""
+
+#: ../../boot.php:2457
+msgid "Saturday"
+msgstr ""
+
+#: ../../boot.php:2457
+msgid "Sunday"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "January"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "February"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "March"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "April"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "May"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "June"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "July"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "August"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "September"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "October"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "November"
+msgstr ""
+
+#: ../../boot.php:2461
+msgid "December"
+msgstr ""
+
+#: ../../boot.php:2476
+msgid "g A l F d"
+msgstr ""
+
+#: ../../boot.php:2494
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../boot.php:2495
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../boot.php:2496
+msgid "(Adjusted for local time)"
+msgstr ""
+
+#: ../../boot.php:2507
+msgid "[today]"
+msgstr ""
+
+#: ../../boot.php:2570
+msgid "bytes"
+msgstr ""
+
+#: ../../boot.php:2744
+msgid "link to source"
+msgstr ""
+
+#: ../../index.php:199
+msgid "Not Found"
+msgstr ""
+
+#: ../../index.php:200
+msgid "Page not found."
 msgstr ""
diff --git a/util/strings.php b/util/strings.php
index 0000e30f6..659b0a2df 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -58,12 +58,16 @@ $a->strings['Birthday Reminders'] = 'Birthday Reminders';
 $a->strings['Birthdays this week:'] = 'Birthdays this week:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
 $a->strings['[today]'] = '[today]';
+$a->strings['bytes'] = 'bytes';
 $a->strings['link to source'] = 'link to source';
 $a->strings['%d Contact'] = array(
 	0 => '%d Contact',
 	1 => '%d Contacts',
 );
 $a->strings['Applications'] = 'Applications';
+$a->strings['Private Notes'] = 'Private Notes';
+$a->strings['Item not available.'] = 'Item not available.';
+$a->strings['Item was not found.'] = 'Item was not found.';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
 $a->strings['Connect/Follow'] = 'Connect/Follow';
@@ -153,7 +157,8 @@ $a->strings['Unable to update your contact profile details on our system'] = 'Un
 $a->strings["Connection accepted at %s"] = "Connection accepted at %s";
 $a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
-$a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
+$a->strings['%s commented on an item at %s'] = '%s commented on an item at %s';
+$a->strings[" commented on an item at "] = " commented on an item at ";
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
 $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.';
 $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.';
@@ -199,6 +204,8 @@ $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['Normal site view'] = 'Normal site view';
+$a->strings['View all site entries'] = 'View all site entries';
 $a->strings['Site Directory'] = 'Site Directory';
 $a->strings['Age: '] = 'Age: ';
 $a->strings['Gender: '] = 'Gender: ';
@@ -208,9 +215,11 @@ $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
 $a->strings['Item not found'] = 'Item not found';
 $a->strings['Edit post'] = 'Edit post';
+$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
 $a->strings["Post to Email"] = "Post to Email";
 $a->strings['Edit'] = 'Edit';
 $a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Attach file'] = 'Attach file';
 $a->strings['Insert web link'] = 'Insert web link';
 $a->strings['Insert YouTube video'] = 'Insert YouTube video';
 $a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
@@ -220,8 +229,12 @@ $a->strings['Clear browser location'] = 'Clear browser location';
 $a->strings['Please wait'] = 'Please wait';
 $a->strings['Permission settings'] = 'Permission settings';
 $a->strings['CC: email addresses'] = 'CC: email addresses';
+$a->strings['Public post'] = 'Public post';
 $a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
+$a->strings['No compatible communication protocols or feeds were discovered.'] = 'No compatible communication protocols or feeds were discovered.';
+$a->strings['An author or name was not found.'] = 'An author or name was not found.';
+$a->strings['No browser URL could be matched to this address.'] = 'No browser URL could be matched to this address.';
 $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';
@@ -287,6 +300,7 @@ $a->strings['If not, you may be required to perform a manual installation. Pleas
 $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.';
 $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
 $a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address.';
+$a->strings['Please join my network on %s'] = 'Please join my network on %s';
 $a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.';
 $a->strings['Send invitations'] = 'Send invitations';
 $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
@@ -300,8 +314,6 @@ $a->strings["%d message sent."] = array(
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
 $a->strings['Wall Photos'] = 'Wall Photos';
-$a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
-$a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
 $a->strings['This message was sent to you by %s, a member of the Friendika social network.'] = 'This message was sent to you by %s, a member of the Friendika social network.';
 $a->strings['You may visit them online at %s'] = 'You may visit them online at %s';
@@ -354,7 +366,6 @@ $a->strings['Delete message'] = 'Delete message';
 $a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.';
 $a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.';
 $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
@@ -362,10 +373,11 @@ $a->strings['Group: '] = 'Group: ';
 $a->strings['Contact: '] = 'Contact: ';
 $a->strings['Private messages to this person are at risk of public disclosure.'] = 'Private messages to this person are at risk of public disclosure.';
 $a->strings['Invalid contact.'] = 'Invalid contact.';
-$a->strings['%d member'] = array(
-	0 => '%d member',
-	1 => '%d members',
+$a->strings['Warning: This group contains %s member from an insecure network.'] = array(
+	0 => 'Warning: This group contains %s member from an insecure network.',
+	1 => 'Warning: This group contains %s members from an insecure network.',
 );
+$a->strings['Save'] = 'Save';
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
@@ -412,11 +424,11 @@ $a->strings['Edit Album'] = 'Edit Album';
 $a->strings['View Photo'] = 'View Photo';
 $a->strings['Photo not available'] = 'Photo not available';
 $a->strings['Edit photo'] = 'Edit photo';
+$a->strings['Use as profile photo'] = 'Use as profile photo';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings['<< Prev'] = '<< Prev';
 $a->strings['View Full Size'] = 'View Full Size';
 $a->strings['Next >>'] = 'Next >>';
-$a->strings['Tags: '] = 'Tags: ';
 $a->strings['[Remove any tag]'] = '[Remove any tag]';
 $a->strings['New album name'] = 'New album name';
 $a->strings['Caption'] = 'Caption';
@@ -429,6 +441,7 @@ $a->strings['This is you'] = 'This is you';
 $a->strings['Recent Photos'] = 'Recent Photos';
 $a->strings['Upload New Photos'] = 'Upload New Photos';
 $a->strings['View Album'] = 'View Album';
+$a->strings['Access to this profile has been restricted.'] = 'Access to this profile has been restricted.';
 $a->strings['Status'] = 'Status';
 $a->strings['Profile'] = 'Profile';
 $a->strings['Photos'] = 'Photos';
@@ -450,7 +463,8 @@ $a->strings['Profile deleted.'] = 'Profile deleted.';
 $a->strings['Profile-'] = 'Profile-';
 $a->strings['New profile created.'] = 'New profile created.';
 $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.';
-$a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?';
+$a->strings['Hide your contact/friend list from viewers of this profile?'] = 'Hide your contact/friend list from viewers of this profile?';
+$a->strings['Hide profile details and all your messages from unknown viewers?'] = 'Hide profile details and all your messages from unknown viewers?';
 $a->strings['Edit Profile Details'] = 'Edit Profile Details';
 $a->strings['View this profile'] = 'View this profile';
 $a->strings['Create a new profile using these settings'] = 'Create a new profile using these settings';
@@ -600,8 +614,12 @@ $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
 $a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';
 $a->strings['Remove'] = 'Remove';
+$a->strings['[Embedded content - reload page to view]'] = '[Embedded content - reload page to view]';
 $a->strings['No contacts.'] = 'No contacts.';
+$a->strings['File upload failed.'] = 'File upload failed.';
+$a->strings['Image exceeds size limit of %d'] = 'Image exceeds size limit of %d';
 $a->strings['Visible To:'] = 'Visible To:';
+$a->strings['everybody'] = 'everybody';
 $a->strings['Groups'] = 'Groups';
 $a->strings['Except For:'] = 'Except For:';
 $a->strings['Logged out.'] = 'Logged out.';
@@ -633,7 +651,6 @@ $a->strings['and'] = 'and';
 $a->strings[', and %d other people'] = ', and %d other people';
 $a->strings['%s like this.'] = '%s like this.';
 $a->strings['%s don\'t like this.'] = '%s don\'t like this.';
-$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
 $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
 $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
 $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
@@ -668,6 +685,7 @@ $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
 $a->strings["\x28no subject\x29"] = "\x28no subject\x29";
 $a->strings['Embedding disabled'] = 'Embedding disabled';
+$a->strings['From: '] = 'From: ';
 $a->strings['j F, Y'] = 'j F, Y';
 $a->strings['j F'] = 'j F';
 $a->strings['Age:'] = 'Age:';
@@ -759,10 +777,18 @@ $a->strings['Uploaded file is empty'] = 'Uploaded file is empty';
 $a->strings['Uploaded file is too large'] = 'Uploaded file is too large';
 $a->strings['File has an invalid extension, it should be one of '] = 'File has an invalid extension, it should be one of ';
 $a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered';
+$a->strings['OEmbed settings updated'] = 'OEmbed settings updated';
+$a->strings['URL to embed:'] = 'URL to embed:';
 $a->strings['Randplace Settings'] = 'Randplace Settings';
 $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
 $a->strings['Post to StatusNet'] = 'Post to StatusNet';
+$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Please contact your site administrator.<br />The provided API URL is not valid.';
+$a->strings['We could not contact the StatusNet API with the Path you entered.'] = 'We could not contact the StatusNet API with the Path you entered.';
+$a->strings['StatusNet settings updated.'] = 'StatusNet settings updated.';
 $a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings';
+$a->strings['Globally Available StatusNet OAuthKeys'] = 'Globally Available StatusNet OAuthKeys';
+$a->strings['There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below] = 'There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below;
+$a->strings['Provide your own OAuth Credentials'] = 'Provide your own OAuth Credentials';
 $a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = '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.';
 $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
 $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
@@ -770,9 +796,11 @@ $a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x
 $a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.';
 $a->strings['Log in with StatusNet'] = 'Log in with StatusNet';
 $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here';
+$a->strings['Cancel StatusNet Connection'] = 'Cancel StatusNet Connection';
 $a->strings['Currently connected to: '] = 'Currently connected to: ';
-$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.';
-$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet';
+$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account.';
+$a->strings['Allow posting to StatusNet'] = 'Allow posting to StatusNet';
+$a->strings['Send public postings to StatusNet by default'] = 'Send public postings to StatusNet by default';
 $a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration';
 $a->strings['Three Dimensional Tic-Tac-Toe'] = 'Three Dimensional Tic-Tac-Toe';
 $a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
@@ -793,6 +821,9 @@ $a->strings['At this Friendika instance the Twitter plugin was enabled but you h
 $a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here';
 $a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.';
 $a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
+$a->strings['Connect on Friendika!'] = 'Connect on Friendika!';
+$a->strings['Widgets key: '] = 'Widgets key: ';
+$a->strings["Plugin Settings"] = "Plugin Settings";
 $a->strings['Africa/Abidjan'] = 'Africa/Abidjan';
 $a->strings['Africa/Accra'] = 'Africa/Accra';
 $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 9ef5df0ce..51cb6dd4a 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -336,6 +336,9 @@ aside #viewcontacts { text-align: right;}
 #acl-wrapper-end,
 #profile-jot-end { clear: both; height: 5px; }
 
+
+
+
 /**
  * section
  */
@@ -441,7 +444,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	height: 30px;
     
 }
-.wallwall .wwto img { width: 30px; height: 30px;}
+.wallwall .wwto img { width: 30px!important; height: 30px!important;}
 .wallwall .wall-item-photo-end { clear: both; }
 .wall-item-arrowphoto-wrapper {
     position: absolute;
@@ -474,7 +477,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
  .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
  
 .wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;}
+.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
 	width: 50px; top: 45px; background-position: 35px center;
@@ -719,7 +722,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 /**
  * 	contacts selector
  */
-
+#group-edit-desc { margin: 10px 0xp; }
+#group-members,
 #prof-members {
 	height: 200px; 
 	overflow: auto;
@@ -728,6 +732,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
     -moz-border-radius: 5px 5px 0px 0px;
     border-radius: 5px 5px 0px 0px;
 }
+#group-all-contacts,
 #prof-all-contacts { 
 	height: 200px;
     overflow: auto;	
@@ -736,6 +741,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
     -moz-border-radius: 0px 0px 5px 5px;
     border-radius: 0px 0px 5px 5px;
 }
+#group-members h3,
+#group-all-contacts h3,
 #prof-members h3,
 #prof-all-contacts h3{
 	color: #eeeeec;
@@ -743,7 +750,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	margin: 0px;
 	padding: 5px;
 }
-
+#group-separator,
 #prof-separator { display: none;}
 
 /**
@@ -807,7 +814,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 
 .attachtype {
 	display: block; width: 20px; height: 23px;
-	background-image: url('../../../images/content-types.gif');
+	background-image: url('../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px; 0px; }
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index f44931a5f..2bac4238e 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2434,7 +2434,7 @@ a.mail-list-link {
 .attachtype {
 	display: block; width: 20px; height: 23px;
 	float: left;
-	background-image: url('../../../images/content-types.gif');
+	background-image: url('../../../images/content-types.png');
 }
 
 .body-attach {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 370e5c61a..9c6c0120b 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -114,8 +114,10 @@ blockquote:before {
 #profile-link,
 #profile-title, 
 #wall-image-upload,
+#wall-file-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
+#wall-file-upload-div,
 .hover, .focus {
 	cursor: pointer;
 }
@@ -1203,7 +1205,10 @@ padding: 5px 10px 0px;
 	float: left;
 	margin-left: 30px;
 }
-
+#profile-attach-wrapper {
+    float: left;
+    margin-left: 30px;
+}
 #profile-rotator {
 	float: left;
 	margin-left: 30px;
@@ -2445,7 +2450,7 @@ a.mail-list-link {
 .attachtype {
 	display: block; width: 20px; height: 23px;
 	float: left;
-	background-image: url('../../../images/content-types.gif');
+	background-image: url('../../../images/content-types.png');
 }
 
 .body-attach {