Merge remote branch 'upstream/master'

Conflicts: view/theme/vier/style.css
author: Michael <icarus@dabo.de> 2012-02-19 20:09:42 +0100
committer: Michael <icarus@dabo.de> 2012-02-19 20:09:42 +0100
commit: cafd4003522a472d2709569ea5eb5f80b817af23 (patch)
tree: bbd512126515afc929de06dce79ba847b9681092 /util
parent: 73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff)
parent: a9ed5915cebcf51347acaad51d0c252e57bceaff (diff)
download: volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz
volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2
volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip
5 files changed, 3021 insertions, 2665 deletions
diff --git a/util/fpostit/README b/util/fpostit/README
new file mode 100644
index 000000000..39b7c5761
--- /dev/null
+++ b/util/fpostit/README
@@ -0,0 +1,8 @@
+fpostit
+
+original author: Devlon Duthied
+
+see his blog posting:
+http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
+
+original published at github https://github.com/duthied/Friendika-Bookmarklet
diff --git a/util/fpostit/fpostit.js b/util/fpostit/fpostit.js
new file mode 100644
index 000000000..a6c75aba8
--- /dev/null
+++ b/util/fpostit/fpostit.js
@@ -0,0 +1,11 @@
+javascript: (function() {
+    the_url = 'http://testbubble.com/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent('' (window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
+    a_funct = function() {
+        if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url;
+    };
+    if (/Firefox/.test(navigator.userAgent)) {
+        setTimeout(a_funct, 0)
+    } else {
+        a_funct()
+    }
+})()
+\ No newline at end of file
diff --git a/util/fpostit/fpostit.php b/util/fpostit/fpostit.php
new file mode 100644
index 000000000..491d81f6d
--- /dev/null
+++ b/util/fpostit/fpostit.php
@@ -0,0 +1,129 @@
+<?php
+
+if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
+	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
+}
+
+?>
+<html>
+<head>
+	<style>
+		body {
+			font-family: arial, Helvetica,sans-serif;
+			margin: 0px;
+		}
+		.wrap1 {
+			padding: 2px 5px;
+			background-color: #729FCF;
+			margin-bottom: 10px;
+		}
+		.wrap2 {
+			margin-left: 10px;
+			font-size: 12px;
+		}
+		.logo {
+			margin-left: 3px;
+			margin-right: 5px;
+			float: left;
+		}
+		h2 {
+			color: #ffffff;
+		}
+		.error {
+			background-color: #FFFF66;
+			font-size: 12px;
+			margin-left: 10px;
+		}
+	</style>
+</head>
+
+<body>
+<?php
+
+if (isset($_GET['title'])) {
+	$title = $_GET['title'];
+}
+if (isset($_GET['text'])) {
+	$text = $_GET['text'];
+}
+if (isset($_GET['url'])) {
+	$url = $_GET['url'];
+}
+
+if ((isset($title)) && (isset($text)) && (isset($url))) {
+	$content = "$title\nsource:$url\n\n$text";
+} else {
+	$content = $_POST['content'];
+}
+
+if (isset($_POST['submit'])) {
+	
+	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
+		$acctname = $_POST["friendika_acct_name"];
+		$tmp_account_array = explode("@", $acctname);
+		if (isset($tmp_account_array[1])) {
+			$username = $tmp_account_array[0];
+			$hostname = $tmp_account_array[1];
+		}
+		$password = $_POST["friendika_password"];
+		$content = $_POST["content"];
+
+		$url = "http://" . $hostname . '/api/statuses/update';
+		$data = array('status' => $content);
+		
+		// echo "posting to: $url<br/>";
+
+		$c = curl_init();
+		curl_setopt($c, CURLOPT_URL, $url); 
+		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
+		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
+		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
+		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
+		$c_result = curl_exec($c); 
+		if(curl_errno($c)){ 
+			$error = curl_error($c);
+			showForm($error, $content);
+		}
+		
+		curl_close($c);
+		if (!isset($error)) {
+			echo '<script language="javascript" type="text/javascript">window.close();</script>';
+		}
+		
+	} else {
+		$error = "Missing account name and/or password...try again please";
+		showForm($error, $content);
+	}
+	
+} else {
+	showForm(null, $content);
+}
+
+function showForm($error, $content) {
+	$username_cookie = $_COOKIE['username'];
+	$password_cookie = $_COOKIE['password'];
+	
+	echo <<<EOF
+	<div class='wrap1'>
+		<h2><img class='logo' src='friendika-32.png' align='middle';/>
+		Friendika Bookmarklet</h2>
+	</div>
+
+	<div class="wrap2">
+		<form method="post" action="{$_SERVER['PHP_SELF']}">
+			Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br />
+			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
+			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
+			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
+			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
+		</form>
+		<p></p>
+	</div>
+EOF;
+	
+}
+?>
+
+</body>
+</html>
+\ No newline at end of file
diff --git a/util/fpostit/friendika-32.png b/util/fpostit/friendika-32.png
new file mode 100644
index 000000000..61764bf20
--- /dev/null
+++ b/util/fpostit/friendika-32.png
diff --git a/util/messages.po b/util/messages.po
index f553041b2..6e1652b39 100755
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1221\n"
+"Project-Id-Version: 2.3.1250\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-10 08:21-0800\n"
+"POT-Creation-Date: 2012-02-12 17:14-0800\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"
@@ -17,1205 +17,1154 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../mod/allfriends.php:9 ../../mod/follow.php:8
-#: ../../mod/contacts.php:117 ../../mod/settings.php:43
-#: ../../mod/settings.php:48 ../../mod/settings.php:403
-#: ../../mod/crepair.php:113 ../../mod/notifications.php:62
-#: ../../mod/message.php:9 ../../mod/message.php:46
-#: ../../mod/wall_upload.php:42 ../../mod/wall_attach.php:43
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
-#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
-#: ../../mod/manage.php:75 ../../mod/common.php:9 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/register.php:36 ../../mod/fsuggest.php:78
-#: ../../mod/editpost.php:10 ../../mod/regmod.php:111
-#: ../../mod/install.php:171 ../../mod/suggest.php:28
-#: ../../mod/display.php:111 ../../mod/notes.php:20
-#: ../../mod/dfrn_confirm.php:53 ../../mod/item.php:118
-#: ../../mod/photos.php:125 ../../mod/photos.php:860 ../../mod/network.php:6
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/attach.php:33
-#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19
-#: ../../mod/events.php:109 ../../index.php:288 ../../include/items.php:2867
-#: ../../addon/facebook/facebook.php:331
-msgid "Permission denied."
-msgstr ""
-
-#: ../../mod/allfriends.php:34
-#, php-format
-msgid "Friends of %s"
-msgstr ""
-
-#: ../../mod/allfriends.php:40
-msgid "No friends to display."
+#: ../../mod/oexchange.php:27
+msgid "Post successful."
 msgstr ""
 
-#: ../../mod/update_profile.php:41 ../../mod/update_network.php:22
 #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
+#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/directory.php:31 ../../mod/dfrn_request.php:624
-#: ../../mod/community.php:16 ../../mod/display.php:7 ../../mod/search.php:71
-#: ../../mod/photos.php:754 ../../mod/viewcontacts.php:16
-msgid "Public access denied."
-msgstr ""
-
-#: ../../mod/directory.php:49
-msgid "Global Directory"
+#: ../../mod/crepair.php:102
+msgid "Contact settings applied."
 msgstr ""
 
-#: ../../mod/directory.php:55
-msgid "Normal site view"
+#: ../../mod/crepair.php:104
+msgid "Contact update failed."
 msgstr ""
 
-#: ../../mod/directory.php:57
-msgid "Admin - View all site entries"
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
+#: ../../mod/editpost.php:10 ../../mod/install.php:171
+#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
+#: ../../mod/settings.php:49 ../../mod/settings.php:404
+#: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:21 ../../mod/register.php:36
+#: ../../mod/regmod.php:111 ../../mod/item.php:123 ../../mod/item.php:139
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
+#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
+#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
+#: ../../mod/display.php:112 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:331
+#: ../../include/items.php:2907 ../../index.php:288
+msgid "Permission denied."
 msgstr ""
 
-#: ../../mod/directory.php:63
-msgid "Find on this site"
+#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
+msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/directory.php:65 ../../mod/contacts.php:372
-msgid "Finding: "
+#: ../../mod/crepair.php:135
+msgid "Repair Contact Settings"
 msgstr ""
 
-#: ../../mod/directory.php:66
-msgid "Site Directory"
+#: ../../mod/crepair.php:137
+msgid ""
+"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
+"information your communications with this contact may stop working."
 msgstr ""
 
-#: ../../mod/directory.php:67 ../../mod/contacts.php:373
-#: ../../include/contact_widgets.php:34
-msgid "Find"
+#: ../../mod/crepair.php:138
+msgid ""
+"Please use your browser 'Back' button <strong>now</strong> if you are "
+"uncertain what to do on this page."
 msgstr ""
 
-#: ../../mod/directory.php:122 ../../mod/profiles.php:426
-msgid "Age: "
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/directory.php:125
-msgid "Gender: "
+#: ../../mod/crepair.php:148 ../../mod/settings.php:455
+#: ../../mod/settings.php:481 ../../mod/admin.php:464 ../../mod/admin.php:473
+msgid "Name"
 msgstr ""
 
-#: ../../mod/directory.php:151
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/crepair.php:149
+msgid "Account Nickname"
 msgstr ""
 
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111
-#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:115
-#: ../../include/items.php:2779
-msgid "Item not found."
+#: ../../mod/crepair.php:150
+msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: ../../mod/viewsrc.php:7
-msgid "Access denied."
+#: ../../mod/crepair.php:151
+msgid "Account URL"
 msgstr ""
 
-#: ../../mod/newmember.php:6
-msgid "Welcome to Friendica"
+#: ../../mod/crepair.php:152
+msgid "Friend Request URL"
 msgstr ""
 
-#: ../../mod/newmember.php:8
-msgid "New Member Checklist"
+#: ../../mod/crepair.php:153
+msgid "Friend Confirm URL"
 msgstr ""
 
-#: ../../mod/newmember.php:12
-msgid ""
-"We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page."
+#: ../../mod/crepair.php:154
+msgid "Notification Endpoint URL"
 msgstr ""
 
-#: ../../mod/newmember.php:16
-msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This will be useful in making friends."
+#: ../../mod/crepair.php:155
+msgid "Poll/Feed URL"
 msgstr ""
 
-#: ../../mod/newmember.php:18
-msgid ""
-"Review the other settings, particularly the privacy settings. An unpublished "
-"directory listing is like having an unlisted phone number. In general, you "
-"should probably publish your listing - unless all of your friends and "
-"potential friends know exactly how to find you."
+#: ../../mod/crepair.php:156
+msgid "New photo from this URL"
 msgstr ""
 
-#: ../../mod/newmember.php:20
-msgid ""
-"Upload a profile photo if you have not done so already. Studies have shown "
-"that people with real photos of themselves are ten times more likely to make "
-"friends than people who do not."
+#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
+#: ../../mod/events.php:333 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1182 ../../mod/photos.php:1222
+#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
+#: ../../mod/install.php:251 ../../mod/install.php:289
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
+#: ../../mod/settings.php:453 ../../mod/settings.php:592
+#: ../../mod/settings.php:773 ../../mod/manage.php:109 ../../mod/group.php:84
+#: ../../mod/group.php:167 ../../mod/admin.php:296 ../../mod/admin.php:461
+#: ../../mod/admin.php:587 ../../mod/admin.php:652 ../../mod/profiles.php:375
+#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:410
+#: ../../addon/yourls/yourls.php:76 ../../addon/nsfw/nsfw.php:57
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110
+#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
+#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
+#: ../../addon/pageheader/pageheader.php:52
+#: ../../addon/statusnet/statusnet.php:280
+#: ../../addon/statusnet/statusnet.php:294
+#: ../../addon/statusnet/statusnet.php:320
+#: ../../addon/statusnet/statusnet.php:327
+#: ../../addon/statusnet/statusnet.php:349
+#: ../../addon/statusnet/statusnet.php:495 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102
+#: ../../addon/piwik/piwik.php:81 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:203 ../../addon/twitter/twitter.php:315
+#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:515
+msgid "Submit"
 msgstr ""
 
-#: ../../mod/newmember.php:23
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
+#: ../../mod/help.php:30
+msgid "Help:"
 msgstr ""
 
-#: ../../mod/newmember.php:28
-msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
+#: ../../mod/help.php:34 ../../include/nav.php:82
+msgid "Help"
 msgstr ""
 
-#: ../../mod/newmember.php:30
-msgid ""
-"Edit your <strong>default</strong> profile to your liking. Review the "
-"settings for hiding your list of friends and hiding the profile from unknown "
-"visitors."
+#: ../../mod/help.php:38 ../../index.php:221
+msgid "Not Found"
 msgstr ""
 
-#: ../../mod/newmember.php:32
-msgid ""
-"Set some public keywords for your default profile which describe your "
-"interests. We may be able to find other people with similar interests and "
-"suggest friendships."
+#: ../../mod/help.php:41 ../../index.php:224
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/newmember.php:34
-msgid ""
-"Your Contacts page is your gateway to managing friendships and connecting "
-"with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Add New Contact</em> dialog."
+#: ../../mod/wall_attach.php:57
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/newmember.php:36
-msgid ""
-"The Directory page lets you find other people in this network or other "
-"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
-"their profile page. Provide your own Identity Address if requested."
+#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+msgid "File upload failed."
 msgstr ""
 
-#: ../../mod/newmember.php:38
-msgid ""
-"Once you have made some friends, organize them into private conversation "
-"groups from the sidebar of your Contacts page and then you can interact with "
-"each group privately on your Network page."
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
 msgstr ""
 
-#: ../../mod/newmember.php:40
-msgid ""
-"Our <strong>help</strong> pages may be consulted for detail on other program "
-"features and resources."
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
 msgstr ""
 
-#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:370
-msgid "Disallowed profile URL."
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/follow.php:27
-msgid "Connect URL missing."
+#: ../../mod/events.php:61
+msgid "Event description and start time are required."
 msgstr ""
 
-#: ../../mod/follow.php:47
-msgid ""
-"This site is not configured to allow communications with other networks."
+#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1345
+msgid "Events"
 msgstr ""
 
-#: ../../mod/follow.php:48 ../../mod/follow.php:58
-msgid "No compatible communication protocols or feeds were discovered."
+#: ../../mod/events.php:207
+msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/follow.php:56
-msgid "The profile address specified does not provide adequate information."
+#: ../../mod/events.php:210
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/follow.php:60
-msgid "An author or name was not found."
+#: ../../mod/events.php:213 ../../mod/install.php:210
+msgid "Next"
 msgstr ""
 
-#: ../../mod/follow.php:62
-msgid "No browser URL could be matched to this address."
+#: ../../mod/events.php:220
+msgid "l, F j"
 msgstr ""
 
-#: ../../mod/follow.php:69
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
+#: ../../mod/events.php:235
+msgid "Edit event"
 msgstr ""
 
-#: ../../mod/follow.php:74
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../mod/events.php:237 ../../include/text.php:883
+msgid "link to source"
 msgstr ""
 
-#: ../../mod/follow.php:144
-msgid "Unable to retrieve contact information."
+#: ../../mod/events.php:305
+msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/follow.php:190
-msgid "following"
+#: ../../mod/events.php:314
+msgid "Event details"
 msgstr ""
 
-#: ../../mod/dirfind.php:23
-msgid "People Search"
+#: ../../mod/events.php:315
+#, php-format
+msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""
 
-#: ../../mod/dirfind.php:57 ../../mod/match.php:65
-msgid "No matches"
+#: ../../mod/events.php:316
+msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/contacts.php:62 ../../mod/contacts.php:135
-msgid "Could not access contact record."
+#: ../../mod/events.php:319
+msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/contacts.php:76
-msgid "Could not locate selected profile."
+#: ../../mod/events.php:321
+msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/contacts.php:99
-msgid "Contact updated."
+#: ../../mod/events.php:324
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/contacts.php:101 ../../mod/dfrn_request.php:439
-msgid "Failed to update contact record."
+#: ../../mod/events.php:326
+msgid "Description:"
 msgstr ""
 
-#: ../../mod/contacts.php:157
-msgid "Contact has been blocked"
+#: ../../mod/events.php:328 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:271 ../../boot.php:976
+msgid "Location:"
 msgstr ""
 
-#: ../../mod/contacts.php:157
-msgid "Contact has been unblocked"
+#: ../../mod/events.php:330
+msgid "Share this event"
 msgstr ""
 
-#: ../../mod/contacts.php:171
-msgid "Contact has been ignored"
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:685 ../../mod/settings.php:454
+#: ../../mod/settings.php:480 ../../addon/js_upload/js_upload.php:45
+msgid "Cancel"
 msgstr ""
 
-#: ../../mod/contacts.php:171
-msgid "Contact has been unignored"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../mod/contacts.php:192
-msgid "stopped following"
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../mod/contacts.php:213
-msgid "Contact has been removed."
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/contacts.php:234
-#, php-format
-msgid "You are mutual friends with %s"
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+msgid "Remove"
 msgstr ""
 
-#: ../../mod/contacts.php:238
+#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
 #, php-format
-msgid "You are sharing with %s"
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../mod/contacts.php:243
-#, php-format
-msgid "%s is sharing with you"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/contacts.php:260
-msgid "Private communications are not available for this contact."
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/contacts.php:263
-msgid "Never"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "(Update was successful)"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/contacts.php:267
-msgid "(Update was not successful)"
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:675
+#: ../../mod/settings.php:681 ../../mod/settings.php:687
+#: ../../mod/settings.php:695 ../../mod/settings.php:699
+#: ../../mod/settings.php:704 ../../mod/settings.php:710
+#: ../../mod/settings.php:716 ../../mod/settings.php:763
+#: ../../mod/settings.php:764 ../../mod/settings.php:765
+#: ../../mod/settings.php:766 ../../mod/register.php:524
+#: ../../mod/profiles.php:357
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/contacts.php:269
-msgid "Suggest friends"
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:676
+#: ../../mod/settings.php:681 ../../mod/settings.php:687
+#: ../../mod/settings.php:695 ../../mod/settings.php:699
+#: ../../mod/settings.php:704 ../../mod/settings.php:710
+#: ../../mod/settings.php:716 ../../mod/settings.php:763
+#: ../../mod/settings.php:764 ../../mod/settings.php:765
+#: ../../mod/settings.php:766 ../../mod/register.php:525
+#: ../../mod/profiles.php:358
+msgid "No"
 msgstr ""
 
-#: ../../mod/contacts.php:273
-#, php-format
-msgid "Network type: %s"
+#: ../../mod/photos.php:42
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/contacts.php:276
-#, php-format
-msgid "%d contact in common"
-msgid_plural "%d contacts in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/contacts.php:281
-msgid "View all contacts"
+#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879
+#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371
+#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:286 ../../mod/contacts.php:333
-#: ../../mod/admin.php:470
-msgid "Unblock"
+#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:286 ../../mod/contacts.php:333
-#: ../../mod/admin.php:469
-msgid "Block"
+#: ../../mod/photos.php:68 ../../mod/settings.php:11
+msgid "everybody"
 msgstr ""
 
-#: ../../mod/contacts.php:291 ../../mod/contacts.php:334
-msgid "Unignore"
+#: ../../mod/photos.php:139
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/contacts.php:291 ../../mod/contacts.php:334
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:149
-#: ../../mod/notifications.php:194
-msgid "Ignore"
+#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:327
+#: ../../mod/register.php:334 ../../mod/register.php:341
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
+#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
+#: ../../addon/communityhome/communityhome.php:111
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:296
-msgid "Repair"
+#: ../../mod/photos.php:160
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/contacts.php:306
-msgid "Contact Editor"
+#: ../../mod/photos.php:178 ../../mod/photos.php:959
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/contacts.php:308 ../../mod/settings.php:447
-#: ../../mod/settings.php:586 ../../mod/settings.php:767
-#: ../../mod/crepair.php:162 ../../mod/manage.php:106
-#: ../../mod/profiles.php:375 ../../mod/localtime.php:45
-#: ../../mod/invite.php:106 ../../mod/fsuggest.php:107
-#: ../../mod/install.php:250 ../../mod/install.php:288 ../../mod/admin.php:296
-#: ../../mod/admin.php:461 ../../mod/admin.php:587 ../../mod/admin.php:652
-#: ../../mod/photos.php:888 ../../mod/photos.php:946 ../../mod/photos.php:1165
-#: ../../mod/photos.php:1205 ../../mod/photos.php:1245
-#: ../../mod/photos.php:1276 ../../mod/group.php:84 ../../mod/group.php:167
-#: ../../mod/events.php:333 ../../include/conversation.php:488
-#: ../../addon/facebook/facebook.php:410 ../../addon/wppost/wppost.php:101
-#: ../../addon/uhremotestorage/uhremotestorage.php:58
-#: ../../addon/tumblr/tumblr.php:89 ../../addon/oembed/oembed.php:41
-#: ../../addon/posterous/posterous.php:89
-#: ../../addon/statusnet/statusnet.php:282
-#: ../../addon/statusnet/statusnet.php:296
-#: ../../addon/statusnet/statusnet.php:322
-#: ../../addon/statusnet/statusnet.php:329
-#: ../../addon/statusnet/statusnet.php:351
-#: ../../addon/statusnet/statusnet.php:486 ../../addon/twitter/twitter.php:179
-#: ../../addon/twitter/twitter.php:202 ../../addon/twitter/twitter.php:299
-#: ../../addon/impressum/impressum.php:69 ../../addon/piwik/piwik.php:81
-#: ../../addon/pageheader/pageheader.php:52
-#: ../../addon/randplace/randplace.php:178 ../../addon/blockem/blockem.php:53
-#: ../../addon/nsfw/nsfw.php:53
-msgid "Submit"
+#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/contacts.php:309
-msgid "Profile Visibility"
+#: ../../mod/photos.php:528
+msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/contacts.php:310
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../include/diaspora.php:1587 ../../include/conversation.php:31
+#: ../../include/conversation.php:104
+msgid "photo"
 msgstr ""
 
-#: ../../mod/contacts.php:311
-msgid "Contact Information / Notes"
+#: ../../mod/photos.php:528
+msgid "by"
 msgstr ""
 
-#: ../../mod/contacts.php:312
-msgid "Edit contact notes"
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:312
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/contacts.php:317 ../../mod/contacts.php:433
-#: ../../mod/viewcontacts.php:61
-#, php-format
-msgid "Visit %s's profile [%s]"
+#: ../../mod/photos.php:639
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/contacts.php:318
-msgid "Block/Unblock contact"
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122
+#: ../../mod/wall_upload.php:65
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/contacts.php:319
-msgid "Ignore contact"
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251
+#: ../../mod/wall_upload.php:84
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/contacts.php:320
-msgid "Repair URL settings"
+#: ../../mod/photos.php:759 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:624 ../../mod/viewcontacts.php:16
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31
+msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/contacts.php:321
-msgid "View conversations"
+#: ../../mod/photos.php:769
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/contacts.php:323
-msgid "Delete contact"
+#: ../../mod/photos.php:846
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/contacts.php:327
-msgid "Last update:"
+#: ../../mod/photos.php:907
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/contacts.php:328
-msgid "Update public posts"
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
+msgid "New album name: "
 msgstr ""
 
-#: ../../mod/contacts.php:330 ../../mod/admin.php:701
-msgid "Update now"
+#: ../../mod/photos.php:911
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/contacts.php:337
-msgid "Currently blocked"
+#: ../../mod/photos.php:912
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/contacts.php:338
-msgid "Currently ignored"
+#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+msgid "Permissions"
 msgstr ""
 
-#: ../../mod/contacts.php:339 ../../mod/notifications.php:144
-#: ../../mod/notifications.php:189
-msgid "Hide this contact from others"
+#: ../../mod/photos.php:969
+msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/contacts.php:339
-msgid ""
-"Replies/likes to your public posts <strong>may</strong> still be visible"
+#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+msgid "View Photo"
 msgstr ""
 
-#: ../../mod/contacts.php:367 ../../include/nav.php:130
-msgid "Contacts"
+#: ../../mod/photos.php:1019
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/contacts.php:369
-msgid "Show Blocked Connections"
+#: ../../mod/photos.php:1021
+msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/contacts.php:369
-msgid "Hide Blocked Connections"
+#: ../../mod/photos.php:1071
+msgid "View photo"
 msgstr ""
 
-#: ../../mod/contacts.php:371
-msgid "Search your contacts"
+#: ../../mod/photos.php:1071
+msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/contacts.php:409
-msgid "Mutual Friendship"
+#: ../../mod/photos.php:1072
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/contacts.php:413
-msgid "is a fan of yours"
+#: ../../mod/photos.php:1078 ../../include/conversation.php:450
+msgid "Private Message"
 msgstr ""
 
-#: ../../mod/contacts.php:417
-msgid "you are a fan of"
+#: ../../mod/photos.php:1089
+msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/contacts.php:434 ../../include/Contact.php:129
-#: ../../include/conversation.php:727
-msgid "Edit contact"
+#: ../../mod/photos.php:1157
+msgid "Tags: "
 msgstr ""
 
-#: ../../mod/settings.php:11 ../../mod/photos.php:64
-msgid "everybody"
+#: ../../mod/photos.php:1160
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/settings.php:69
-msgid "Missing some important data!"
+#: ../../mod/photos.php:1171
+msgid "New album name"
 msgstr ""
 
-#: ../../mod/settings.php:72 ../../mod/settings.php:473 ../../mod/admin.php:62
-msgid "Update"
+#: ../../mod/photos.php:1174
+msgid "Caption"
 msgstr ""
 
-#: ../../mod/settings.php:167
-msgid "Failed to connect with email account using the settings provided."
+#: ../../mod/photos.php:1176
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/settings.php:172
-msgid "Email settings updated."
+#: ../../mod/photos.php:1180
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/settings.php:190
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/photos.php:1200 ../../include/conversation.php:497
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/settings.php:195
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/photos.php:1201 ../../include/conversation.php:498
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/settings.php:206
-msgid "Password changed."
+#: ../../mod/photos.php:1202 ../../include/conversation.php:889
+msgid "Share"
 msgstr ""
 
-#: ../../mod/settings.php:208
-msgid "Password update failed. Please try again."
+#: ../../mod/photos.php:1203 ../../mod/editpost.php:100
+#: ../../mod/message.php:155 ../../mod/message.php:296
+#: ../../include/conversation.php:321 ../../include/conversation.php:652
+#: ../../include/conversation.php:906
+msgid "Please wait"
 msgstr ""
 
-#: ../../mod/settings.php:272
-msgid " Please use a shorter name."
+#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
+#: ../../mod/photos.php:1290 ../../include/conversation.php:512
+msgid "This is you"
 msgstr ""
 
-#: ../../mod/settings.php:274
-msgid " Name too short."
+#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
+#: ../../mod/photos.php:1292 ../../include/conversation.php:514
+#: ../../boot.php:443
+msgid "Comment"
 msgstr ""
 
-#: ../../mod/settings.php:280
-msgid " Not valid email."
+#: ../../mod/photos.php:1223 ../../mod/editpost.php:119
+#: ../../include/conversation.php:516 ../../include/conversation.php:924
+msgid "Preview"
 msgstr ""
 
-#: ../../mod/settings.php:282
-msgid " Cannot change to that email."
+#: ../../mod/photos.php:1320 ../../mod/settings.php:513
+#: ../../mod/group.php:154 ../../mod/admin.php:468
+#: ../../include/conversation.php:280 ../../include/conversation.php:536
+msgid "Delete"
 msgstr ""
 
-#: ../../mod/settings.php:350 ../../addon/facebook/facebook.php:320
-#: ../../addon/twitter/twitter.php:294 ../../addon/impressum/impressum.php:64
-#: ../../addon/piwik/piwik.php:94
-msgid "Settings updated."
+#: ../../mod/photos.php:1402
+msgid "View Album"
 msgstr ""
 
-#: ../../mod/settings.php:409 ../../include/nav.php:128
-msgid "Account settings"
+#: ../../mod/photos.php:1411
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/settings.php:414
-msgid "Connector settings"
+#: ../../mod/community.php:21
+msgid "Not available."
 msgstr ""
 
-#: ../../mod/settings.php:419
-msgid "Plugin settings"
+#: ../../mod/community.php:30 ../../include/nav.php:97
+msgid "Community"
 msgstr ""
 
-#: ../../mod/settings.php:424
-msgid "Connections"
+#: ../../mod/community.php:60 ../../mod/search.php:118
+msgid "No results."
 msgstr ""
 
-#: ../../mod/settings.php:429
-msgid "Export personal data"
+#: ../../mod/friendica.php:43
+msgid "This is Friendica, version"
 msgstr ""
 
-#: ../../mod/settings.php:446 ../../mod/settings.php:472
-#: ../../mod/settings.php:505
-msgid "Add application"
+#: ../../mod/friendica.php:44
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/settings.php:448 ../../mod/settings.php:474
-#: ../../mod/dfrn_request.php:685 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:45
-msgid "Cancel"
+#: ../../mod/friendica.php:46
+msgid ""
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
 msgstr ""
 
-#: ../../mod/settings.php:449 ../../mod/settings.php:475
-#: ../../mod/crepair.php:144 ../../mod/admin.php:464 ../../mod/admin.php:473
-msgid "Name"
+#: ../../mod/friendica.php:48
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/settings.php:450 ../../mod/settings.php:476
-#: ../../addon/statusnet/statusnet.php:480
-msgid "Consumer Key"
+#: ../../mod/friendica.php:49
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
+"dot com"
 msgstr ""
 
-#: ../../mod/settings.php:451 ../../mod/settings.php:477
-#: ../../addon/statusnet/statusnet.php:479
-msgid "Consumer Secret"
+#: ../../mod/friendica.php:54
+msgid "Installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/settings.php:452 ../../mod/settings.php:478
-msgid "Redirect"
+#: ../../mod/friendica.php:62
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/settings.php:453 ../../mod/settings.php:479
-msgid "Icon url"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/settings.php:464
-msgid "You can't edit this application."
+#: ../../mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: ../../mod/settings.php:504
-msgid "Connected Apps"
+#: ../../mod/editpost.php:76 ../../include/conversation.php:875
+msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/settings.php:506 ../../mod/editpost.php:90
-#: ../../include/conversation.php:496
+#: ../../mod/editpost.php:91 ../../mod/settings.php:512
+#: ../../include/conversation.php:523
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/settings.php:507 ../../mod/admin.php:468
-#: ../../mod/photos.php:1303 ../../mod/group.php:154
-#: ../../include/conversation.php:253 ../../include/conversation.php:509
-msgid "Delete"
-msgstr ""
-
-#: ../../mod/settings.php:508
-msgid "Client key starts with"
-msgstr ""
-
-#: ../../mod/settings.php:509
-msgid "No name"
-msgstr ""
-
-#: ../../mod/settings.php:510
-msgid "Remove authorization"
-msgstr ""
-
-#: ../../mod/settings.php:522
-msgid "No Plugin settings configured"
+#: ../../mod/editpost.php:92 ../../mod/message.php:153
+#: ../../mod/message.php:294 ../../include/conversation.php:890
+msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/settings.php:529 ../../addon/widgets/widgets.php:122
-msgid "Plugin Settings"
+#: ../../mod/editpost.php:93 ../../include/conversation.php:892
+msgid "Attach file"
 msgstr ""
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:543
-#, php-format
-msgid "Built-in support for %s connectivity is %s"
+#: ../../mod/editpost.php:94 ../../mod/message.php:154
+#: ../../mod/message.php:295 ../../include/conversation.php:894
+msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/settings.php:542 ../../mod/dfrn_request.php:681
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
+#: ../../mod/editpost.php:95
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:543
-msgid "enabled"
+#: ../../mod/editpost.php:96
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:543
-msgid "disabled"
+#: ../../mod/editpost.php:97
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/settings.php:543
-msgid "StatusNet"
+#: ../../mod/editpost.php:98 ../../include/conversation.php:900
+msgid "Set your location"
 msgstr ""
 
-#: ../../mod/settings.php:569
-msgid "Connector Settings"
+#: ../../mod/editpost.php:99 ../../include/conversation.php:902
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/settings.php:575
-msgid "Email/Mailbox Setup"
+#: ../../mod/editpost.php:101 ../../include/conversation.php:907
+msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/settings.php:576
-msgid ""
-"If you wish to communicate with email contacts using this service "
-"(optional), please specify how to connect to your mailbox."
+#: ../../mod/editpost.php:109 ../../include/conversation.php:916
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/settings.php:577
-msgid "Last successful email check:"
+#: ../../mod/editpost.php:110 ../../include/conversation.php:917
+msgid "Public post"
 msgstr ""
 
-#: ../../mod/settings.php:578
-msgid "Email access is disabled on this site."
+#: ../../mod/editpost.php:113 ../../include/conversation.php:905
+msgid "Set title"
 msgstr ""
 
-#: ../../mod/settings.php:579
-msgid "IMAP server name:"
+#: ../../mod/editpost.php:114 ../../include/conversation.php:919
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/settings.php:580
-msgid "IMAP port:"
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/settings.php:581
-msgid "Security:"
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/settings.php:581
-msgid "None"
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/settings.php:582
-msgid "Email login name:"
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/settings.php:583
-msgid "Email password:"
-msgstr ""
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#, 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/settings.php:584
-msgid "Reply-to address:"
+#: ../../mod/dfrn_request.php:167
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/settings.php:585
-msgid "Send public posts to all email contacts:"
+#: ../../mod/dfrn_request.php:191
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/settings.php:642 ../../mod/admin.php:126 ../../mod/admin.php:443
-msgid "Normal Account"
+#: ../../mod/dfrn_request.php:219
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/settings.php:643
-msgid "This account is a normal personal profile"
+#: ../../mod/dfrn_request.php:244
+#, php-format
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/settings.php:646 ../../mod/admin.php:127 ../../mod/admin.php:444
-msgid "Soapbox Account"
+#: ../../mod/dfrn_request.php:245
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/settings.php:647
-msgid "Automatically approve all connection/friend requests as read-only fans"
+#: ../../mod/dfrn_request.php:246
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/admin.php:128 ../../mod/admin.php:445
-msgid "Community/Celebrity Account"
+#: ../../mod/dfrn_request.php:306
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/settings.php:651
-msgid "Automatically approve all connection/friend requests as read-write fans"
+#: ../../mod/dfrn_request.php:326
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/settings.php:654 ../../mod/admin.php:129 ../../mod/admin.php:446
-msgid "Automatic Friend Account"
+#: ../../mod/dfrn_request.php:339
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/settings.php:655
-msgid "Automatically approve all connection/friend requests as friends"
+#: ../../mod/dfrn_request.php:343
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/settings.php:665
-msgid "OpenID:"
+#: ../../mod/dfrn_request.php:364
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/settings.php:665
-msgid "(Optional) Allow this OpenID to login to this account."
+#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/settings.php:675
-msgid "Publish your default profile in your local site directory?"
+#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/settings.php:675 ../../mod/settings.php:681
-#: ../../mod/settings.php:689 ../../mod/settings.php:693
-#: ../../mod/settings.php:698 ../../mod/settings.php:704
-#: ../../mod/settings.php:710 ../../mod/settings.php:757
-#: ../../mod/settings.php:758 ../../mod/settings.php:759
-#: ../../mod/settings.php:760 ../../mod/dfrn_request.php:676
-#: ../../mod/profiles.php:358 ../../mod/register.php:525 ../../mod/api.php:106
-msgid "No"
+#: ../../mod/dfrn_request.php:460
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/settings.php:675 ../../mod/settings.php:681
-#: ../../mod/settings.php:689 ../../mod/settings.php:693
-#: ../../mod/settings.php:698 ../../mod/settings.php:704
-#: ../../mod/settings.php:710 ../../mod/settings.php:757
-#: ../../mod/settings.php:758 ../../mod/settings.php:759
-#: ../../mod/settings.php:760 ../../mod/dfrn_request.php:675
-#: ../../mod/profiles.php:357 ../../mod/register.php:524 ../../mod/api.php:105
-msgid "Yes"
+#: ../../mod/dfrn_request.php:513
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/settings.php:681
-msgid "Publish your default profile in the global social directory?"
+#: ../../mod/dfrn_request.php:527
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/settings.php:689
-msgid "Hide your contact/friend list from viewers of your default profile?"
+#: ../../mod/dfrn_request.php:539
+#, php-format
+msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/settings.php:693
-msgid "Hide your profile details from unknown viewers?"
+#: ../../mod/dfrn_request.php:540
+#, php-format
+msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/settings.php:698
-msgid "Allow friends to post to your profile page?"
+#: ../../mod/dfrn_request.php:541
+msgid "Confirm"
 msgstr ""
 
-#: ../../mod/settings.php:704
-msgid "Allow friends to tag your posts?"
+#: ../../mod/dfrn_request.php:581 ../../include/items.php:2443
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/settings.php:710
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/dfrn_request.php:665
+#, php-format
+msgid ""
+"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
+"your Diaspora search bar."
 msgstr ""
 
-#: ../../mod/settings.php:719
-msgid "Profile is <strong>not published</strong>."
+#: ../../mod/dfrn_request.php:668
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"social networks:"
 msgstr ""
 
-#: ../../mod/settings.php:738 ../../mod/profile_photo.php:206
-msgid "or"
+#: ../../mod/dfrn_request.php:671
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/settings.php:743
-msgid "Your Identity Address is"
+#: ../../mod/dfrn_request.php:672
+msgid ""
+"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
+"testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/settings.php:754
-msgid "Automatically expire posts after days:"
+#: ../../mod/dfrn_request.php:673
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/settings.php:754
-msgid "If empty, posts will not expire. Expired posts will be deleted"
+#: ../../mod/dfrn_request.php:674
+#, php-format
+msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/settings.php:755
-msgid "Advanced expiration settings"
+#: ../../mod/dfrn_request.php:677
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/settings.php:756
-msgid "Advanced Expiration"
+#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:76
+msgid "Friendica"
 msgstr ""
 
-#: ../../mod/settings.php:757
-msgid "Expire posts:"
+#: ../../mod/dfrn_request.php:680
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/settings.php:758
-msgid "Expire personal notes:"
+#: ../../mod/dfrn_request.php:681 ../../mod/settings.php:548
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/settings.php:759
-msgid "Expire starred posts:"
+#: ../../mod/dfrn_request.php:682
+msgid "- please share from your own site as noted above"
 msgstr ""
 
-#: ../../mod/settings.php:760
-msgid "Expire photos:"
+#: ../../mod/dfrn_request.php:683
+msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/settings.php:765
-msgid "Account Settings"
+#: ../../mod/dfrn_request.php:684
+msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/settings.php:773
-msgid "Password Settings"
+#: ../../mod/install.php:111
+msgid "Friendica Social Communications Server - Setup"
 msgstr ""
 
-#: ../../mod/settings.php:774
-msgid "New Password:"
+#: ../../mod/install.php:117 ../../mod/install.php:157
+#: ../../mod/install.php:230
+msgid "Database connection"
 msgstr ""
 
-#: ../../mod/settings.php:775
-msgid "Confirm:"
+#: ../../mod/install.php:124
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/settings.php:775
-msgid "Leave password fields blank unless changing"
+#: ../../mod/install.php:128
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/settings.php:779
-msgid "Basic Settings"
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/settings.php:780 ../../include/profile_advanced.php:15
-msgid "Full Name:"
+#: ../../mod/install.php:134
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/settings.php:781
-msgid "Email Address:"
+#: ../../mod/install.php:135 ../../mod/install.php:151
+#: ../../mod/install.php:209
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/settings.php:782
-msgid "Your Timezone:"
+#: ../../mod/install.php:137
+msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/settings.php:783
-msgid "Default Post Location:"
+#: ../../mod/install.php:143
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/settings.php:784
-msgid "Use Browser Location:"
+#: ../../mod/install.php:150
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/settings.php:785
-msgid "Display Theme:"
+#: ../../mod/install.php:158
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/settings.php:786
-msgid "Update browser every xx seconds"
+#: ../../mod/install.php:206
+msgid "System check"
 msgstr ""
 
-#: ../../mod/settings.php:786
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../mod/install.php:211
+msgid "Check again"
 msgstr ""
 
-#: ../../mod/settings.php:788
-msgid "Security and Privacy Settings"
+#: ../../mod/install.php:231
+msgid ""
+"In order to install Friendica we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/settings.php:790
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/install.php:232
+msgid ""
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/settings.php:790
-msgid "(to prevent spam abuse)"
+#: ../../mod/install.php:233
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/settings.php:791
-msgid "Default Post Permissions"
+#: ../../mod/install.php:237
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/settings.php:792
-msgid "(click to open/close)"
+#: ../../mod/install.php:238
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/settings.php:807
-msgid "Notification Settings"
+#: ../../mod/install.php:239
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/settings.php:808
-msgid "Send a notification email when:"
+#: ../../mod/install.php:240
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/settings.php:809
-msgid "You receive an introduction"
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/settings.php:810
-msgid "Your introductions are confirmed"
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../mod/settings.php:811
-msgid "Someone writes on your profile wall"
+#: ../../mod/install.php:245 ../../mod/install.php:283
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/settings.php:812
-msgid "Someone writes a followup comment"
+#: ../../mod/install.php:270
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/settings.php:813
-msgid "You receive a private message"
+#: ../../mod/install.php:323
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/settings.php:814
-msgid "You receive a friend suggestion"
+#: ../../mod/install.php:326
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/settings.php:817
-msgid "Advanced Page Settings"
+#: ../../mod/install.php:326
+msgid "Enter full path to php executable"
 msgstr ""
 
-#: ../../mod/crepair.php:100
-msgid "Contact settings applied."
+#: ../../mod/install.php:331
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/crepair.php:102
-msgid "Contact update failed."
+#: ../../mod/install.php:340
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:116
-msgid "Contact not found."
+#: ../../mod/install.php:341
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/crepair.php:133
-msgid "Repair Contact Settings"
+#: ../../mod/install.php:343
+msgid "PHP \"register_argc_argv\""
 msgstr ""
 
-#: ../../mod/crepair.php:135
+#: ../../mod/install.php:364
 msgid ""
-"<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
-"information your communications with this contact may stop working."
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/crepair.php:136
+#: ../../mod/install.php:365
 msgid ""
-"Please use your browser 'Back' button <strong>now</strong> if you are "
-"uncertain what to do on this page."
-msgstr ""
-
-#: ../../mod/crepair.php:145
-msgid "Account Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:146
-msgid "@Tagname - overrides Name/Nickname"
-msgstr ""
-
-#: ../../mod/crepair.php:147
-msgid "Account URL"
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/crepair.php:148
-msgid "Friend Request URL"
+#: ../../mod/install.php:367
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/crepair.php:149
-msgid "Friend Confirm URL"
+#: ../../mod/install.php:374
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/crepair.php:150
-msgid "Notification Endpoint URL"
+#: ../../mod/install.php:375
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/crepair.php:151
-msgid "Poll/Feed URL"
+#: ../../mod/install.php:376
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/crepair.php:152
-msgid "New photo from this URL"
+#: ../../mod/install.php:377
+msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
+#: ../../mod/install.php:378
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
-msgid "Profile location is not valid or does not contain profile information."
+#: ../../mod/install.php:383 ../../mod/install.php:385
+msgid "Apace mod_rewrite module"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
-msgid "Warning: profile location has no identifiable owner name."
+#: ../../mod/install.php:383
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
-msgid "Warning: profile location has no profile photo."
+#: ../../mod/install.php:390
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
-#, 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:167
-msgid "Introduction complete."
+#: ../../mod/install.php:394
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:191
-msgid "Unrecoverable protocol error."
+#: ../../mod/install.php:398
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:219
-msgid "Profile unavailable."
+#: ../../mod/install.php:402
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:244
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../mod/install.php:406
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:245
-msgid "Spam protection measures have been invoked."
+#: ../../mod/install.php:423
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:246
-msgid "Friends are advised to please try again in 24 hours."
+#: ../../mod/install.php:424
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:306
-msgid "Invalid locator"
+#: ../../mod/install.php:425
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:326
-msgid "Unable to resolve your name at the provided location."
+#: ../../mod/install.php:426
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:339
-msgid "You have already introduced yourself here."
+#: ../../mod/install.php:429
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:343
-#, php-format
-msgid "Apparently you are already friends with %s."
+#: ../../mod/install.php:436
+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/dfrn_request.php:364
-msgid "Invalid profile URL."
+#: ../../mod/install.php:461
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:460
-msgid "Your introduction has been sent."
+#: ../../mod/localtime.php:12 ../../include/event.php:11
+#: ../../include/bb2diaspora.php:249
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:513
-msgid "Please login to confirm introduction."
+#: ../../mod/localtime.php:24
+msgid "Time Conversion"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:527
+#: ../../mod/localtime.php:26
 msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
+"Friendika provides this service for sharing events with other networks and "
+"friends in unknown timezones."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:539
+#: ../../mod/localtime.php:30
 #, php-format
-msgid "Welcome home %s."
+msgid "UTC time: %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:540
+#: ../../mod/localtime.php:33
 #, php-format
-msgid "Please confirm your introduction/connection request to %s."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:541
-msgid "Confirm"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:581 ../../include/items.php:2406
-msgid "[Name Withheld]"
+msgid "Current timezone: %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:665
+#: ../../mod/localtime.php:36
 #, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:668
-msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:671
-msgid "Friend/Connection Request"
+msgid "Converted localtime: %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:672
-msgid ""
-"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
-"testuser@identi.ca"
+#: ../../mod/localtime.php:41
+msgid "Please select your timezone:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:673
-msgid "Please answer the following:"
+#: ../../mod/match.php:12
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:674
-#, php-format
-msgid "Does %s know you?"
+#: ../../mod/match.php:20
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:677
-msgid "Add a personal note:"
+#: ../../mod/match.php:57
+msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:76
-msgid "Friendica"
+#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../include/contact_widgets.php:9 ../../boot.php:926
+msgid "Connect"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:680
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:682
-msgid "- please share from your own site as noted above"
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:683
-msgid "Your Identity Address:"
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:684
-msgid "Submit Request"
+#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
 #: ../../mod/notifications.php:26
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:150
-#: ../../mod/notifications.php:195
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:152
+#: ../../mod/notifications.php:198
 msgid "Discard"
 msgstr ""
 
+#: ../../mod/notifications.php:47 ../../mod/notifications.php:151
+#: ../../mod/notifications.php:197 ../../mod/contacts.php:302
+#: ../../mod/contacts.php:345
+msgid "Ignore"
+msgstr ""
+
 #: ../../mod/notifications.php:71 ../../include/nav.php:109
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../mod/network.php:169
+#: ../../mod/notifications.php:76 ../../mod/network.php:177
 msgid "Personal"
 msgstr ""
 
@@ -1229,7 +1178,7 @@ msgid "Introductions"
 msgstr ""
 
 #: ../../mod/notifications.php:91 ../../mod/message.php:76
-#: ../../include/nav.php:122
+#: ../../include/nav.php:123
 msgid "Messages"
 msgstr ""
 
@@ -1241,7 +1190,7 @@ msgstr ""
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:136 ../../mod/notifications.php:180
+#: ../../mod/notifications.php:136 ../../mod/notifications.php:182
 msgid "Notification type: "
 msgstr ""
 
@@ -1254,1296 +1203,1513 @@ msgstr ""
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:146 ../../mod/notifications.php:192
+#: ../../mod/notifications.php:144 ../../mod/notifications.php:191
+#: ../../mod/contacts.php:350
+msgid "Hide this contact from others"
+msgstr ""
+
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:192
+msgid "Post a new friend activity"
+msgstr ""
+
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:192
+msgid "if applicable"
+msgstr ""
+
+#: ../../mod/notifications.php:148 ../../mod/notifications.php:195
 #: ../../mod/admin.php:466
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:166
+#: ../../mod/notifications.php:168
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:166
+#: ../../mod/notifications.php:168
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:166
+#: ../../mod/notifications.php:168
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:175
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:174
+#: ../../mod/notifications.php:176
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:175
+#: ../../mod/notifications.php:177
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:175
+#: ../../mod/notifications.php:177
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:183
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:183
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:201
+#: ../../mod/notifications.php:204
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:204 ../../mod/notifications.php:290
-#: ../../mod/notifications.php:385 ../../mod/notifications.php:466
+#: ../../mod/notifications.php:207 ../../mod/notifications.php:293
+#: ../../mod/notifications.php:388 ../../mod/notifications.php:469
 #: ../../include/nav.php:118
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:241 ../../mod/notifications.php:336
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:244 ../../mod/notifications.php:339
+#: ../../mod/notifications.php:426
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:250 ../../mod/notifications.php:345
-#: ../../mod/notifications.php:432
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:348
+#: ../../mod/notifications.php:435
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:264 ../../mod/notifications.php:359
-#: ../../mod/notifications.php:446
+#: ../../mod/notifications.php:267 ../../mod/notifications.php:362
+#: ../../mod/notifications.php:449
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:271 ../../mod/notifications.php:366
+#: ../../mod/notifications.php:274 ../../mod/notifications.php:369
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:272 ../../mod/notifications.php:367
-#: ../../mod/notifications.php:455
+#: ../../mod/notifications.php:275 ../../mod/notifications.php:370
+#: ../../mod/notifications.php:458
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:286
+#: ../../mod/notifications.php:289
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:381
+#: ../../mod/notifications.php:384
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:462
+#: ../../mod/notifications.php:465
 msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
+#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/message.php:26
-msgid "Unable to locate contact information."
+#: ../../mod/contacts.php:77
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
+#: ../../mod/contacts.php:100
+msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/message.php:32
-msgid "Message collection failure."
+#: ../../mod/contacts.php:165
+msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/message.php:35
-msgid "Message sent."
+#: ../../mod/contacts.php:165
+msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/message.php:55
-msgid "Inbox"
+#: ../../mod/contacts.php:179
+msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/message.php:60
-msgid "Outbox"
+#: ../../mod/contacts.php:179
+msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/message.php:65
-msgid "New Message"
+#: ../../mod/contacts.php:200
+msgid "stopped following"
 msgstr ""
 
-#: ../../mod/message.php:91
-msgid "Message deleted."
+#: ../../mod/contacts.php:221
+msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/message.php:121
-msgid "Conversation removed."
+#: ../../mod/contacts.php:245
+#, php-format
+msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/message.php:137 ../../include/conversation.php:815
-msgid "Please enter a link URL:"
+#: ../../mod/contacts.php:249
+#, php-format
+msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/message.php:145
-msgid "Send Private Message"
+#: ../../mod/contacts.php:254
+#, php-format
+msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/message.php:146 ../../mod/message.php:287
-msgid "To:"
+#: ../../mod/contacts.php:271
+msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/message.php:147 ../../mod/message.php:288
-msgid "Subject:"
+#: ../../mod/contacts.php:274
+msgid "Never"
 msgstr ""
 
-#: ../../mod/message.php:150 ../../mod/message.php:291
-#: ../../mod/invite.php:101
-msgid "Your message:"
+#: ../../mod/contacts.php:278
+msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/message.php:153 ../../mod/message.php:294
-#: ../../mod/editpost.php:91 ../../include/conversation.php:863
-msgid "Upload photo"
+#: ../../mod/contacts.php:278
+msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/message.php:154 ../../mod/message.php:295
-#: ../../mod/editpost.php:93 ../../include/conversation.php:867
-msgid "Insert web link"
+#: ../../mod/contacts.php:280
+msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../mod/editpost.php:99 ../../mod/photos.php:1186
-#: ../../include/conversation.php:294 ../../include/conversation.php:631
-#: ../../include/conversation.php:879
-msgid "Please wait"
+#: ../../mod/contacts.php:284
+#, php-format
+msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/message.php:188
-msgid "No messages."
+#: ../../mod/contacts.php:287
+#, php-format
+msgid "%d contact in common"
+msgid_plural "%d contacts in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/contacts.php:292
+msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/message.php:201
-msgid "Delete conversation"
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
+#: ../../mod/admin.php:470
+msgid "Unblock"
 msgstr ""
 
-#: ../../mod/message.php:204
-msgid "D, d M Y - g:i A"
+#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
+#: ../../mod/admin.php:469
+msgid "Block"
 msgstr ""
 
-#: ../../mod/message.php:239
-msgid "Message not available."
+#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+msgid "Unignore"
 msgstr ""
 
-#: ../../mod/message.php:276
-msgid "Delete message"
+#: ../../mod/contacts.php:307
+msgid "Repair"
 msgstr ""
 
-#: ../../mod/message.php:286
-msgid "Send Reply"
+#: ../../mod/contacts.php:317
+msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:113
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/contacts.php:320
+msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:122
-#: ../../mod/photos.php:649
-msgid "Unable to process image."
+#: ../../mod/contacts.php:321
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90
-#: ../../mod/wall_upload.php:97 ../../mod/item.php:318
-#: ../../include/message.php:143
-msgid "Wall Photos"
+#: ../../mod/contacts.php:322
+msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/wall_upload.php:84 ../../mod/profile_photo.php:251
-#: ../../mod/photos.php:669
-msgid "Image upload failed."
+#: ../../mod/contacts.php:323
+msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/contacts.php:328 ../../mod/contacts.php:458
+#: ../../mod/viewcontacts.php:61
 #, php-format
-msgid "File exceeds size limit of %d"
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
-msgid "File upload failed."
+#: ../../mod/contacts.php:329
+msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/contacts.php:330
+msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
-#: ../../mod/register.php:327 ../../mod/register.php:334
-#: ../../mod/register.php:341 ../../mod/photos.php:146
-#: ../../mod/photos.php:593 ../../mod/photos.php:938 ../../mod/photos.php:953
-#: ../../addon/communityhome/communityhome.php:111
-msgid "Profile Photos"
+#: ../../mod/contacts.php:331
+msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: ../../mod/contacts.php:332
+msgid "View conversations"
 msgstr ""
 
-#: ../../mod/profile_photo.php:89
+#: ../../mod/contacts.php:334
+msgid "Delete contact"
+msgstr ""
+
+#: ../../mod/contacts.php:338
+msgid "Last update:"
+msgstr ""
+
+#: ../../mod/contacts.php:339
+msgid "Update public posts"
+msgstr ""
+
+#: ../../mod/contacts.php:341 ../../mod/admin.php:701
+msgid "Update now"
+msgstr ""
+
+#: ../../mod/contacts.php:348
+msgid "Currently blocked"
+msgstr ""
+
+#: ../../mod/contacts.php:349
+msgid "Currently ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:350
 msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/profile_photo.php:99
-msgid "Unable to process image"
+#: ../../mod/contacts.php:387 ../../include/nav.php:131
+msgid "Contacts"
 msgstr ""
 
-#: ../../mod/profile_photo.php:203
-msgid "Upload File:"
+#: ../../mod/contacts.php:389
+msgid "Show Unblocked Contacts"
 msgstr ""
 
-#: ../../mod/profile_photo.php:204
-msgid "Upload Profile Photo"
+#: ../../mod/contacts.php:389
+msgid "Show Blocked Contacts"
 msgstr ""
 
-#: ../../mod/profile_photo.php:205
-msgid "Upload"
+#: ../../mod/contacts.php:391
+msgid "Show All Contacts"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
-msgid "skip this step"
+#: ../../mod/contacts.php:393
+msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
-msgid "select a photo from your photo albums"
+#: ../../mod/contacts.php:394 ../../mod/directory.php:65
+msgid "Finding: "
 msgstr ""
 
-#: ../../mod/profile_photo.php:219
-msgid "Crop Image"
+#: ../../mod/contacts.php:395 ../../mod/directory.php:67
+#: ../../include/contact_widgets.php:34
+msgid "Find"
 msgstr ""
 
-#: ../../mod/profile_photo.php:220
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../mod/contacts.php:434
+msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/profile_photo.php:221
-msgid "Done Editing"
+#: ../../mod/contacts.php:438
+msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/profile_photo.php:249
-msgid "Image uploaded successfully."
+#: ../../mod/contacts.php:442
+msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/manage.php:37
+#: ../../mod/contacts.php:459 ../../include/Contact.php:135
+#: ../../include/conversation.php:748
+msgid "Edit contact"
+msgstr ""
+
+#: ../../mod/lostpass.php:16
+msgid "No valid account found."
+msgstr ""
+
+#: ../../mod/lostpass.php:31
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../mod/lostpass.php:42
 #, php-format
-msgid "Welcome back %s"
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
+#: ../../mod/register.php:380 ../../mod/register.php:434
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716
+#: ../../include/items.php:2452
+msgid "Administrator"
 msgstr ""
 
-#: ../../mod/manage.php:90
+#: ../../mod/lostpass.php:64
 msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/lostpass.php:82 ../../boot.php:719
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/tagger.php:70 ../../mod/like.php:127 ../../mod/photos.php:524
-#: ../../include/conversation.php:31 ../../include/conversation.php:104
-#: ../../include/diaspora.php:1554
-#: ../../addon/communityhome/communityhome.php:163
-msgid "photo"
+#: ../../mod/lostpass.php:83
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/tagger.php:70 ../../mod/like.php:127
-#: ../../include/conversation.php:26 ../../include/conversation.php:35
-#: ../../include/conversation.php:99 ../../include/conversation.php:108
-#: ../../include/diaspora.php:1554 ../../addon/facebook/facebook.php:1084
-#: ../../addon/communityhome/communityhome.php:158
-#: ../../addon/communityhome/communityhome.php:167
-msgid "status"
+#: ../../mod/lostpass.php:84
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:116
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../mod/lostpass.php:85
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/common.php:34
-msgid "Common Friends"
+#: ../../mod/lostpass.php:86
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/common.php:42
-msgid "No friends in common."
+#: ../../mod/lostpass.php:87
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/lostpass.php:118
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/lostpass.php:119
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:198
-msgid "Profile updated."
+#: ../../mod/lostpass.php:120
+msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/profiles.php:256
-msgid "Profile deleted."
+#: ../../mod/lostpass.php:121
+msgid "Reset"
 msgstr ""
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
-msgid "Profile-"
+#: ../../mod/settings.php:70
+msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
-msgid "New profile created."
+#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:62
+msgid "Update"
 msgstr ""
 
-#: ../../mod/profiles.php:309
-msgid "Profile unavailable to clone."
+#: ../../mod/settings.php:168
+msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/profiles.php:356
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: ../../mod/settings.php:173
+msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/profiles.php:374
-msgid "Edit Profile Details"
+#: ../../mod/settings.php:191
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/profiles.php:376
-msgid "View this profile"
+#: ../../mod/settings.php:196
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/profiles.php:377
-msgid "Create a new profile using these settings"
+#: ../../mod/settings.php:207
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/profiles.php:378
-msgid "Clone this profile"
+#: ../../mod/settings.php:209
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/profiles.php:379
-msgid "Delete this profile"
+#: ../../mod/settings.php:273
+msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/profiles.php:380
-msgid "Profile Name:"
+#: ../../mod/settings.php:275
+msgid " Name too short."
 msgstr ""
 
-#: ../../mod/profiles.php:381
-msgid "Your Full Name:"
+#: ../../mod/settings.php:281
+msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/profiles.php:382
-msgid "Title/Description:"
+#: ../../mod/settings.php:283
+msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/profiles.php:383
-msgid "Your Gender:"
+#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:320
+#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94
+#: ../../addon/twitter/twitter.php:310
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/profiles.php:384
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/settings.php:415 ../../include/nav.php:129
+msgid "Account settings"
 msgstr ""
 
-#: ../../mod/profiles.php:385
-msgid "Street Address:"
+#: ../../mod/settings.php:420
+msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/profiles.php:386
-msgid "Locality/City:"
+#: ../../mod/settings.php:425
+msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/profiles.php:387
-msgid "Postal/Zip Code:"
+#: ../../mod/settings.php:430
+msgid "Connections"
 msgstr ""
 
-#: ../../mod/profiles.php:388
-msgid "Country:"
+#: ../../mod/settings.php:435
+msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/profiles.php:389
-msgid "Region/State:"
+#: ../../mod/settings.php:452 ../../mod/settings.php:478
+#: ../../mod/settings.php:511
+msgid "Add application"
 msgstr ""
 
-#: ../../mod/profiles.php:390
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: ../../mod/settings.php:456 ../../mod/settings.php:482
+#: ../../addon/statusnet/statusnet.php:489
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/profiles.php:391
-msgid "Who: (if applicable)"
+#: ../../mod/settings.php:457 ../../mod/settings.php:483
+#: ../../addon/statusnet/statusnet.php:488
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/profiles.php:392
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/settings.php:458 ../../mod/settings.php:484
+msgid "Redirect"
 msgstr ""
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
-msgid "Sexual Preference:"
+#: ../../mod/settings.php:459 ../../mod/settings.php:485
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/profiles.php:394
-msgid "Homepage URL:"
+#: ../../mod/settings.php:470
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47
-msgid "Political Views:"
+#: ../../mod/settings.php:510
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/profiles.php:396
-msgid "Religious Views:"
+#: ../../mod/settings.php:514
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/profiles.php:397
-msgid "Public Keywords:"
+#: ../../mod/settings.php:515
+msgid "No name"
 msgstr ""
 
-#: ../../mod/profiles.php:398
-msgid "Private Keywords:"
+#: ../../mod/settings.php:516
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/profiles.php:399
-msgid "Example: fishing photography software"
+#: ../../mod/settings.php:528
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/profiles.php:400
-msgid "(Used for suggesting potential friends, can be seen by others)"
+#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/profiles.php:401
-msgid "(Used for searching profiles, never shown to others)"
+#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#, php-format
+msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/profiles.php:402
-msgid "Tell us about yourself..."
+#: ../../mod/settings.php:548 ../../mod/settings.php:549
+msgid "enabled"
 msgstr ""
 
-#: ../../mod/profiles.php:403
-msgid "Hobbies/Interests"
+#: ../../mod/settings.php:548 ../../mod/settings.php:549
+msgid "disabled"
 msgstr ""
 
-#: ../../mod/profiles.php:404
-msgid "Contact information and Social Networks"
+#: ../../mod/settings.php:549
+msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/profiles.php:405
-msgid "Musical interests"
+#: ../../mod/settings.php:575
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/profiles.php:406
-msgid "Books, literature"
+#: ../../mod/settings.php:581
+msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/profiles.php:407
-msgid "Television"
+#: ../../mod/settings.php:582
+msgid ""
+"If you wish to communicate with email contacts using this service "
+"(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/profiles.php:408
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/settings.php:583
+msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/profiles.php:409
-msgid "Love/romance"
+#: ../../mod/settings.php:584
+msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/profiles.php:410
-msgid "Work/employment"
+#: ../../mod/settings.php:585
+msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/profiles.php:411
-msgid "School/education"
+#: ../../mod/settings.php:586
+msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/profiles.php:416
-msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+#: ../../mod/settings.php:587
+msgid "Security:"
 msgstr ""
 
-#: ../../mod/profiles.php:461
-msgid "Edit/Manage Profiles"
+#: ../../mod/settings.php:587
+msgid "None"
 msgstr ""
 
-#: ../../mod/profiles.php:462 ../../boot.php:927
-msgid "Change profile photo"
+#: ../../mod/settings.php:588
+msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/profiles.php:463 ../../boot.php:928
-msgid "Create New Profile"
+#: ../../mod/settings.php:589
+msgid "Email password:"
 msgstr ""
 
-#: ../../mod/profiles.php:473 ../../boot.php:938
-msgid "Profile Image"
+#: ../../mod/settings.php:590
+msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/profiles.php:475 ../../boot.php:941
-msgid "visible to everybody"
+#: ../../mod/settings.php:591
+msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/profiles.php:476 ../../boot.php:942
-msgid "Edit visibility"
+#: ../../mod/settings.php:648 ../../mod/admin.php:126 ../../mod/admin.php:443
+msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122
-#: ../../include/auth.php:147 ../../include/auth.php:201
-msgid "Login failed."
+#: ../../mod/settings.php:649
+msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/openid.php:79 ../../include/auth.php:217
-msgid "Welcome "
+#: ../../mod/settings.php:652 ../../mod/admin.php:127 ../../mod/admin.php:444
+msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/openid.php:80 ../../include/auth.php:218
-msgid "Please upload a profile photo."
+#: ../../mod/settings.php:653
+msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/openid.php:83 ../../include/auth.php:221
-msgid "Welcome back "
+#: ../../mod/settings.php:656 ../../mod/admin.php:128 ../../mod/admin.php:445
+msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:237
-msgid "l F d, Y \\@ g:i A"
+#: ../../mod/settings.php:657
+msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/localtime.php:24
-msgid "Time Conversion"
+#: ../../mod/settings.php:660 ../../mod/admin.php:129 ../../mod/admin.php:446
+msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/localtime.php:26
-msgid ""
-"Friendika provides this service for sharing events with other networks and "
-"friends in unknown timezones."
+#: ../../mod/settings.php:661
+msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/localtime.php:30
-#, php-format
-msgid "UTC time: %s"
+#: ../../mod/settings.php:671
+msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/localtime.php:33
-#, php-format
-msgid "Current timezone: %s"
+#: ../../mod/settings.php:671
+msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/localtime.php:36
-#, php-format
-msgid "Converted localtime: %s"
+#: ../../mod/settings.php:681
+msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/localtime.php:41
-msgid "Please select your timezone:"
+#: ../../mod/settings.php:687
+msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/invite.php:35
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../mod/settings.php:695
+msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
+#: ../../mod/settings.php:699
+msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/invite.php:69
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../mod/settings.php:704
+msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/invite.php:73
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../mod/settings.php:710
+msgid "Allow friends to tag your posts?"
+msgstr ""
 
-#: ../../mod/invite.php:92
-msgid "You have no more invitations available"
+#: ../../mod/settings.php:716
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
+#: ../../mod/settings.php:725
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
+#: ../../mod/settings.php:744 ../../mod/profile_photo.php:206
+msgid "or"
 msgstr ""
 
-#: ../../mod/invite.php:102
-#, php-format
-msgid "Please join my social network on %s"
+#: ../../mod/settings.php:749
+msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
+#: ../../mod/settings.php:760
+msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/invite.php:104
-msgid "You will need to supply this invitation code: $invite_code"
+#: ../../mod/settings.php:760
+msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/invite.php:104
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/settings.php:761
+msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/register.php:62
-msgid "An invitation is required."
+#: ../../mod/settings.php:762
+msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/register.php:67
-msgid "Invitation could not be verified."
+#: ../../mod/settings.php:763
+msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/register.php:75
-msgid "Invalid OpenID url"
+#: ../../mod/settings.php:764
+msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/register.php:90
-msgid "Please enter the required information."
+#: ../../mod/settings.php:765
+msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/register.php:104
-msgid "Please use a shorter name."
+#: ../../mod/settings.php:766
+msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/register.php:106
-msgid "Name too short."
+#: ../../mod/settings.php:771
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/register.php:121
-msgid "That doesn't appear to be your full (First Last) name."
+#: ../../mod/settings.php:779
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/register.php:126
-msgid "Your email domain is not among those allowed on this site."
+#: ../../mod/settings.php:780
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/register.php:129
-msgid "Not a valid email address."
+#: ../../mod/settings.php:781
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/register.php:139
-msgid "Cannot use that email."
+#: ../../mod/settings.php:781
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/register.php:145
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+#: ../../mod/settings.php:785
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/register.php:151 ../../mod/register.php:252
-msgid "Nickname is already registered. Please choose another."
+#: ../../mod/settings.php:786 ../../include/profile_advanced.php:15
+msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/register.php:170
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../mod/settings.php:787
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/register.php:238
-msgid "An error occurred during registration. Please try again."
+#: ../../mod/settings.php:788
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/register.php:274
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../mod/settings.php:789
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/register.php:378 ../../mod/regmod.php:52
-#, php-format
-msgid "Registration details for %s"
+#: ../../mod/settings.php:790
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:710
-#: ../../include/items.php:2415
-msgid "Administrator"
+#: ../../mod/settings.php:791
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/register.php:386
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: ../../mod/settings.php:792
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/register.php:390
-msgid "Failed to send email message. Here is the message that failed."
+#: ../../mod/settings.php:792
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/register.php:395
-msgid "Your registration can not be processed."
+#: ../../mod/settings.php:794
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/register.php:432
-#, php-format
-msgid "Registration request at %s"
+#: ../../mod/settings.php:796
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/register.php:441
-msgid "Your registration is pending approval by the site owner."
+#: ../../mod/settings.php:796
+msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/register.php:479
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
+#: ../../mod/settings.php:797
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/register.php:505
-msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+#: ../../mod/settings.php:798
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/register.php:506
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: ../../mod/settings.php:813
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/register.php:507
-msgid "Your OpenID (optional): "
+#: ../../mod/settings.php:814
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/register.php:521
-msgid "Include your profile in member directory?"
+#: ../../mod/settings.php:815
+msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/register.php:536
-msgid "Membership on this site is by invitation only."
+#: ../../mod/settings.php:816
+msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/register.php:537
-msgid "Your invitation ID: "
+#: ../../mod/settings.php:817
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/register.php:540 ../../mod/admin.php:297
-msgid "Registration"
+#: ../../mod/settings.php:818
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/register.php:548
-msgid "Your Full Name (e.g. Joe Smith): "
+#: ../../mod/settings.php:819
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/register.php:549
-msgid "Your Email Address: "
+#: ../../mod/settings.php:820
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/register.php:550
+#: ../../mod/settings.php:821
+msgid "You are tagged in a post"
+msgstr ""
+
+#: ../../mod/settings.php:824
+msgid "Advanced Page Settings"
+msgstr ""
+
+#: ../../mod/manage.php:90
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: ../../mod/manage.php:93
 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>'."
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../mod/register.php:551
-msgid "Choose a nickname: "
+#: ../../mod/manage.php:95
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:684
-msgid "Register"
+#: ../../mod/network.php:43
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/apps.php:4
-msgid "Applications"
+#: ../../mod/network.php:77 ../../mod/search.php:16
+msgid "Remove term"
 msgstr ""
 
-#: ../../mod/apps.php:7
-msgid "No installed applications."
+#: ../../mod/network.php:86 ../../mod/search.php:13
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/hcard.php:10
-msgid "No profile"
+#: ../../mod/network.php:87 ../../include/group.php:216
+msgid "add"
 msgstr ""
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
+#: ../../mod/network.php:166
+msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
+#: ../../mod/network.php:171
+msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/fsuggest.php:99
+#: ../../mod/network.php:182
+msgid "New"
+msgstr ""
+
+#: ../../mod/network.php:187
+msgid "Starred"
+msgstr ""
+
+#: ../../mod/network.php:192
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../mod/network.php:250
 #, php-format
-msgid "Suggest a friend for %s"
+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:253
+msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/ping.php:148
-msgid "{0} wants to be your friend"
+#: ../../mod/network.php:304
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/ping.php:153
-msgid "{0} sent you a message"
+#: ../../mod/network.php:315
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/ping.php:158
-msgid "{0} requested registration"
+#: ../../mod/network.php:319
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/ping.php:164
-#, php-format
-msgid "{0} commented %s's post"
+#: ../../mod/network.php:329
+msgid "Contact: "
 msgstr ""
 
-#: ../../mod/ping.php:169
-#, php-format
-msgid "{0} liked %s's post"
+#: ../../mod/network.php:331
+msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/ping.php:174
-#, php-format
-msgid "{0} disliked %s's post"
+#: ../../mod/network.php:336
+msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/ping.php:179
-#, php-format
-msgid "{0} is now friends with %s"
+#: ../../mod/notes.php:44 ../../boot.php:1350
+msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/ping.php:184
-msgid "{0} posted"
+#: ../../mod/notes.php:63 ../../include/text.php:639
+msgid "Save"
 msgstr ""
 
-#: ../../mod/ping.php:189
-#, php-format
-msgid "{0} tagged %s's post with #%s"
+#: ../../mod/newmember.php:6
+msgid "Welcome to Friendica"
 msgstr ""
 
-#: ../../mod/ping.php:195
-msgid "{0} mentioned you in a post"
+#: ../../mod/newmember.php:8
+msgid "New Member Checklist"
 msgstr ""
 
-#: ../../mod/lostpass.php:16
-msgid "No valid account found."
+#: ../../mod/newmember.php:12
+msgid ""
+"We would like to offer some tips and links to help make your experience "
+"enjoyable. Click any item to visit the relevant page."
 msgstr ""
 
-#: ../../mod/lostpass.php:31
-msgid "Password reset request issued. Check your email."
+#: ../../mod/newmember.php:16
+msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This will be useful in making friends."
 msgstr ""
 
-#: ../../mod/lostpass.php:42
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/newmember.php:18
+msgid ""
+"Review the other settings, particularly the privacy settings. An unpublished "
+"directory listing is like having an unlisted phone number. In general, you "
+"should probably publish your listing - unless all of your friends and "
+"potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/lostpass.php:64
+#: ../../mod/newmember.php:20
 msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+"Upload a profile photo if you have not done so already. Studies have shown "
+"that people with real photos of themselves are ten times more likely to make "
+"friends than people who do not."
 msgstr ""
 
-#: ../../mod/lostpass.php:82 ../../boot.php:714
-msgid "Password Reset"
+#: ../../mod/newmember.php:23
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/lostpass.php:83
-msgid "Your password has been reset as requested."
+#: ../../mod/newmember.php:28
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
 msgstr ""
 
-#: ../../mod/lostpass.php:84
-msgid "Your new password is"
+#: ../../mod/newmember.php:30
+msgid ""
+"Edit your <strong>default</strong> profile to your liking. Review the "
+"settings for hiding your list of friends and hiding the profile from unknown "
+"visitors."
 msgstr ""
 
-#: ../../mod/lostpass.php:85
-msgid "Save or copy your new password - and then"
+#: ../../mod/newmember.php:32
+msgid ""
+"Set some public keywords for your default profile which describe your "
+"interests. We may be able to find other people with similar interests and "
+"suggest friendships."
 msgstr ""
 
-#: ../../mod/lostpass.php:86
-msgid "click here to login"
+#: ../../mod/newmember.php:34
+msgid ""
+"Your Contacts page is your gateway to managing friendships and connecting "
+"with friends on other networks. Typically you enter their address or site "
+"URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/newmember.php:36
 msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+"The Directory page lets you find other people in this network or other "
+"federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
+"their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/lostpass.php:118
-msgid "Forgot your Password?"
+#: ../../mod/newmember.php:38
+msgid ""
+"Once you have made some friends, organize them into private conversation "
+"groups from the sidebar of your Contacts page and then you can interact with "
+"each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/newmember.php:40
 msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+"Our <strong>help</strong> pages may be consulted for detail on other program "
+"features and resources."
 msgstr ""
 
-#: ../../mod/lostpass.php:120
-msgid "Nickname or Email: "
+#: ../../mod/attach.php:8
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/lostpass.php:121
-msgid "Reset"
+#: ../../mod/attach.php:20
+msgid "Item was not found."
 msgstr ""
 
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/editpost.php:32
-msgid "Edit post"
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:848
-msgid "Post to Email"
+#: ../../mod/group.php:43 ../../mod/group.php:123
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:865
-msgid "Attach file"
+#: ../../mod/group.php:56
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/editpost.php:94
-msgid "Insert YouTube video"
+#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/editpost.php:95
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/group.php:82
+msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/editpost.php:96
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/group.php:83 ../../mod/group.php:166
+msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:873
-msgid "Set your location"
+#: ../../mod/group.php:98
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:875
-msgid "Clear browser location"
+#: ../../mod/group.php:100
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/editpost.php:100 ../../include/conversation.php:880
-msgid "Permission settings"
+#: ../../mod/group.php:164 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:889
-msgid "CC: email addresses"
+#: ../../mod/group.php:165
+msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:890
-msgid "Public post"
+#: ../../mod/group.php:179
+msgid "Members"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:892
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/group.php:194
+msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
-msgid "Remove My Account"
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/removeme.php:43
-msgid ""
-"This will completely remove your account. Once this has been done it is not "
-"recoverable."
+#: ../../mod/profperm.php:101
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/removeme.php:44
-msgid "Please enter your password for verification:"
+#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
+#: ../../include/profile_advanced.php:76 ../../include/nav.php:48
+#: ../../boot.php:1332
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/regmod.php:61
-msgid "Account approved."
+#: ../../mod/profperm.php:114
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/regmod.php:93
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/profperm.php:130
+msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/regmod.php:105
-msgid "Please login."
+#: ../../mod/viewcontacts.php:25 ../../include/text.php:578
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/install.php:111
-msgid "Friendica Social Communications Server - Setup"
+#: ../../mod/viewcontacts.php:40
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/install.php:117 ../../mod/install.php:157
-#: ../../mod/install.php:229
-msgid "Database connection"
+#: ../../mod/register.php:62
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/install.php:124
-msgid "Could not connect to database."
+#: ../../mod/register.php:67
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/install.php:128
-msgid "Could not create table."
+#: ../../mod/register.php:75
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/install.php:133
-msgid "Your Friendica site database has been installed."
+#: ../../mod/register.php:90
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/install.php:134
+#: ../../mod/register.php:104
+msgid "Please use a shorter name."
+msgstr ""
+
+#: ../../mod/register.php:106
+msgid "Name too short."
+msgstr ""
+
+#: ../../mod/register.php:121
+msgid "That doesn't appear to be your full (First Last) name."
+msgstr ""
+
+#: ../../mod/register.php:126
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
+
+#: ../../mod/register.php:129
+msgid "Not a valid email address."
+msgstr ""
+
+#: ../../mod/register.php:139
+msgid "Cannot use that email."
+msgstr ""
+
+#: ../../mod/register.php:145
 msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../mod/install.php:135 ../../mod/install.php:151
-#: ../../mod/install.php:209
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/register.php:151 ../../mod/register.php:252
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/install.php:137
-msgid "Proceed to registration"
+#: ../../mod/register.php:170
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/install.php:143
-msgid "Proceed with Installation"
+#: ../../mod/register.php:238
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/install.php:150
+#: ../../mod/register.php:274
+msgid "An error occurred creating your default profile. Please try again."
+msgstr ""
+
+#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../mod/register.php:386
 msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/install.php:158
-msgid "Database import failed."
+#: ../../mod/register.php:390
+msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/install.php:206
-msgid "System check"
+#: ../../mod/register.php:395
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/install.php:210 ../../mod/events.php:213
-msgid "Next"
+#: ../../mod/register.php:432
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/install.php:211
-msgid "Check again"
+#: ../../mod/register.php:441
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/install.php:230
+#: ../../mod/register.php:479
 msgid ""
-"In order to install Friendica we need to know how to connect to your "
-"database."
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/install.php:231
+#: ../../mod/register.php:505
 msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/install.php:232
+#: ../../mod/register.php:506
 msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/install.php:236
-msgid "Database Server Name"
+#: ../../mod/register.php:507
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/install.php:237
-msgid "Database Login Name"
+#: ../../mod/register.php:521
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/install.php:238
-msgid "Database Login Password"
+#: ../../mod/register.php:536
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/install.php:239
-msgid "Database Name"
+#: ../../mod/register.php:537
+msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/install.php:240 ../../mod/install.php:279
-msgid "Site administrator email address"
+#: ../../mod/register.php:540 ../../mod/admin.php:297
+msgid "Registration"
+msgstr ""
+
+#: ../../mod/register.php:548
+msgid "Your Full Name (e.g. Joe Smith): "
+msgstr ""
+
+#: ../../mod/register.php:549
+msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/install.php:240 ../../mod/install.php:279
+#: ../../mod/register.php:550
 msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+"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/install.php:244 ../../mod/install.php:282
-msgid "Please select a default timezone for your website"
+#: ../../mod/register.php:551
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/install.php:269
-msgid "Site settings"
+#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:689
+msgid "Register"
 msgstr ""
 
-#: ../../mod/install.php:322
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/dirfind.php:23
+msgid "People Search"
 msgstr ""
 
-#: ../../mod/install.php:325
-msgid "PHP executable path"
+#: ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/facebook/facebook.php:1091
+#: ../../addon/communityhome/communityhome.php:158
+#: ../../addon/communityhome/communityhome.php:167
+#: ../../include/diaspora.php:1587 ../../include/conversation.php:26
+#: ../../include/conversation.php:35 ../../include/conversation.php:99
+#: ../../include/conversation.php:108
+msgid "status"
 msgstr ""
 
-#: ../../mod/install.php:325
-msgid "Enter full path to php executable"
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1095
+#: ../../addon/communityhome/communityhome.php:172
+#: ../../include/diaspora.php:1603 ../../include/conversation.php:43
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/install.php:330
-msgid "Command line PHP"
+#: ../../mod/like.php:146 ../../include/conversation.php:46
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/install.php:339
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111
+#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:116
+#: ../../mod/viewd.php:14 ../../include/items.php:2819
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/install.php:340
-msgid "This is required for message delivery to work."
+#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+msgid "Access denied."
 msgstr ""
 
-#: ../../mod/install.php:342
-msgid "PHP \"register_argc_argv\""
+#: ../../mod/regmod.php:61
+msgid "Account approved."
+msgstr ""
+
+#: ../../mod/regmod.php:93
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/install.php:363
+#: ../../mod/regmod.php:105
+msgid "Please login."
+msgstr ""
+
+#: ../../mod/item.php:88
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../mod/item.php:248
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../mod/item.php:350 ../../mod/wall_upload.php:81
+#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
+#: ../../include/message.php:143
+msgid "Wall Photos"
+msgstr ""
+
+#: ../../mod/item.php:827
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../mod/item.php:852
+#, php-format
 msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+"This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/install.php:364
+#: ../../mod/item.php:854
+#, php-format
+msgid "You may visit them online at %s"
+msgstr ""
+
+#: ../../mod/item.php:855
 msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/install.php:366
-msgid "Generate encryption keys"
+#: ../../mod/item.php:857
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/install.php:373
-msgid "libCurl PHP module"
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/install.php:374
-msgid "GD graphics PHP module"
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/install.php:375
-msgid "OpenSSL PHP module"
+#: ../../mod/profile_photo.php:89
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../mod/install.php:376
-msgid "mysqli PHP module"
+#: ../../mod/profile_photo.php:99
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/install.php:377
-msgid "mb_string PHP module"
+#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/install.php:382 ../../mod/install.php:384
-msgid "Apace mod_rewrite module"
+#: ../../mod/profile_photo.php:203
+msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/install.php:382
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/profile_photo.php:204
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/install.php:389
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/profile_photo.php:205
+msgid "Upload"
 msgstr ""
 
-#: ../../mod/install.php:393
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/profile_photo.php:206
+msgid "skip this step"
 msgstr ""
 
-#: ../../mod/install.php:397
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/profile_photo.php:206
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/install.php:401
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/profile_photo.php:219
+msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/install.php:405
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/profile_photo.php:220
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/install.php:422
-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:221
+msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/install.php:423
-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:249
+msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/install.php:424
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+#: ../../mod/hcard.php:10
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/install.php:425
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
+msgid "Remove My Account"
+msgstr ""
+
+#: ../../mod/removeme.php:46
 msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+"This will completely remove your account. Once this has been done it is not "
+"recoverable."
 msgstr ""
 
-#: ../../mod/install.php:428
-msgid ".htconfig.php is writable"
+#: ../../mod/removeme.php:47
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/install.php:435
-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/message.php:23
+msgid "No recipient selected."
 msgstr ""
 
-#: ../../mod/install.php:460
-msgid "Errors encountered creating database tables."
+#: ../../mod/message.php:26
+msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/community.php:21
-msgid "Not available."
+#: ../../mod/message.php:29
+msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/community.php:30 ../../include/nav.php:97
-msgid "Community"
+#: ../../mod/message.php:32
+msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/community.php:60 ../../mod/search.php:118
-msgid "No results."
+#: ../../mod/message.php:35
+msgid "Message sent."
 msgstr ""
 
-#: ../../mod/community.php:87
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+#: ../../mod/message.php:55
+msgid "Inbox"
 msgstr ""
 
-#: ../../mod/oexchange.php:27
-msgid "Post successful."
+#: ../../mod/message.php:60
+msgid "Outbox"
+msgstr ""
+
+#: ../../mod/message.php:65
+msgid "New Message"
+msgstr ""
+
+#: ../../mod/message.php:91
+msgid "Message deleted."
+msgstr ""
+
+#: ../../mod/message.php:121
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../mod/message.php:137 ../../include/conversation.php:843
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/message.php:145
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/message.php:146 ../../mod/message.php:287
+msgid "To:"
+msgstr ""
+
+#: ../../mod/message.php:147 ../../mod/message.php:288
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/message.php:150 ../../mod/message.php:291
+#: ../../mod/invite.php:101
+msgid "Your message:"
+msgstr ""
+
+#: ../../mod/message.php:188
+msgid "No messages."
+msgstr ""
+
+#: ../../mod/message.php:201
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../mod/message.php:204
+msgid "D, d M Y - g:i A"
+msgstr ""
+
+#: ../../mod/message.php:239
+msgid "Message not available."
+msgstr ""
+
+#: ../../mod/message.php:276
+msgid "Delete message"
+msgstr ""
+
+#: ../../mod/message.php:286
+msgid "Send Reply"
+msgstr ""
+
+#: ../../mod/allfriends.php:34
+#, php-format
+msgid "Friends of %s"
+msgstr ""
+
+#: ../../mod/allfriends.php:40
+msgid "No friends to display."
 msgstr ""
 
 #: ../../mod/admin.php:59 ../../mod/admin.php:295
@@ -2619,7 +2785,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477
+#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:486
 msgid "Site name"
 msgstr ""
 
@@ -2833,7 +2999,7 @@ msgstr ""
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../include/nav.php:128
+#: ../../mod/admin.php:551 ../../include/nav.php:129
 msgid "Settings"
 msgstr ""
 
@@ -2883,1028 +3049,1342 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
-msgid "Friend Suggestions"
+#: ../../mod/profile.php:15 ../../boot.php:841
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/suggest.php:44
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/profile.php:111 ../../mod/display.php:66
+msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/suggest.php:59 ../../mod/match.php:58
-#: ../../include/contact_widgets.php:9 ../../boot.php:911
-msgid "Connect"
+#: ../../mod/profile.php:131
+msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/suggest.php:61
-msgid "Ignore/Hide"
+#: ../../mod/ping.php:148
+msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/display.php:66 ../../mod/profile.php:111
-msgid "Access to this profile has been restricted."
+#: ../../mod/ping.php:153
+msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/display.php:108
-msgid "Item has been removed."
+#: ../../mod/ping.php:158
+msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../include/conversation.php:43
-#: ../../include/diaspora.php:1570 ../../addon/facebook/facebook.php:1088
-#: ../../addon/communityhome/communityhome.php:172
+#: ../../mod/ping.php:164
 #, php-format
-msgid "%1$s likes %2$s's %3$s"
+msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/like.php:146 ../../include/conversation.php:46
+#: ../../mod/ping.php:169
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/match.php:12
-msgid "Profile Match"
+#: ../../mod/ping.php:174
+#, php-format
+msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/match.php:20
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../mod/ping.php:179
+#, php-format
+msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/match.php:57
-msgid "is interested in:"
+#: ../../mod/ping.php:184
+msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1335
-msgid "Personal Notes"
+#: ../../mod/ping.php:189
+#, php-format
+msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../include/text.php:635
-msgid "Save"
+#: ../../mod/ping.php:195
+msgid "{0} mentioned you in a post"
 msgstr ""
 
-#: ../../mod/help.php:30
-msgid "Help:"
+#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
+#: ../../include/auth.php:115 ../../include/auth.php:169
+msgid "Login failed."
 msgstr ""
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
-msgid "Help"
+#: ../../mod/follow.php:27
+msgid "Connect URL missing."
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:221
-msgid "Not Found"
+#: ../../mod/follow.php:47
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:224
-msgid "Page not found."
+#: ../../mod/follow.php:48 ../../mod/follow.php:58
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:236
-msgid "Response from remote site was not understood."
+#: ../../mod/follow.php:56
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:245
-msgid "Unexpected response from remote site: "
+#: ../../mod/follow.php:60
+msgid "An author or name was not found."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:253
-msgid "Confirmation completed successfully."
+#: ../../mod/follow.php:62
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:255 ../../mod/dfrn_confirm.php:269
-#: ../../mod/dfrn_confirm.php:276
-msgid "Remote site reported: "
+#: ../../mod/follow.php:69
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:267
-msgid "Temporary failure. Please wait and try again."
+#: ../../mod/follow.php:74
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:274
-msgid "Introduction failed or was revoked."
+#: ../../mod/follow.php:144
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:416
-msgid "Unable to set contact photo."
+#: ../../mod/follow.php:190
+msgid "following"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:466 ../../include/conversation.php:79
-#: ../../include/diaspora.php:495
-#, php-format
-msgid "%1$s is now friends with %2$s"
+#: ../../mod/common.php:34
+msgid "Common Friends"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:537
-#, php-format
-msgid "No user record found for '%s' "
+#: ../../mod/common.php:42
+msgid "No friends in common."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:547
-msgid "Our site encryption key is apparently messed up."
+#: ../../mod/display.php:109
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:558
-msgid "Empty site URL was provided or URL could not be decrypted by us."
+#: ../../mod/apps.php:4
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:579
-msgid "Contact record was not found for you on our site."
+#: ../../mod/apps.php:7
+msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:593
-#, php-format
-msgid "Site public key not available in contact record for URL %s."
+#: ../../mod/search.php:83
+msgid "Search This Site"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:613
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
+#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:624
-msgid "Unable to set your contact credentials on our system."
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:678
-msgid "Unable to update your contact profile details on our system"
+#: ../../mod/profiles.php:198
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:708
-#, php-format
-msgid "Connection accepted at %s"
+#: ../../mod/profiles.php:256
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profile.php:15 ../../boot.php:836
-msgid "Requested profile is not available."
+#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profile.php:131
-msgid "Tips for New Members"
+#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/item.php:89
-msgid "Unable to locate original post."
+#: ../../mod/profiles.php:309
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/item.php:206
-msgid "Empty post discarded."
+#: ../../mod/profiles.php:356
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/item.php:778
-msgid "System error. Post not saved."
+#: ../../mod/profiles.php:374
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/item.php:803
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendica social network."
+#: ../../mod/profiles.php:376
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/item.php:805
-#, php-format
-msgid "You may visit them online at %s"
+#: ../../mod/profiles.php:377
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/item.php:806
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
+#: ../../mod/profiles.php:378
+msgid "Clone this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:379
+msgid "Delete this profile"
+msgstr ""
+
+#: ../../mod/profiles.php:380
+msgid "Profile Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:381
+msgid "Your Full Name:"
+msgstr ""
+
+#: ../../mod/profiles.php:382
+msgid "Title/Description:"
+msgstr ""
+
+#: ../../mod/profiles.php:383
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/item.php:808
+#: ../../mod/profiles.php:384
 #, php-format
-msgid "%s posted an update."
+msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/search.php:13 ../../mod/network.php:84
-msgid "Saved Searches"
+#: ../../mod/profiles.php:385
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/search.php:16 ../../mod/network.php:75
-msgid "Remove term"
+#: ../../mod/profiles.php:386
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/search.php:83
-msgid "Search This Site"
+#: ../../mod/profiles.php:387
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/photos.php:42
-msgid "Photo Albums"
+#: ../../mod/profiles.php:388
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:146 ../../mod/photos.php:868
-#: ../../mod/photos.php:938 ../../mod/photos.php:953 ../../mod/photos.php:1354
-#: ../../mod/photos.php:1366 ../../addon/communityhome/communityhome.php:110
-msgid "Contact Photos"
+#: ../../mod/profiles.php:389
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/photos.php:135
-msgid "Contact information unavailable"
+#: ../../mod/profiles.php:390
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/photos.php:156
-msgid "Album not found."
+#: ../../mod/profiles.php:391
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/photos.php:174 ../../mod/photos.php:947
-msgid "Delete Album"
+#: ../../mod/profiles.php:392
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/photos.php:237 ../../mod/photos.php:1166
-msgid "Delete Photo"
+#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/photos.php:524
-msgid "was tagged in a"
+#: ../../mod/profiles.php:394
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/photos.php:524
-msgid "by"
+#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/photos.php:627 ../../addon/js_upload/js_upload.php:312
-msgid "Image exceeds size limit of "
+#: ../../mod/profiles.php:396
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/photos.php:635
-msgid "Image file is empty."
+#: ../../mod/profiles.php:397
+msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/photos.php:764
-msgid "No photos selected"
+#: ../../mod/profiles.php:398
+msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/photos.php:841
-msgid "Access to this item is restricted."
+#: ../../mod/profiles.php:399
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/photos.php:895
-msgid "Upload Photos"
+#: ../../mod/profiles.php:400
+msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/photos.php:898 ../../mod/photos.php:942
-msgid "New album name: "
+#: ../../mod/profiles.php:401
+msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/photos.php:899
-msgid "or existing album name: "
+#: ../../mod/profiles.php:402
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/photos.php:900
-msgid "Do not show a status post for this upload"
+#: ../../mod/profiles.php:403
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/photos.php:902 ../../mod/photos.php:1161
-msgid "Permissions"
+#: ../../mod/profiles.php:404
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/photos.php:957
-msgid "Edit Album"
+#: ../../mod/profiles.php:405
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/photos.php:967 ../../mod/photos.php:1379
-msgid "View Photo"
+#: ../../mod/profiles.php:406
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/photos.php:1002
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../mod/profiles.php:407
+msgid "Television"
 msgstr ""
 
-#: ../../mod/photos.php:1004
-msgid "Photo not available"
+#: ../../mod/profiles.php:408
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/photos.php:1054
-msgid "View photo"
+#: ../../mod/profiles.php:409
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/photos.php:1054
-msgid "Edit photo"
+#: ../../mod/profiles.php:410
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/photos.php:1055
-msgid "Use as profile photo"
+#: ../../mod/profiles.php:411
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/photos.php:1061 ../../include/conversation.php:423
-msgid "Private Message"
+#: ../../mod/profiles.php:416
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/photos.php:1072
-msgid "View Full Size"
+#: ../../mod/profiles.php:426 ../../mod/directory.php:122
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/photos.php:1140
-msgid "Tags: "
+#: ../../mod/profiles.php:461
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/photos.php:1143
-msgid "[Remove any tag]"
+#: ../../mod/profiles.php:462 ../../boot.php:942
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1154
-msgid "New album name"
+#: ../../mod/profiles.php:463 ../../boot.php:943
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/photos.php:1157
-msgid "Caption"
+#: ../../mod/profiles.php:473 ../../boot.php:953
+msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/photos.php:1159
-msgid "Add a Tag"
+#: ../../mod/profiles.php:475 ../../boot.php:956
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/photos.php:1163
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
+#: ../../mod/profiles.php:476 ../../boot.php:957
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/photos.php:1183 ../../include/conversation.php:470
-msgid "I like this (toggle)"
+#: ../../mod/tagger.php:103 ../../include/conversation.php:116
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/photos.php:1184 ../../include/conversation.php:471
-msgid "I don't like this (toggle)"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/photos.php:1185 ../../include/conversation.php:862
-msgid "Share"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../mod/photos.php:1242
-#: ../../mod/photos.php:1273 ../../include/conversation.php:485
-msgid "This is you"
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/photos.php:1204 ../../mod/photos.php:1244
-#: ../../mod/photos.php:1275 ../../include/conversation.php:487
-#: ../../boot.php:438
-msgid "Comment"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/photos.php:1206 ../../include/conversation.php:489
-#: ../../include/conversation.php:897
-msgid "Preview"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/photos.php:1385
-msgid "View Album"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
 msgstr ""
 
-#: ../../mod/photos.php:1394
-msgid "Recent Photos"
+#: ../../mod/delegate.php:131
+msgid "Add"
 msgstr ""
 
-#: ../../mod/photos.php:1396
-msgid "Upload New Photos"
+#: ../../mod/delegate.php:132
+msgid "No entries."
 msgstr ""
 
-#: ../../mod/network.php:43
-msgid "Search Results For:"
+#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+msgid "Friend Suggestions"
 msgstr ""
 
-#: ../../mod/network.php:85 ../../include/group.php:216
-msgid "add"
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: ../../mod/network.php:158
-msgid "Commented Order"
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/network.php:163
-msgid "Posted Order"
+#: ../../mod/directory.php:49
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/network.php:174
-msgid "New"
+#: ../../mod/directory.php:55
+msgid "Normal site view"
 msgstr ""
 
-#: ../../mod/network.php:179
-msgid "Starred"
+#: ../../mod/directory.php:57
+msgid "Admin - View all site entries"
 msgstr ""
 
-#: ../../mod/network.php:184
-msgid "Bookmarks"
+#: ../../mod/directory.php:63
+msgid "Find on this site"
+msgstr ""
+
+#: ../../mod/directory.php:66
+msgid "Site Directory"
+msgstr ""
+
+#: ../../mod/directory.php:125
+msgid "Gender: "
+msgstr ""
+
+#: ../../mod/directory.php:151
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/network.php:232
+#: ../../mod/invite.php:35
 #, 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."
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../mod/invite.php:59
+#, php-format
+msgid "Please join my network on %s"
+msgstr ""
+
+#: ../../mod/invite.php:69
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../mod/invite.php:73
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:235
-msgid "Private messages to this group are at risk of public disclosure."
+#: ../../mod/invite.php:92
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/network.php:286
-msgid "No such group"
+#: ../../mod/invite.php:99
+msgid "Send invitations"
 msgstr ""
 
-#: ../../mod/network.php:297
-msgid "Group is empty"
+#: ../../mod/invite.php:100
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../mod/network.php:301
-msgid "Group: "
+#: ../../mod/invite.php:102
+#, php-format
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../mod/network.php:311
-msgid "Contact: "
+#: ../../mod/invite.php:103
+msgid "To accept this invitation, please visit:"
 msgstr ""
 
-#: ../../mod/network.php:313
-msgid "Private messages to this person are at risk of public disclosure."
+#: ../../mod/invite.php:104
+msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/network.php:318
-msgid "Invalid contact."
+#: ../../mod/invite.php:104
+msgid ""
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/dfrn_confirm.php:238
+msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/dfrn_confirm.php:247
+msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/dfrn_confirm.php:255
+msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/api.php:104
+#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
+#: ../../mod/dfrn_confirm.php:278
+msgid "Remote site reported: "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:269
+msgid "Temporary failure. Please wait and try again."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:276
+msgid "Introduction failed or was revoked."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:421
+msgid "Unable to set contact photo."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
+#: ../../include/conversation.php:79
+#, php-format
+msgid "%1$s is now friends with %2$s"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:543
+#, php-format
+msgid "No user record found for '%s' "
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:553
+msgid "Our site encryption key is apparently messed up."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:564
+msgid "Empty site URL was provided or URL could not be decrypted by us."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:585
+msgid "Contact record was not found for you on our site."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:599
+#, php-format
+msgid "Site public key not available in contact record for URL %s."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:619
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
 msgstr ""
 
-#: ../../mod/friendica.php:43
-msgid "This is Friendica, version"
+#: ../../mod/dfrn_confirm.php:630
+msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/friendica.php:44
-msgid "running at web location"
+#: ../../mod/dfrn_confirm.php:684
+msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/friendica.php:46
+#: ../../mod/dfrn_confirm.php:714
+#, php-format
+msgid "Connection accepted at %s"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:337
+msgid "Facebook disabled"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:342
+msgid "Updating contacts"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:351
+msgid "Facebook API key is missing."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:358
+msgid "Facebook Connect"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:364
+msgid "Install Facebook connector for this account."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:371
+msgid "Remove Facebook connector"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:376
 msgid ""
-"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
-"more about the Friendica project."
+"Re-authenticate [This is necessary whenever your Facebook password is "
+"changed.]"
 msgstr ""
 
-#: ../../mod/friendica.php:48
-msgid "Bug reports and issues: please visit"
+#: ../../addon/facebook/facebook.php:383
+msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../mod/friendica.php:49
+#: ../../addon/facebook/facebook.php:387
+msgid "Link all your Facebook friends and conversations on this website"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:389
 msgid ""
-"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
-"dot com"
+"Facebook conversations consist of your <em>profile wall</em> and your friend "
+"<em>stream</em>."
 msgstr ""
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
+#: ../../addon/facebook/facebook.php:390
+msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../mod/friendica.php:62
-msgid "No installed plugins/addons/apps"
+#: ../../addon/facebook/facebook.php:391
+msgid ""
+"The following settings determine the privacy of your Facebook profile wall "
+"on this website."
 msgstr ""
 
-#: ../../mod/attach.php:8
-msgid "Item not available."
+#: ../../addon/facebook/facebook.php:395
+msgid ""
+"On this website your Facebook profile wall conversations will only be "
+"visible to you"
 msgstr ""
 
-#: ../../mod/attach.php:20
-msgid "Item was not found."
+#: ../../addon/facebook/facebook.php:400
+msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:574
-msgid "View Contacts"
+#: ../../addon/facebook/facebook.php:402
+msgid ""
+"If you choose to link conversations and leave both of these boxes unchecked, "
+"your Facebook profile wall will be merged with your profile wall on this "
+"website and your privacy settings on this website will be used to determine "
+"who may see the conversations."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:40
-msgid "No contacts."
+#: ../../addon/facebook/facebook.php:407
+msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
+#: ../../addon/facebook/facebook.php:475
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
 msgstr ""
 
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
+#: ../../addon/facebook/facebook.php:476
+msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
+#: ../../addon/facebook/facebook.php:490
+msgid "Post to Facebook"
 msgstr ""
 
-#: ../../mod/tagrm.php:93
-msgid "Remove"
+#: ../../addon/facebook/facebook.php:581
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../addon/facebook/facebook.php:650
+msgid "Image: "
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../addon/facebook/facebook.php:727
+msgid "View on Friendica"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
+#: ../../addon/facebook/facebook.php:751
+msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../addon/facebook/facebook.php:876 ../../addon/facebook/facebook.php:885
+#: ../../include/bb2diaspora.php:113
+msgid "link"
 msgstr ""
 
-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
-msgid "Permission denied"
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widgets.php:55
+msgid "Generate new key"
 msgstr ""
 
-#: ../../mod/group.php:82
-msgid "Create a group of contacts/friends."
+#: ../../addon/widgets/widgets.php:58
+msgid "Widgets key"
 msgstr ""
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
-msgid "Group Name: "
+#: ../../addon/widgets/widgets.php:60
+msgid "Widgets available"
 msgstr ""
 
-#: ../../mod/group.php:98
-msgid "Group removed."
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
 msgstr ""
 
-#: ../../mod/group.php:100
-msgid "Unable to remove group."
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
 msgstr ""
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
 msgstr ""
 
-#: ../../mod/group.php:165
-msgid "Group Editor"
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
 msgstr ""
 
-#: ../../mod/group.php:179
-msgid "Members"
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
 msgstr ""
 
-#: ../../mod/group.php:194
-msgid "All Contacts"
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
 msgstr ""
 
-#: ../../mod/events.php:61
-msgid "Event description and start time are required."
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
 msgstr ""
 
-#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1330
-msgid "Events"
+#: ../../addon/nsfw/nsfw.php:47
+msgid "\"Not Safe For Work\" Settings"
 msgstr ""
 
-#: ../../mod/events.php:207
-msgid "Create New Event"
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable NSFW filter"
 msgstr ""
 
-#: ../../mod/events.php:210
-msgid "Previous"
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated words to treat as NSFW"
 msgstr ""
 
-#: ../../mod/events.php:220
-msgid "l, F j"
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: ../../mod/events.php:235
-msgid "Edit event"
+#: ../../addon/nsfw/nsfw.php:74
+msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../mod/events.php:237 ../../include/text.php:867
-msgid "link to source"
+#: ../../addon/nsfw/nsfw.php:120
+#, php-format
+msgid "%s - Click to open/close"
 msgstr ""
 
-#: ../../mod/events.php:305
-msgid "hour:minute"
+#: ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
+#: ../../boot.php:706
+msgid "Login"
 msgstr ""
 
-#: ../../mod/events.php:314
-msgid "Event details"
+#: ../../addon/communityhome/communityhome.php:29
+msgid "OpenID"
 msgstr ""
 
-#: ../../mod/events.php:315
+#: ../../addon/communityhome/communityhome.php:38
+msgid "Last users"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:81
+msgid "Most active users"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Last photos"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Last likes"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../include/conversation.php:23 ../../include/conversation.php:96
+msgid "event"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
-msgid "Format is %s %s. Starting date and Description are required."
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled "
+"storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/"
+"wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
 msgstr ""
 
-#: ../../mod/events.php:316
-msgid "Event Starts:"
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
 msgstr ""
 
-#: ../../mod/events.php:319
-msgid "Finish date/time is not known or not relevant"
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
 msgstr ""
 
-#: ../../mod/events.php:321
-msgid "Event Finishes:"
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
 msgstr ""
 
-#: ../../mod/events.php:324
-msgid "Adjust for viewer timezone"
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
 msgstr ""
 
-#: ../../mod/events.php:326
-msgid "Description:"
+#: ../../addon/tictac/tictac.php:20
+msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: ../../mod/events.php:328 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:259 ../../boot.php:961
-msgid "Location:"
+#: ../../addon/tictac/tictac.php:53
+msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../mod/events.php:330
-msgid "Share this event"
+#: ../../addon/tictac/tictac.php:58
+msgid "New game"
 msgstr ""
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
-msgid "Invalid profile identifier."
+#: ../../addon/tictac/tictac.php:59
+msgid "New game with handicap"
 msgstr ""
 
-#: ../../mod/profperm.php:101
-msgid "Profile Visibility Editor"
+#: ../../addon/tictac/tictac.php:60
+msgid ""
+"Three dimensional tic-tac-toe is just like the traditional game except that "
+"it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../include/nav.php:48
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../boot.php:1317
-msgid "Profile"
+#: ../../addon/tictac/tictac.php:61
+msgid ""
+"In this case there are three levels. You win by getting three in a row on "
+"any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: ../../mod/profperm.php:114
-msgid "Visible To"
+#: ../../addon/tictac/tictac.php:63
+msgid ""
+"The handicap game disables the center position on the middle level because "
+"the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: ../../mod/profperm.php:130
-msgid "All Contacts (with secure profile access)"
+#: ../../addon/tictac/tictac.php:182
+msgid "You go first..."
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
-#, php-format
-msgid "%s welcomes %s"
+#: ../../addon/tictac/tictac.php:187
+msgid "I'm going first this time..."
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../addon/tictac/tictac.php:193
+msgid "You won!"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
+msgid "\"Cat\" game!"
 msgstr ""
 
-#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
-#, php-format
-msgid "Welcome to %s"
+#: ../../addon/tictac/tictac.php:222
+msgid "I won!"
 msgstr ""
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
+#: ../../addon/randplace/randplace.php:171
+msgid "Randplace Settings"
 msgstr ""
 
-#: ../../include/datetime.php:121 ../../include/datetime.php:253
-msgid "year"
+#: ../../addon/randplace/randplace.php:173
+msgid "Enable Randplace Plugin"
 msgstr ""
 
-#: ../../include/datetime.php:126 ../../include/datetime.php:254
-msgid "month"
+#: ../../addon/drpost/drpost.php:35
+msgid "Post to Drupal"
 msgstr ""
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:256
-msgid "day"
+#: ../../addon/drpost/drpost.php:72
+msgid "Drupal Post Settings"
 msgstr ""
 
-#: ../../include/datetime.php:244
-msgid "never"
+#: ../../addon/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
 msgstr ""
 
-#: ../../include/datetime.php:250
-msgid "less than a second ago"
+#: ../../addon/drpost/drpost.php:79
+msgid "Drupal username"
 msgstr ""
 
-#: ../../include/datetime.php:253
-msgid "years"
+#: ../../addon/drpost/drpost.php:84
+msgid "Drupal password"
 msgstr ""
 
-#: ../../include/datetime.php:254
-msgid "months"
+#: ../../addon/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
 msgstr ""
 
-#: ../../include/datetime.php:255
-msgid "week"
+#: ../../addon/drpost/drpost.php:94
+msgid "Drupal site URL"
 msgstr ""
 
-#: ../../include/datetime.php:255
-msgid "weeks"
+#: ../../addon/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
 msgstr ""
 
-#: ../../include/datetime.php:256
-msgid "days"
+#: ../../addon/drpost/drpost.php:104
+msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../include/datetime.php:257
-msgid "hour"
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/posterous/posterous.php:173
+msgid "Post from Friendica"
 msgstr ""
 
-#: ../../include/datetime.php:257
-msgid "hours"
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
 msgstr ""
 
-#: ../../include/datetime.php:258
-msgid "minute"
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
 msgstr ""
 
-#: ../../include/datetime.php:258
-msgid "minutes"
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
 msgstr ""
 
-#: ../../include/datetime.php:259
-msgid "second"
+#: ../../addon/js_upload/js_upload.php:43
+msgid "Upload a file"
 msgstr ""
 
-#: ../../include/datetime.php:259
-msgid "seconds"
+#: ../../addon/js_upload/js_upload.php:44
+msgid "Drop files here to upload"
 msgstr ""
 
-#: ../../include/datetime.php:266
-msgid " ago"
+#: ../../addon/js_upload/js_upload.php:46
+msgid "Failed"
 msgstr ""
 
-#: ../../include/datetime.php:437 ../../include/profile_advanced.php:30
-#: ../../include/items.php:1285
-msgid "Birthday:"
+#: ../../addon/js_upload/js_upload.php:294
+msgid "No files were uploaded."
 msgstr ""
 
-#: ../../include/dba.php:39
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../addon/js_upload/js_upload.php:300
+msgid "Uploaded file is empty"
 msgstr ""
 
-#: ../../include/text.php:232
-msgid "prev"
+#: ../../addon/js_upload/js_upload.php:323
+msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: ../../include/text.php:234
-msgid "first"
+#: ../../addon/js_upload/js_upload.php:334
+msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../include/text.php:263
-msgid "last"
+#: ../../addon/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
 msgstr ""
 
-#: ../../include/text.php:266
-msgid "next"
+#: ../../addon/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
 msgstr ""
 
-#: ../../include/text.php:553
-msgid "No contacts"
+#: ../../addon/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:25
+msgid "Impressum"
 msgstr ""
 
-#: ../../include/text.php:562
+#: ../../addon/impressum/impressum.php:38
+#: ../../addon/impressum/impressum.php:40
+#: ../../addon/impressum/impressum.php:70
+msgid "Site Owner"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:38
+#: ../../addon/impressum/impressum.php:74
+msgid "Email Address"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:43
+#: ../../addon/impressum/impressum.php:72
+msgid "Postal Address"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:49
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:71
+msgid "Site Owners Profile"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:73
+msgid "Notes"
+msgstr ""
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:105
 #, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Blocked %s - Click to open/close"
+msgstr ""
 
-#: ../../include/text.php:633 ../../include/nav.php:87
-msgid "Search"
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Monday"
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Tuesday"
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Wednesday"
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Thursday"
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Friday"
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Saturday"
+#: ../../addon/pageheader/pageheader.php:47
+msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: ../../include/text.php:719
-msgid "Sunday"
+#: ../../addon/pageheader/pageheader.php:65
+msgid "pageheader Settings saved."
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "January"
+#: ../../addon/viewsrc/viewsrc.php:25
+msgid "View Source"
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "February"
+#: ../../addon/statusnet/statusnet.php:140
+msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "March"
+#: ../../addon/statusnet/statusnet.php:182
+msgid ""
+"Please contact your site administrator.<br />The provided API URL is not "
+"valid."
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "April"
+#: ../../addon/statusnet/statusnet.php:210
+msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "May"
+#: ../../addon/statusnet/statusnet.php:236
+msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "June"
+#: ../../addon/statusnet/statusnet.php:259
+msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "July"
+#: ../../addon/statusnet/statusnet.php:273
+msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "August"
+#: ../../addon/statusnet/statusnet.php:274
+msgid ""
+"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)."
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "September"
+#: ../../addon/statusnet/statusnet.php:282
+msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "October"
+#: ../../addon/statusnet/statusnet.php:283
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendica 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 Friendica "
+"installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "November"
+#: ../../addon/statusnet/statusnet.php:285
+msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../include/text.php:723
-msgid "December"
+#: ../../addon/statusnet/statusnet.php:288
+msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../include/text.php:793
-msgid "bytes"
+#: ../../addon/statusnet/statusnet.php:291
+msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../include/text.php:885
-msgid "Select an alternate language"
+#: ../../addon/statusnet/statusnet.php:312
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below "
+"and submit the form. Only your <strong>public</strong> posts will be posted "
+"to StatusNet."
 msgstr ""
 
-#: ../../include/text.php:897
-msgid "default"
+#: ../../addon/statusnet/statusnet.php:313
+msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../include/poller.php:459
-msgid "From: "
+#: ../../addon/statusnet/statusnet.php:315
+msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../include/nav.php:44 ../../boot.php:700
-msgid "Logout"
+#: ../../addon/statusnet/statusnet.php:321
+msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../include/nav.php:44
-msgid "End this session"
+#: ../../addon/statusnet/statusnet.php:323
+msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../boot.php:1312
-msgid "Status"
+#: ../../addon/statusnet/statusnet.php:324
+msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
+#: ../../addon/statusnet/statusnet.php:335 ../../addon/twitter/twitter.php:189
+msgid "Currently connected to: "
 msgstr ""
 
-#: ../../include/nav.php:48
-msgid "Your profile page"
+#: ../../addon/statusnet/statusnet.php:336
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated StatusNet account. You can choose to do so by default (here) or "
+"for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1322
-msgid "Photos"
+#: ../../addon/statusnet/statusnet.php:338
+msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../include/nav.php:49
-msgid "Your photos"
+#: ../../addon/statusnet/statusnet.php:341
+msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../include/nav.php:50
-msgid "Your events"
+#: ../../addon/statusnet/statusnet.php:346 ../../addon/twitter/twitter.php:200
+msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../include/nav.php:51
-msgid "Personal notes"
+#: ../../addon/statusnet/statusnet.php:487
+msgid "API URL"
 msgstr ""
 
-#: ../../include/nav.php:51
-msgid "Your personal photos"
+#: ../../addon/tumblr/tumblr.php:36
+msgid "Post to Tumblr"
 msgstr ""
 
-#: ../../include/nav.php:62 ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../boot.php:701
-msgid "Login"
+#: ../../addon/tumblr/tumblr.php:67
+msgid "Tumblr Post Settings"
 msgstr ""
 
-#: ../../include/nav.php:62
-msgid "Sign in"
+#: ../../addon/tumblr/tumblr.php:69
+msgid "Enable Tumblr Post Plugin"
 msgstr ""
 
-#: ../../include/nav.php:73
-msgid "Home Page"
+#: ../../addon/tumblr/tumblr.php:74
+msgid "Tumblr login"
 msgstr ""
 
-#: ../../include/nav.php:77
-msgid "Create an account"
+#: ../../addon/tumblr/tumblr.php:79
+msgid "Tumblr password"
 msgstr ""
 
-#: ../../include/nav.php:82
-msgid "Help and documentation"
+#: ../../addon/tumblr/tumblr.php:84
+msgid "Post to Tumblr by default"
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Apps"
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Addon applications, utilities, games"
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
 msgstr ""
 
-#: ../../include/nav.php:87
-msgid "Search site content"
+#: ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
-#: ../../include/nav.php:97
-msgid "Conversations on this site"
+#: ../../addon/wppost/wppost.php:42
+msgid "Post to Wordpress"
 msgstr ""
 
-#: ../../include/nav.php:99
-msgid "Directory"
+#: ../../addon/wppost/wppost.php:74
+msgid "WordPress Post Settings"
 msgstr ""
 
-#: ../../include/nav.php:99
-msgid "People directory"
+#: ../../addon/wppost/wppost.php:76
+msgid "Enable WordPress Post Plugin"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Conversations from your friends"
+#: ../../addon/wppost/wppost.php:81
+msgid "WordPress username"
 msgstr ""
 
-#: ../../include/nav.php:117
-msgid "Friend Requests"
+#: ../../addon/wppost/wppost.php:86
+msgid "WordPress password"
 msgstr ""
 
-#: ../../include/nav.php:122
-msgid "Private mail"
+#: ../../addon/wppost/wppost.php:91
+msgid "WordPress API URL"
 msgstr ""
 
-#: ../../include/nav.php:125
-msgid "Manage"
+#: ../../addon/wppost/wppost.php:96
+msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../include/nav.php:125
-msgid "Manage other pages"
+#: ../../addon/piwik/piwik.php:70
+msgid ""
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
 msgstr ""
 
-#: ../../include/nav.php:129 ../../boot.php:921
-msgid "Profiles"
+#: ../../addon/piwik/piwik.php:73
+#, php-format
+msgid ""
+"If you do not want that your visits are logged this way you <a href='%s'>can "
+"set a cookie to prevent Piwik from tracking further visits of the site</a> "
+"(opt-out)."
 msgstr ""
 
-#: ../../include/nav.php:129 ../../boot.php:921
-msgid "Manage/edit profiles"
+#: ../../addon/piwik/piwik.php:82
+msgid "Piwik Base URL"
 msgstr ""
 
-#: ../../include/nav.php:130
-msgid "Manage/edit friends and contacts"
+#: ../../addon/piwik/piwik.php:83
+msgid "Site ID"
 msgstr ""
 
-#: ../../include/nav.php:137
-msgid "Admin"
+#: ../../addon/piwik/piwik.php:84
+msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: ../../include/nav.php:137
-msgid "Site setup and configuration"
+#: ../../addon/twitter/twitter.php:78
+msgid "Post to Twitter"
 msgstr ""
 
-#: ../../include/nav.php:160
-msgid "Nothing new here"
+#: ../../addon/twitter/twitter.php:124
+msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../include/message.php:14
-msgid "[no subject]"
+#: ../../addon/twitter/twitter.php:146
+msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:963
+#: ../../addon/twitter/twitter.php:153
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:172
+msgid ""
+"At this Friendica instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:173
+msgid "Log in with Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:175
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:190
+msgid ""
+"If enabled all your <strong>public</strong> postings can be posted to the "
+"associated Twitter account. You can choose to do so by default (here) or for "
+"every posting separately in the posting options when writing the entry."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:192
+msgid "Allow posting to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:195
+msgid "Send public postings to Twitter by default"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:317
+msgid "Consumer key"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:318
+msgid "Consumer secret"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:36
+msgid "Post to Posterous"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:67
+msgid "Posterous Post Settings"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:69
+msgid "Enable Posterous Post Plugin"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:74
+msgid "Posterous login"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:79
+msgid "Posterous password"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:84
+msgid "Post to Posterous by default"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:978
 msgid "Gender:"
 msgstr ""
 
@@ -3916,76 +4396,141 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
+#: ../../include/items.php:1318
+msgid "Birthday:"
+msgstr ""
+
 #: ../../include/profile_advanced.php:34
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:966
+#: ../../include/profile_advanced.php:37 ../../boot.php:981
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:968
+#: ../../include/profile_advanced.php:45 ../../boot.php:983
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:49
-msgid "Religion:"
+#: ../../include/profile_advanced.php:47
+msgid "Tags:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:51
-msgid "About:"
+msgid "Religion:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:53
-msgid "Hobbies/Interests:"
+msgid "About:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:55
-msgid "Contact information and Social Networks:"
+msgid "Hobbies/Interests:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:57
-msgid "Musical interests:"
+msgid "Contact information and Social Networks:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:59
-msgid "Books, literature:"
+msgid "Musical interests:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:61
-msgid "Television:"
+msgid "Books, literature:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:63
-msgid "Film/dance/culture/entertainment:"
+msgid "Television:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:65
-msgid "Love/Romance:"
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:67
-msgid "Work/employment:"
+msgid "Love/Romance:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:69
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:71
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:243
-msgid "Starts:"
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:251
-msgid "Finishes:"
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
 msgstr ""
 
-#: ../../include/items.php:2413
-msgid "A new person is sharing with you at "
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
 msgstr ""
 
-#: ../../include/items.php:2413
-msgid "You have a new follower at "
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
+msgstr ""
+
+#: ../../include/contact_selectors.php:36
+msgid "OK, probably harmless"
+msgstr ""
+
+#: ../../include/contact_selectors.php:37
+msgid "Reputable, has my trust"
+msgstr ""
+
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
+msgstr ""
+
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr ""
+
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
+msgstr ""
+
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
 #: ../../include/profile_selectors.php:6
@@ -4200,477 +4745,316 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/Contact.php:125 ../../include/conversation.php:723
-msgid "View status"
-msgstr ""
-
-#: ../../include/Contact.php:126 ../../include/conversation.php:724
-msgid "View profile"
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:255
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/Contact.php:127 ../../include/conversation.php:725
-msgid "View photos"
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:263
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/Contact.php:128 ../../include/Contact.php:141
-#: ../../include/conversation.php:726
-msgid "View recent"
+#: ../../include/delivery.php:416 ../../include/notifier.php:629
+msgid "(no subject)"
 msgstr ""
 
-#: ../../include/Contact.php:130 ../../include/Contact.php:141
-#: ../../include/conversation.php:728
-msgid "Send PM"
+#: ../../include/delivery.php:423 ../../include/enotify.php:16
+#: ../../include/notifier.php:636
+msgid "noreply"
 msgstr ""
 
-#: ../../include/conversation.php:23 ../../include/conversation.php:96
-#: ../../addon/communityhome/communityhome.php:155
-msgid "event"
+#: ../../include/text.php:232
+msgid "prev"
 msgstr ""
 
-#: ../../include/conversation.php:252 ../../include/conversation.php:508
-msgid "Select"
+#: ../../include/text.php:234
+msgid "first"
 msgstr ""
 
-#: ../../include/conversation.php:267 ../../include/conversation.php:602
-#: ../../include/conversation.php:603
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/text.php:263
+msgid "last"
 msgstr ""
 
-#: ../../include/conversation.php:276 ../../include/conversation.php:614
-#, php-format
-msgid "%s from %s"
+#: ../../include/text.php:266
+msgid "next"
 msgstr ""
 
-#: ../../include/conversation.php:292
-msgid "View in context"
+#: ../../include/text.php:557
+msgid "No contacts"
 msgstr ""
 
-#: ../../include/conversation.php:407
+#: ../../include/text.php:566
 #, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
+msgid "%d Contact"
+msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:410 ../../boot.php:439
-msgid "show more"
-msgstr ""
-
-#: ../../include/conversation.php:470
-msgid "like"
-msgstr ""
-
-#: ../../include/conversation.php:471
-msgid "dislike"
-msgstr ""
-
-#: ../../include/conversation.php:473
-msgid "Share this"
-msgstr ""
-
-#: ../../include/conversation.php:473
-msgid "share"
-msgstr ""
-
-#: ../../include/conversation.php:518
-msgid "add star"
-msgstr ""
-
-#: ../../include/conversation.php:519
-msgid "remove star"
-msgstr ""
-
-#: ../../include/conversation.php:520
-msgid "toggle star status"
-msgstr ""
-
-#: ../../include/conversation.php:523
-msgid "starred"
-msgstr ""
-
-#: ../../include/conversation.php:524
-msgid "add tag"
-msgstr ""
-
-#: ../../include/conversation.php:604
-msgid "to"
-msgstr ""
-
-#: ../../include/conversation.php:605
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../include/conversation.php:606
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: ../../include/conversation.php:648
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:778
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:778
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:782
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgstr ""
-
-#: ../../include/conversation.php:784
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:790
-msgid "and"
+#: ../../include/text.php:637 ../../include/nav.php:87
+msgid "Search"
 msgstr ""
 
-#: ../../include/conversation.php:793
-#, php-format
-msgid ", and %d other people"
+#: ../../include/text.php:735
+msgid "Monday"
 msgstr ""
 
-#: ../../include/conversation.php:794
-#, php-format
-msgid "%s like this."
+#: ../../include/text.php:735
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/conversation.php:794
-#, php-format
-msgid "%s don't like this."
+#: ../../include/text.php:735
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/conversation.php:814
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/text.php:735
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/conversation.php:816
-msgid "Please enter a video link/URL:"
+#: ../../include/text.php:735
+msgid "Friday"
 msgstr ""
 
-#: ../../include/conversation.php:817
-msgid "Please enter an audio link/URL:"
+#: ../../include/text.php:735
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/conversation.php:818
-msgid "Tag term:"
+#: ../../include/text.php:735
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/conversation.php:819
-msgid "Where are you right now?"
+#: ../../include/text.php:739
+msgid "January"
 msgstr ""
 
-#: ../../include/conversation.php:820
-msgid "Enter a title for this item"
+#: ../../include/text.php:739
+msgid "February"
 msgstr ""
 
-#: ../../include/conversation.php:864
-msgid "upload photo"
+#: ../../include/text.php:739
+msgid "March"
 msgstr ""
 
-#: ../../include/conversation.php:866
-msgid "attach file"
+#: ../../include/text.php:739
+msgid "April"
 msgstr ""
 
-#: ../../include/conversation.php:868
-msgid "web link"
+#: ../../include/text.php:739
+msgid "May"
 msgstr ""
 
-#: ../../include/conversation.php:869
-msgid "Insert video link"
+#: ../../include/text.php:739
+msgid "June"
 msgstr ""
 
-#: ../../include/conversation.php:870
-msgid "video link"
+#: ../../include/text.php:739
+msgid "July"
 msgstr ""
 
-#: ../../include/conversation.php:871
-msgid "Insert audio link"
+#: ../../include/text.php:739
+msgid "August"
 msgstr ""
 
-#: ../../include/conversation.php:872
-msgid "audio link"
+#: ../../include/text.php:739
+msgid "September"
 msgstr ""
 
-#: ../../include/conversation.php:874
-msgid "set location"
+#: ../../include/text.php:739
+msgid "October"
 msgstr ""
 
-#: ../../include/conversation.php:876
-msgid "clear location"
+#: ../../include/text.php:739
+msgid "November"
 msgstr ""
 
-#: ../../include/conversation.php:878
-msgid "Set title"
+#: ../../include/text.php:739
+msgid "December"
 msgstr ""
 
-#: ../../include/conversation.php:881
-msgid "permissions"
+#: ../../include/text.php:809
+msgid "bytes"
 msgstr ""
 
-#: ../../include/notifier.php:628 ../../include/delivery.php:415
-msgid "(no subject)"
+#: ../../include/text.php:901
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/notifier.php:635 ../../include/enotify.php:16
-msgid "noreply"
+#: ../../include/text.php:913
+msgid "default"
 msgstr ""
 
 #: ../../include/diaspora.php:570
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1862
+#: ../../include/diaspora.php:1895
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2045
+#: ../../include/diaspora.php:2078
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:53
-msgid "view full size"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
-msgid "image/photo"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:102 ../../addon/facebook/facebook.php:869
-#: ../../addon/facebook/facebook.php:878
-msgid "link"
-msgstr ""
-
-#: ../../include/acl_selectors.php:279
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/acl_selectors.php:280
-msgid "show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:281
-msgid "don't show"
-msgstr ""
-
-#: ../../include/enotify.php:8
-msgid "Friendica Notification"
-msgstr ""
-
-#: ../../include/enotify.php:11
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/enotify.php:13
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/enotify.php:28
-#, php-format
-msgid "New mail received at %s"
-msgstr ""
-
-#: ../../include/enotify.php:30
-#, php-format
-msgid "%s sent you a new private message at %s."
-msgstr ""
-
-#: ../../include/enotify.php:32
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: ../../include/enotify.php:40
-#, php-format
-msgid "%s commented on an item at %s"
-msgstr ""
-
-#: ../../include/enotify.php:41
-#, php-format
-msgid "%s commented on an item/conversation you have been following."
-msgstr ""
-
-#: ../../include/enotify.php:42 ../../include/enotify.php:51
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/oembed.php:128
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/enotify.php:49
-#, php-format
-msgid "%s posted to your profile wall at %s"
+#: ../../include/oembed.php:137
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/enotify.php:58
-#, php-format
-msgid "Introduction received at %s"
+#: ../../include/group.php:25
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/enotify.php:59
-#, php-format
-msgid "You've received an introduction from '%s' at %s"
+#: ../../include/group.php:168
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/enotify.php:60 ../../include/enotify.php:73
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/group.php:191
+msgid "edit"
 msgstr ""
 
-#: ../../include/enotify.php:62
-#, php-format
-msgid "Please visit %s to approve or reject the introduction."
+#: ../../include/group.php:212
+msgid "Groups"
 msgstr ""
 
-#: ../../include/enotify.php:69
-#, php-format
-msgid "Friend suggestion received at %s"
+#: ../../include/group.php:213
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/enotify.php:70
-#, php-format
-msgid "You've received a friend suggestion from '%s' at %s"
+#: ../../include/group.php:214
+msgid "Create a new group"
 msgstr ""
 
-#: ../../include/enotify.php:71
-msgid "Name:"
+#: ../../include/nav.php:44 ../../boot.php:705
+msgid "Logout"
 msgstr ""
 
-#: ../../include/enotify.php:72
-msgid "Photo:"
+#: ../../include/nav.php:44
+msgid "End this session"
 msgstr ""
 
-#: ../../include/enotify.php:75
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/nav.php:47 ../../boot.php:1327
+msgid "Status"
 msgstr ""
 
-#: ../../include/bbcode.php:166 ../../include/bbcode.php:225
-msgid "Image/photo"
+#: ../../include/nav.php:47 ../../include/nav.php:111
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
+#: ../../include/nav.php:48
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
+#: ../../include/nav.php:49 ../../boot.php:1337
+msgid "Photos"
 msgstr ""
 
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: ../../include/nav.php:49
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: ../../include/nav.php:50
+msgid "Your events"
 msgstr ""
 
-#: ../../include/contact_selectors.php:36
-msgid "OK, probably harmless"
+#: ../../include/nav.php:51
+msgid "Personal notes"
 msgstr ""
 
-#: ../../include/contact_selectors.php:37
-msgid "Reputable, has my trust"
+#: ../../include/nav.php:51
+msgid "Your personal photos"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
+#: ../../include/nav.php:62
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
+#: ../../include/nav.php:73
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
+#: ../../include/nav.php:77
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
+#: ../../include/nav.php:82
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/nav.php:85
+msgid "Apps"
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/nav.php:85
+msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
+#: ../../include/nav.php:87
+msgid "Search site content"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: ../../include/nav.php:97
+msgid "Conversations on this site"
 msgstr ""
 
-#: ../../include/contact_selectors.php:81
-#: ../../addon/facebook/facebook.php:475
-msgid "Facebook"
+#: ../../include/nav.php:99
+msgid "Directory"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
+#: ../../include/nav.php:99
+msgid "People directory"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/nav.php:109
+msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/nav.php:117
+msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/nav.php:119
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/auth.php:27
-msgid "Logged out."
+#: ../../include/nav.php:123
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/oembed.php:128
-msgid "Embedded content"
+#: ../../include/nav.php:126
+msgid "Manage"
 msgstr ""
 
-#: ../../include/oembed.php:137
-msgid "Embedding disabled"
+#: ../../include/nav.php:126
+msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/nav.php:130 ../../boot.php:936
+msgid "Profiles"
 msgstr ""
 
-#: ../../include/group.php:168
-msgid "Everybody"
+#: ../../include/nav.php:130 ../../boot.php:936
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/group.php:191
-msgid "edit"
+#: ../../include/nav.php:131
+msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/group.php:212
-msgid "Groups"
+#: ../../include/nav.php:138
+msgid "Admin"
 msgstr ""
 
-#: ../../include/group.php:213
-msgid "Edit group"
+#: ../../include/nav.php:138
+msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/group.php:214
-msgid "Create a new group"
+#: ../../include/nav.php:161
+msgid "Nothing new here"
 msgstr ""
 
 #: ../../include/contact_widgets.php:6
@@ -4724,695 +5108,519 @@ msgstr ""
 msgid "All Networks"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:337
-msgid "Facebook disabled"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:342
-msgid "Updating contacts"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:351
-msgid "Facebook API key is missing."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:358
-msgid "Facebook Connect"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:364
-msgid "Install Facebook connector for this account."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:371
-msgid "Remove Facebook connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:376
-msgid ""
-"Re-authenticate [This is necessary whenever your Facebook password is "
-"changed.]"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:383
-msgid "Post to Facebook by default"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:387
-msgid "Link all your Facebook friends and conversations on this website"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:389
-msgid ""
-"Facebook conversations consist of your <em>profile wall</em> and your friend "
-"<em>stream</em>."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:390
-msgid "On this website, your Facebook friend stream is only visible to you."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:391
-msgid ""
-"The following settings determine the privacy of your Facebook profile wall "
-"on this website."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:395
-msgid ""
-"On this website your Facebook profile wall conversations will only be "
-"visible to you"
+#: ../../include/auth.php:29
+msgid "Logged out."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:400
-msgid "Do not import your Facebook profile wall conversations"
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:402
-msgid ""
-"If you choose to link conversations and leave both of these boxes unchecked, "
-"your Facebook profile wall will be merged with your profile wall on this "
-"website and your privacy settings on this website will be used to determine "
-"who may see the conversations."
+#: ../../include/datetime.php:121 ../../include/datetime.php:253
+msgid "year"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:407
-msgid "Comma separated applications to ignore"
+#: ../../include/datetime.php:126 ../../include/datetime.php:254
+msgid "month"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:476
-msgid "Facebook Connector Settings"
+#: ../../include/datetime.php:131 ../../include/datetime.php:256
+msgid "day"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:490
-msgid "Post to Facebook"
+#: ../../include/datetime.php:244
+msgid "never"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:581
-msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
+#: ../../include/datetime.php:250
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:644
-msgid "Image: "
+#: ../../include/datetime.php:253
+msgid "years"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:720
-msgid "View on Friendica"
+#: ../../include/datetime.php:254
+msgid "months"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:744
-msgid "Facebook post failed. Queued for retry."
+#: ../../include/datetime.php:255
+msgid "week"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:41
-msgid "Post to Wordpress"
+#: ../../include/datetime.php:255
+msgid "weeks"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:73
-msgid "WordPress Post Settings"
+#: ../../include/datetime.php:256
+msgid "days"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:75
-msgid "Enable WordPress Post Plugin"
+#: ../../include/datetime.php:257
+msgid "hour"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:80
-msgid "WordPress username"
+#: ../../include/datetime.php:257
+msgid "hours"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:85
-msgid "WordPress password"
+#: ../../include/datetime.php:258
+msgid "minute"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:90
-msgid "WordPress API URL"
+#: ../../include/datetime.php:258
+msgid "minutes"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:95
-msgid "Post to WordPress by default"
+#: ../../include/datetime.php:259
+msgid "second"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:171 ../../addon/tumblr/tumblr.php:174
-#: ../../addon/posterous/posterous.php:172
-msgid "Post from Friendica"
+#: ../../include/datetime.php:259
+msgid "seconds"
 msgstr ""
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:56
+#: ../../include/datetime.php:267
 #, php-format
-msgid ""
-"Allow to use your friendika id (%s) to connecto to external unhosted-enabled "
-"storage (like ownCloud)"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../addon/uhremotestorage/uhremotestorage.php:57
-msgid "Unhosted DAV storage url"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:35
-msgid "Post to Tumblr"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:66
-msgid "Tumblr Post Settings"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:68
-msgid "Enable Tumblr Post Plugin"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:73
-msgid "Tumblr login"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:78
-msgid "Tumblr password"
-msgstr ""
-
-#: ../../addon/tumblr/tumblr.php:83
-msgid "Post to Tumblr by default"
+#: ../../include/poller.php:459
+msgid "From: "
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:30
-msgid "OEmbed settings updated"
+#: ../../include/bbcode.php:166 ../../include/bbcode.php:225
+msgid "Image/photo"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
+#: ../../include/dba.php:39
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:71
-msgid "URL to embed:"
+#: ../../include/message.php:14
+msgid "[no subject]"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:35
-msgid "Post to Posterous"
+#: ../../include/acl_selectors.php:279
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:66
-msgid "Posterous Post Settings"
+#: ../../include/acl_selectors.php:280
+msgid "show"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:68
-msgid "Enable Posterous Post Plugin"
+#: ../../include/acl_selectors.php:281
+msgid "don't show"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:73
-msgid "Posterous login"
+#: ../../include/enotify.php:8
+msgid "Friendica Notification"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:78
-msgid "Posterous password"
+#: ../../include/enotify.php:11
+msgid "Thank You,"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:83
-msgid "Post to Posterous by default"
+#: ../../include/enotify.php:13
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:43
-msgid "Upload a file"
+#: ../../include/enotify.php:28
+#, php-format
+msgid "New mail received at %s"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:44
-msgid "Drop files here to upload"
+#: ../../include/enotify.php:30
+#, php-format
+msgid "%s sent you a new private message at %s."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:46
-msgid "Failed"
+#: ../../include/enotify.php:32
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:294
-msgid "No files were uploaded."
+#: ../../include/enotify.php:40
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:300
-msgid "Uploaded file is empty"
+#: ../../include/enotify.php:41
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:323
-msgid "File has an invalid extension, it should be one of "
+#: ../../include/enotify.php:42 ../../include/enotify.php:51
+#: ../../include/enotify.php:60 ../../include/enotify.php:69
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:334
-msgid "Upload was cancelled, or server error encountered"
+#: ../../include/enotify.php:49
+#, php-format
+msgid "%s posted to your profile wall at %s"
 msgstr ""
 
-#: ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
+#: ../../include/enotify.php:58
+#, php-format
+msgid "%s tagged you at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:141
-msgid "Post to StatusNet"
+#: ../../include/enotify.php:67
+#, php-format
+msgid "%s tagged your post at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:183
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
+#: ../../include/enotify.php:76
+#, php-format
+msgid "Introduction received at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:211
-msgid "We could not contact the StatusNet API with the Path you entered."
+#: ../../include/enotify.php:77
+#, php-format
+msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:238
-msgid "StatusNet settings updated."
+#: ../../include/enotify.php:78 ../../include/enotify.php:91
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:261
-msgid "StatusNet Posting Settings"
+#: ../../include/enotify.php:80
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:275
-msgid "Globally Available StatusNet OAuthKeys"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "Friend suggestion received at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:276
-msgid ""
-"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)."
+#: ../../include/enotify.php:88
+#, php-format
+msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:284
-msgid "Provide your own OAuth Credentials"
+#: ../../include/enotify.php:89
+msgid "Name:"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:285
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendica 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 Friendica "
-"installation at your favorited StatusNet installation."
+#: ../../include/enotify.php:90
+msgid "Photo:"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:287
-msgid "OAuth Consumer Key"
+#: ../../include/enotify.php:93
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:290
-msgid "OAuth Consumer Secret"
+#: ../../include/items.php:2450
+msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:293
-msgid "Base API Path (remember the trailing /)"
+#: ../../include/items.php:2450
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:314
-msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below "
-"and submit the form. Only your <strong>public</strong> posts will be posted "
-"to StatusNet."
+#: ../../include/bb2diaspora.php:64
+msgid "view full size"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:315
-msgid "Log in with StatusNet"
+#: ../../include/bb2diaspora.php:113 ../../include/bb2diaspora.php:123
+#: ../../include/bb2diaspora.php:124
+msgid "image/photo"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:317
-msgid "Copy the security code from StatusNet here"
+#: ../../include/security.php:20
+msgid "Welcome "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:323
-msgid "Cancel Connection Process"
+#: ../../include/security.php:21
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:325
-msgid "Current StatusNet API is"
+#: ../../include/security.php:24
+msgid "Welcome back "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:326
-msgid "Cancel StatusNet Connection"
+#: ../../include/Contact.php:131 ../../include/conversation.php:744
+msgid "View status"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:337 ../../addon/twitter/twitter.php:188
-msgid "Currently connected to: "
+#: ../../include/Contact.php:132 ../../include/conversation.php:745
+msgid "View profile"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:338
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated StatusNet account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
+#: ../../include/Contact.php:133 ../../include/conversation.php:746
+msgid "View photos"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:340
-msgid "Allow posting to StatusNet"
+#: ../../include/Contact.php:134 ../../include/Contact.php:147
+#: ../../include/conversation.php:747
+msgid "View recent"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:343
-msgid "Send public postings to StatusNet by default"
+#: ../../include/Contact.php:136 ../../include/Contact.php:147
+#: ../../include/conversation.php:749
+msgid "Send PM"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:348 ../../addon/twitter/twitter.php:199
-msgid "Clear OAuth configuration"
+#: ../../include/conversation.php:141
+msgid "post/item"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:478
-msgid "API URL"
+#: ../../include/conversation.php:142
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:55
-msgid "Generate new key"
+#: ../../include/conversation.php:279 ../../include/conversation.php:535
+msgid "Select"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:58
-msgid "Widgets key"
+#: ../../include/conversation.php:294 ../../include/conversation.php:623
+#: ../../include/conversation.php:624
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:60
-msgid "Widgets available"
+#: ../../include/conversation.php:303 ../../include/conversation.php:635
+#, php-format
+msgid "%s from %s"
 msgstr ""
 
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendica!"
+#: ../../include/conversation.php:319
+msgid "View in context"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../addon/widgets/widget_like.php:61
+#: ../../include/conversation.php:434
 #, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
+msgid "%d comment"
+msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../addon/twitter/twitter.php:78
-msgid "Post to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:123
-msgid "Twitter settings updated."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:145
-msgid "Twitter Posting Settings"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:152
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:171
-msgid ""
-"At this Friendica instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:172
-msgid "Log in with Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:174
-msgid "Copy the PIN from Twitter here"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:189
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for "
-"every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:191
-msgid "Allow posting to Twitter"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:194
-msgid "Send public postings to Twitter by default"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:301
-msgid "Consumer key"
-msgstr ""
-
-#: ../../addon/twitter/twitter.php:302
-msgid "Consumer secret"
-msgstr ""
-
-#: ../../addon/impressum/impressum.php:25
-msgid "Impressum"
-msgstr ""
-
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
-msgid "Site Owner"
-msgstr ""
-
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
-msgid "Email Address"
-msgstr ""
-
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
-msgid "Postal Address"
-msgstr ""
-
-#: ../../addon/impressum/impressum.php:49
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
+#: ../../include/conversation.php:437 ../../boot.php:444
+msgid "show more"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:71
-msgid "Site Owners Profile"
+#: ../../include/conversation.php:497
+msgid "like"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:73
-msgid "Notes"
+#: ../../include/conversation.php:498
+msgid "dislike"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:20
-msgid "Three Dimensional Tic-Tac-Toe"
+#: ../../include/conversation.php:500
+msgid "Share this"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:53
-msgid "3D Tic-Tac-Toe"
+#: ../../include/conversation.php:500
+msgid "share"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:58
-msgid "New game"
+#: ../../include/conversation.php:545
+msgid "add star"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:59
-msgid "New game with handicap"
+#: ../../include/conversation.php:546
+msgid "remove star"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:60
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
+#: ../../include/conversation.php:547
+msgid "toggle star status"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:61
-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."
+#: ../../include/conversation.php:550
+msgid "starred"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:63
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
+#: ../../include/conversation.php:551
+msgid "add tag"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:182
-msgid "You go first..."
+#: ../../include/conversation.php:625
+msgid "to"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:187
-msgid "I'm going first this time..."
+#: ../../include/conversation.php:626
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:193
-msgid "You won!"
+#: ../../include/conversation.php:627
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
-msgid "\"Cat\" game!"
+#: ../../include/conversation.php:669
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:222
-msgid "I won!"
+#: ../../include/conversation.php:801
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:70
-msgid ""
-"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
-"analytics tool."
+#: ../../include/conversation.php:801
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:73
+#: ../../include/conversation.php:805
 #, php-format
-msgid ""
-"If you do not want that your visits are logged this way you <a href='%s'>can "
-"set a cookie to prevent Piwik from tracking further visits of the site</a> "
-"(opt-out)."
+msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:82
-msgid "Piwik Base URL"
+#: ../../include/conversation.php:807
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:83
-msgid "Site ID"
+#: ../../include/conversation.php:813
+msgid "and"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:84
-msgid "Show opt-out cookie link?"
+#: ../../include/conversation.php:816
+#, php-format
+msgid ", and %d other people"
 msgstr ""
 
-#: ../../addon/membersince/membersince.php:17
+#: ../../include/conversation.php:817
 #, php-format
-msgid " - Member since: %s"
+msgid "%s like this."
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:29
-msgid "OpenID"
+#: ../../include/conversation.php:817
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
+#: ../../include/conversation.php:842
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:81
-msgid "Most active users"
+#: ../../include/conversation.php:844
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
+#: ../../include/conversation.php:845
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
+#: ../../include/conversation.php:846
+msgid "Tag term:"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:47
-msgid "\"pageheader\" Settings"
+#: ../../include/conversation.php:847
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:65
-msgid "pageheader Settings saved."
+#: ../../include/conversation.php:848
+msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:170
-msgid "Randplace Settings"
+#: ../../include/conversation.php:891
+msgid "upload photo"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:172
-msgid "Enable Randplace Plugin"
+#: ../../include/conversation.php:893
+msgid "attach file"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:47
-msgid "\"Blockem\" Settings"
+#: ../../include/conversation.php:895
+msgid "web link"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:49
-msgid "Comma separated profile URLS to block"
+#: ../../include/conversation.php:896
+msgid "Insert video link"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:66
-msgid "BLOCKEM Settings saved."
+#: ../../include/conversation.php:897
+msgid "video link"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:104
-#, php-format
-msgid "Blocked %s - Click to open/close"
+#: ../../include/conversation.php:898
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
+#: ../../include/conversation.php:899
+msgid "audio link"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:49
-msgid "Comma separated words to treat as NSFW"
+#: ../../include/conversation.php:901
+msgid "set location"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:66
-msgid "NSFW Settings saved."
+#: ../../include/conversation.php:903
+msgid "clear location"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:102
-#, php-format
-msgid "%s - Click to open/close"
+#: ../../include/conversation.php:908
+msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:437
+#: ../../boot.php:442
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:440
+#: ../../boot.php:445
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:683
+#: ../../boot.php:688
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:703
+#: ../../boot.php:708
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:704
+#: ../../boot.php:709
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:707
+#: ../../boot.php:712
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:713
+#: ../../boot.php:718
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:860
+#: ../../boot.php:875
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1027 ../../boot.php:1098
+#: ../../boot.php:1042 ../../boot.php:1113
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1028 ../../boot.php:1099
+#: ../../boot.php:1043 ../../boot.php:1114
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1053
+#: ../../boot.php:1068
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1054
+#: ../../boot.php:1069
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1077 ../../boot.php:1141
+#: ../../boot.php:1092 ../../boot.php:1156
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1122
+#: ../../boot.php:1137
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1123
+#: ../../boot.php:1138
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1135
+#: ../../boot.php:1150
 msgid "[No description]"
 msgstr ""
author	Michael <icarus@dabo.de>	2012-02-19 20:09:42 +0100
committer	Michael <icarus@dabo.de>	2012-02-19 20:09:42 +0100
commit	cafd4003522a472d2709569ea5eb5f80b817af23 (patch)
tree	bbd512126515afc929de06dce79ba847b9681092 /util
parent	73e0e4d78341cb96ef9665a0ee4fb7e7ee2a701f (diff)
parent	a9ed5915cebcf51347acaad51d0c252e57bceaff (diff)
download	volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.gz volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.tar.bz2 volse-hubzilla-cafd4003522a472d2709569ea5eb5f80b817af23.zip