Merge remote branch 'upstream/master'

1 files changed, 497 insertions, 168 deletions

diff --git a/util/strings.php b/util/strings.php
index d0e36217b..e70766d86 100755
--- a/util/strings.php
+++ b/util/strings.php
@@ -2,39 +2,42 @@
 
 ;
 $a->strings["Post successful."] = "";
+$a->strings["[Embedded content - reload page to view]"] = "";
 $a->strings["Contact settings applied."] = "";
 $a->strings["Contact update failed."] = "";
 $a->strings["Permission denied."] = "";
 $a->strings["Contact not found."] = "";
 $a->strings["Repair Contact Settings"] = "";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact will stop working."] = "";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "";
+$a->strings["Return to contact editor"] = "";
 $a->strings["Name"] = "";
 $a->strings["Account Nickname"] = "";
+$a->strings["@Tagname - overrides Name/Nickname"] = "";
 $a->strings["Account URL"] = "";
 $a->strings["Friend Request URL"] = "";
 $a->strings["Friend Confirm URL"] = "";
 $a->strings["Notification Endpoint URL"] = "";
 $a->strings["Poll/Feed URL"] = "";
+$a->strings["New photo from this URL"] = "";
 $a->strings["Submit"] = "";
 $a->strings["Help:"] = "";
 $a->strings["Help"] = "";
+$a->strings["Not Found"] = "";
+$a->strings["Page not found."] = "";
 $a->strings["File exceeds size limit of %d"] = "";
 $a->strings["File upload failed."] = "";
 $a->strings["Friend suggestion sent."] = "";
 $a->strings["Suggest Friends"] = "";
 $a->strings["Suggest a friend for %s"] = "";
-$a->strings["Status"] = "";
-$a->strings["Profile"] = "";
-$a->strings["Photos"] = "";
+$a->strings["Event description and start time are required."] = "";
+$a->strings["l, F j"] = "";
+$a->strings["Edit event"] = "";
+$a->strings["link to source"] = "";
 $a->strings["Events"] = "";
-$a->strings["Personal Notes"] = "";
 $a->strings["Create New Event"] = "";
 $a->strings["Previous"] = "";
 $a->strings["Next"] = "";
-$a->strings["l, F j"] = "";
-$a->strings["Edit event"] = "";
-$a->strings["link to source"] = "";
 $a->strings["hour:minute"] = "";
 $a->strings["Event details"] = "";
 $a->strings["Format is %s %s. Starting date and Description are required."] = "";
@@ -51,8 +54,15 @@ $a->strings["Remove Item Tag"] = "";
 $a->strings["Select a tag to remove: "] = "";
 $a->strings["Remove"] = "";
 $a->strings["%s welcomes %s"] = "";
+$a->strings["Authorize application connection"] = "";
+$a->strings["Return to your app and insert this Securty Code:"] = "";
+$a->strings["Please login to continue."] = "";
+$a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "";
+$a->strings["Yes"] = "";
+$a->strings["No"] = "";
 $a->strings["Photo Albums"] = "";
 $a->strings["Contact Photos"] = "";
+$a->strings["Upload New Photos"] = "";
 $a->strings["everybody"] = "";
 $a->strings["Contact information unavailable"] = "";
 $a->strings["Profile Photos"] = "";
@@ -72,10 +82,13 @@ $a->strings["Access to this item is restricted."] = "";
 $a->strings["Upload Photos"] = "";
 $a->strings["New album name: "] = "";
 $a->strings["or existing album name: "] = "";
+$a->strings["Do not show a status post for this upload"] = "";
 $a->strings["Permissions"] = "";
 $a->strings["Edit Album"] = "";
 $a->strings["View Photo"] = "";
+$a->strings["Permission denied. Access to this item may be restricted."] = "";
 $a->strings["Photo not available"] = "";
+$a->strings["View photo"] = "";
 $a->strings["Edit photo"] = "";
 $a->strings["Use as profile photo"] = "";
 $a->strings["Private Message"] = "";
@@ -92,14 +105,20 @@ $a->strings["Share"] = "";
 $a->strings["Please wait"] = "";
 $a->strings["This is you"] = "";
 $a->strings["Comment"] = "";
+$a->strings["Preview"] = "";
 $a->strings["Delete"] = "";
-$a->strings["Recent Photos"] = "";
-$a->strings["Upload New Photos"] = "";
 $a->strings["View Album"] = "";
+$a->strings["Recent Photos"] = "";
 $a->strings["Not available."] = "";
 $a->strings["Community"] = "";
 $a->strings["No results."] = "";
-$a->strings["Shared content is covered by the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."] = "";
+$a->strings["This is Friendica, version"] = "";
+$a->strings["running at web location"] = "";
+$a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "";
+$a->strings["Bug reports and issues: please visit"] = "";
+$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "";
+$a->strings["Installed plugins/addons/apps"] = "";
+$a->strings["No installed plugins/addons/apps"] = "";
 $a->strings["Item not found"] = "";
 $a->strings["Edit post"] = "";
 $a->strings["Post to Email"] = "";
@@ -115,6 +134,7 @@ $a->strings["Clear browser location"] = "";
 $a->strings["Permission settings"] = "";
 $a->strings["CC: email addresses"] = "";
 $a->strings["Public post"] = "";
+$a->strings["Set title"] = "";
 $a->strings["Example: bob@example.com, mary@example.com"] = "";
 $a->strings["This introduction has already been accepted."] = "";
 $a->strings["Profile location is not valid or does not contain profile information."] = "";
@@ -144,49 +164,59 @@ $a->strings["Welcome home %s."] = "";
 $a->strings["Please confirm your introduction/connection request to %s."] = "";
 $a->strings["Confirm"] = "";
 $a->strings["[Name Withheld]"] = "";
-$a->strings["Introduction received at "] = "";
-$a->strings["Administrator"] = "";
+$a->strings["Diaspora members: Please do not use this form. Instead, enter \"%s\" into your Diaspora search bar."] = "";
+$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "";
 $a->strings["Friend/Connection Request"] = "";
-$a->strings["Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca"] = "";
+$a->strings["Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"] = "";
 $a->strings["Please answer the following:"] = "";
 $a->strings["Does %s know you?"] = "";
-$a->strings["Yes"] = "";
-$a->strings["No"] = "";
 $a->strings["Add a personal note:"] = "";
-$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "";
-$a->strings["Friendika"] = "";
+$a->strings["Friendica"] = "";
 $a->strings["StatusNet/Federated Social Web"] = "";
-$a->strings["Private (secure) network"] = "";
-$a->strings["Public (insecure) network"] = "";
+$a->strings["Diaspora"] = "";
+$a->strings["- please share from your own site as noted above"] = "";
 $a->strings["Your Identity Address:"] = "";
 $a->strings["Submit Request"] = "";
-$a->strings["Could not create/connect to database."] = "";
-$a->strings["Connected to database."] = "";
-$a->strings["Proceed with Installation"] = "";
-$a->strings["Your Friendika site database has been installed."] = "";
+$a->strings["Friendica Social Communications Server - Setup"] = "";
+$a->strings["Database connection"] = "";
+$a->strings["Could not connect to database."] = "";
+$a->strings["Could not create table."] = "";
+$a->strings["Your Friendica site database has been installed."] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "";
 $a->strings["Proceed to registration"] = "";
-$a->strings["Database import failed."] = "";
+$a->strings["Proceed with Installation"] = "";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "";
-$a->strings["Welcome to Friendika."] = "";
-$a->strings["Friendika Social Network"] = "";
-$a->strings["Installation"] = "";
-$a->strings["In order to install Friendika we need to know how to connect to your database."] = "";
+$a->strings["Database import failed."] = "";
+$a->strings["System check"] = "";
+$a->strings["Check again"] = "";
+$a->strings["In order to install Friendica we need to know how to connect to your database."] = "";
 $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = "";
 $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = "";
 $a->strings["Database Server Name"] = "";
 $a->strings["Database Login Name"] = "";
 $a->strings["Database Login Password"] = "";
 $a->strings["Database Name"] = "";
+$a->strings["Site administrator email address"] = "";
+$a->strings["Your account email address must match this in order to use the web admin panel."] = "";
 $a->strings["Please select a default timezone for your website"] = "";
-$a->strings["Site administrator email address. Your account email address must match this in order to use the web admin panel."] = "";
+$a->strings["Site settings"] = "";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "";
-$a->strings["This is required. Please adjust the configuration file .htconfig.php accordingly."] = "";
+$a->strings["PHP executable path"] = "";
+$a->strings["Enter full path to php executable"] = "";
+$a->strings["Command line PHP"] = "";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "";
 $a->strings["This is required for message delivery to work."] = "";
+$a->strings["PHP \"register_argc_argv\""] = "";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "";
 $a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "";
+$a->strings["Generate encryption keys"] = "";
+$a->strings["libCurl PHP module"] = "";
+$a->strings["GD graphics PHP module"] = "";
+$a->strings["OpenSSL PHP module"] = "";
+$a->strings["mysqli PHP module"] = "";
+$a->strings["mb_string PHP module"] = "";
+$a->strings["Apace mod_rewrite module"] = "";
 $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "";
 $a->strings["Error: libCURL PHP module required but not installed."] = "";
 $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "";
@@ -197,11 +227,20 @@ $a->strings["The web installer needs to be able to create a file called \".htcon
 $a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "";
 $a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "";
 $a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
+$a->strings[".htconfig.php is writable"] = "";
 $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "";
 $a->strings["Errors encountered creating database tables."] = "";
-$a->strings["[Embedded content - reload page to view]"] = "";
+$a->strings["l F d, Y \\@ g:i A"] = "";
+$a->strings["Time Conversion"] = "";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "";
+$a->strings["UTC time: %s"] = "";
+$a->strings["Current timezone: %s"] = "";
+$a->strings["Converted localtime: %s"] = "";
+$a->strings["Please select your timezone:"] = "";
 $a->strings["Profile Match"] = "";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "";
+$a->strings["is interested in:"] = "";
+$a->strings["Connect"] = "";
 $a->strings["No matches"] = "";
 $a->strings["Remote privacy information not available."] = "";
 $a->strings["Visible to:"] = "";
@@ -209,31 +248,45 @@ $a->strings["Welcome to %s"] = "";
 $a->strings["Invalid request identifier."] = "";
 $a->strings["Discard"] = "";
 $a->strings["Ignore"] = "";
-$a->strings["Pending Friend/Connect Notifications"] = "";
+$a->strings["System"] = "";
+$a->strings["Network"] = "";
+$a->strings["Personal"] = "";
+$a->strings["Home"] = "";
+$a->strings["Introductions"] = "";
+$a->strings["Messages"] = "";
 $a->strings["Show Ignored Requests"] = "";
 $a->strings["Hide Ignored Requests"] = "";
 $a->strings["Notification type: "] = "";
 $a->strings["Friend Suggestion"] = "";
 $a->strings["suggested by %s"] = "";
+$a->strings["Hide this contact from others"] = "";
+$a->strings["Post a new friend activity"] = "";
+$a->strings["if applicable"] = "";
 $a->strings["Approve"] = "";
 $a->strings["Claims to be known to you: "] = "";
 $a->strings["yes"] = "";
 $a->strings["no"] = "";
 $a->strings["Approve as: "] = "";
 $a->strings["Friend"] = "";
+$a->strings["Sharer"] = "";
 $a->strings["Fan/Admirer"] = "";
 $a->strings["Friend/Connect Request"] = "";
 $a->strings["New Follower"] = "";
-$a->strings["No notifications."] = "";
-$a->strings["Invite Friends"] = "";
-$a->strings["%d invitation available"] = array(
-	0 => "",
-	1 => "",
-);
-$a->strings["Find People With Shared Interests"] = "";
-$a->strings["Connect/Follow"] = "";
-$a->strings["Example: bob@example.com, http://example.com/barbara"] = "";
-$a->strings["Follow"] = "";
+$a->strings["No introductions."] = "";
+$a->strings["Notifications"] = "";
+$a->strings["%s liked %s's post"] = "";
+$a->strings["%s disliked %s's post"] = "";
+$a->strings["%s is now friends with %s"] = "";
+$a->strings["%s created a new post"] = "";
+$a->strings["%s commented on %s's post"] = "";
+$a->strings["No more network notifications."] = "";
+$a->strings["Network Notifications"] = "";
+$a->strings["No more system notifications."] = "";
+$a->strings["System Notifications"] = "";
+$a->strings["No more personal notifications."] = "";
+$a->strings["Personal Notifications"] = "";
+$a->strings["No more home notifications."] = "";
+$a->strings["Home Notifications"] = "";
 $a->strings["Could not access contact record."] = "";
 $a->strings["Could not locate selected profile."] = "";
 $a->strings["Contact updated."] = "";
@@ -243,48 +296,58 @@ $a->strings["Contact has been ignored"] = "";
 $a->strings["Contact has been unignored"] = "";
 $a->strings["stopped following"] = "";
 $a->strings["Contact has been removed."] = "";
-$a->strings["Mutual Friendship"] = "";
-$a->strings["is a fan of yours"] = "";
-$a->strings["you are a fan of"] = "";
-$a->strings["Privacy Unavailable"] = "";
+$a->strings["You are mutual friends with %s"] = "";
+$a->strings["You are sharing with %s"] = "";
+$a->strings["%s is sharing with you"] = "";
 $a->strings["Private communications are not available for this contact."] = "";
 $a->strings["Never"] = "";
 $a->strings["(Update was successful)"] = "";
 $a->strings["(Update was not successful)"] = "";
 $a->strings["Suggest friends"] = "";
+$a->strings["Network type: %s"] = "";
+$a->strings["%d contact in common"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["View all contacts"] = "";
+$a->strings["Unblock"] = "";
+$a->strings["Block"] = "";
+$a->strings["Unignore"] = "";
+$a->strings["Repair"] = "";
 $a->strings["Contact Editor"] = "";
 $a->strings["Profile Visibility"] = "";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "";
 $a->strings["Contact Information / Notes"] = "";
-$a->strings["Online Reputation"] = "";
-$a->strings["Occasionally your friends may wish to inquire about this person's online legitimacy."] = "";
-$a->strings["You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them."] = "";
-$a->strings["Please take a moment to elaborate on this selection if you feel it could be helpful to others."] = "";
+$a->strings["Edit contact notes"] = "";
 $a->strings["Visit %s's profile [%s]"] = "";
 $a->strings["Block/Unblock contact"] = "";
 $a->strings["Ignore contact"] = "";
-$a->strings["Repair contact URL settings"] = "";
-$a->strings["Repair contact URL settings (WARNING: Advanced)"] = "";
+$a->strings["Repair URL settings"] = "";
 $a->strings["View conversations"] = "";
 $a->strings["Delete contact"] = "";
-$a->strings["Last updated: "] = "";
-$a->strings["Update public posts: "] = "";
+$a->strings["Last update:"] = "";
+$a->strings["Update public posts"] = "";
 $a->strings["Update now"] = "";
-$a->strings["Unblock this contact"] = "";
-$a->strings["Block this contact"] = "";
-$a->strings["Unignore this contact"] = "";
-$a->strings["Ignore this contact"] = "";
 $a->strings["Currently blocked"] = "";
 $a->strings["Currently ignored"] = "";
+$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "";
+$a->strings["All Contacts"] = "";
+$a->strings["Unblocked Contacts"] = "";
+$a->strings["Blocked Contacts"] = "";
+$a->strings["Ignored Contacts"] = "";
+$a->strings["Hidden Contacts"] = "";
+$a->strings["Mutual Friendship"] = "";
+$a->strings["is a fan of yours"] = "";
+$a->strings["you are a fan of"] = "";
+$a->strings["Edit contact"] = "";
 $a->strings["Contacts"] = "";
-$a->strings["Show Blocked Connections"] = "";
-$a->strings["Hide Blocked Connections"] = "";
+$a->strings["Search your contacts"] = "";
 $a->strings["Finding: "] = "";
 $a->strings["Find"] = "";
-$a->strings["Edit contact"] = "";
 $a->strings["No valid account found."] = "";
 $a->strings["Password reset request issued. Check your email."] = "";
 $a->strings["Password reset requested at %s"] = "";
+$a->strings["Administrator"] = "";
 $a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "";
 $a->strings["Password Reset"] = "";
 $a->strings["Your password has been reset as requested."] = "";
@@ -296,20 +359,53 @@ $a->strings["Forgot your Password?"] = "";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "";
 $a->strings["Nickname or Email: "] = "";
 $a->strings["Reset"] = "";
+$a->strings["Missing some important data!"] = "";
+$a->strings["Update"] = "";
+$a->strings["Failed to connect with email account using the settings provided."] = "";
+$a->strings["Email settings updated."] = "";
 $a->strings["Passwords do not match. Password unchanged."] = "";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "";
 $a->strings["Password changed."] = "";
 $a->strings["Password update failed. Please try again."] = "";
-$a->strings["Failed to connect with email account using the settings provided."] = "";
 $a->strings[" Please use a shorter name."] = "";
 $a->strings[" Name too short."] = "";
 $a->strings[" Not valid email."] = "";
 $a->strings[" Cannot change to that email."] = "";
 $a->strings["Settings updated."] = "";
 $a->strings["Account settings"] = "";
+$a->strings["Connector settings"] = "";
 $a->strings["Plugin settings"] = "";
+$a->strings["Connections"] = "";
+$a->strings["Export personal data"] = "";
+$a->strings["Add application"] = "";
+$a->strings["Consumer Key"] = "";
+$a->strings["Consumer Secret"] = "";
+$a->strings["Redirect"] = "";
+$a->strings["Icon url"] = "";
+$a->strings["You can't edit this application."] = "";
+$a->strings["Connected Apps"] = "";
+$a->strings["Client key starts with"] = "";
+$a->strings["No name"] = "";
+$a->strings["Remove authorization"] = "";
 $a->strings["No Plugin settings configured"] = "";
 $a->strings["Plugin Settings"] = "";
+$a->strings["Built-in support for %s connectivity is %s"] = "";
+$a->strings["enabled"] = "";
+$a->strings["disabled"] = "";
+$a->strings["StatusNet"] = "";
+$a->strings["Connector Settings"] = "";
+$a->strings["Email/Mailbox Setup"] = "";
+$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "";
+$a->strings["Last successful email check:"] = "";
+$a->strings["Email access is disabled on this site."] = "";
+$a->strings["IMAP server name:"] = "";
+$a->strings["IMAP port:"] = "";
+$a->strings["Security:"] = "";
+$a->strings["None"] = "";
+$a->strings["Email login name:"] = "";
+$a->strings["Email password:"] = "";
+$a->strings["Reply-to address:"] = "";
+$a->strings["Send public posts to all email contacts:"] = "";
 $a->strings["Normal Account"] = "";
 $a->strings["This account is a normal personal profile"] = "";
 $a->strings["Soapbox Account"] = "";
@@ -323,12 +419,22 @@ $a->strings["(Optional) Allow this OpenID to login to this account."] = "";
 $a->strings["Publish your default profile in your local site directory?"] = "";
 $a->strings["Publish your default profile in the global social directory?"] = "";
 $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "";
-$a->strings["Hide profile details and all your messages from unknown viewers?"] = "";
+$a->strings["Hide your profile details from unknown viewers?"] = "";
+$a->strings["Allow friends to post to your profile page?"] = "";
+$a->strings["Allow friends to tag your posts?"] = "";
+$a->strings["Allow us to suggest you as a potential friend to new members?"] = "";
 $a->strings["Profile is <strong>not published</strong>."] = "";
 $a->strings["or"] = "";
 $a->strings["Your Identity Address is"] = "";
+$a->strings["Automatically expire posts after this many days:"] = "";
+$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "";
+$a->strings["Advanced expiration settings"] = "";
+$a->strings["Advanced Expiration"] = "";
+$a->strings["Expire posts:"] = "";
+$a->strings["Expire personal notes:"] = "";
+$a->strings["Expire starred posts:"] = "";
+$a->strings["Expire photos:"] = "";
 $a->strings["Account Settings"] = "";
-$a->strings["Export Personal Data"] = "";
 $a->strings["Password Settings"] = "";
 $a->strings["New Password:"] = "";
 $a->strings["Confirm:"] = "";
@@ -340,14 +446,13 @@ $a->strings["Your Timezone:"] = "";
 $a->strings["Default Post Location:"] = "";
 $a->strings["Use Browser Location:"] = "";
 $a->strings["Display Theme:"] = "";
+$a->strings["Update browser every xx seconds"] = "";
+$a->strings["Minimum of 10 seconds, no maximum"] = "";
 $a->strings["Security and Privacy Settings"] = "";
 $a->strings["Maximum Friend Requests/Day:"] = "";
 $a->strings["(to prevent spam abuse)"] = "";
 $a->strings["Default Post Permissions"] = "";
 $a->strings["(click to open/close)"] = "";
-$a->strings["Allow friends to post to your profile page:"] = "";
-$a->strings["Automatically expire posts after days:"] = "";
-$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "";
 $a->strings["Notification Settings"] = "";
 $a->strings["Send a notification email when:"] = "";
 $a->strings["You receive an introduction"] = "";
@@ -355,27 +460,21 @@ $a->strings["Your introductions are confirmed"] = "";
 $a->strings["Someone writes on your profile wall"] = "";
 $a->strings["Someone writes a followup comment"] = "";
 $a->strings["You receive a private message"] = "";
-$a->strings["Email/Mailbox Setup"] = "";
-$a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "";
-$a->strings["Last successful email check:"] = "";
-$a->strings["Email access is disabled on this site."] = "";
-$a->strings["IMAP server name:"] = "";
-$a->strings["IMAP port:"] = "";
-$a->strings["Security:"] = "";
-$a->strings["None"] = "";
-$a->strings["Email login name:"] = "";
-$a->strings["Email password:"] = "";
-$a->strings["Reply-to address:"] = "";
-$a->strings["Send public posts to all email contacts:"] = "";
+$a->strings["You receive a friend suggestion"] = "";
+$a->strings["You are tagged in a post"] = "";
 $a->strings["Advanced Page Settings"] = "";
-$a->strings["Welcome back %s"] = "";
 $a->strings["Manage Identities and/or Pages"] = "";
-$a->strings["(Toggle between different identities or community/group pages which share your account details.)"] = "";
+$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "";
 $a->strings["Select an identity to manage: "] = "";
-$a->strings["View Conversations"] = "";
-$a->strings["View New Items"] = "";
-$a->strings["View Any Items"] = "";
-$a->strings["View Starred Items"] = "";
+$a->strings["Search Results For:"] = "";
+$a->strings["Remove term"] = "";
+$a->strings["Saved Searches"] = "";
+$a->strings["add"] = "";
+$a->strings["Commented Order"] = "";
+$a->strings["Posted Order"] = "";
+$a->strings["New"] = "";
+$a->strings["Starred"] = "";
+$a->strings["Bookmarks"] = "";
 $a->strings["Warning: This group contains %s member from an insecure network."] = array(
 	0 => "",
 	1 => "",
@@ -387,19 +486,22 @@ $a->strings["Group: "] = "";
 $a->strings["Contact: "] = "";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "";
 $a->strings["Invalid contact."] = "";
+$a->strings["Personal Notes"] = "";
 $a->strings["Save"] = "";
-$a->strings["Welcome to Friendika"] = "";
+$a->strings["Welcome to Friendica"] = "";
 $a->strings["New Member Checklist"] = "";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page."] = "";
-$a->strings["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."] = "";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "";
 $a->strings["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."] = "";
 $a->strings["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."] = "";
 $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "";
-$a->strings["Enter your email access information on your Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "";
+$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "";
+$a->strings["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"] = "";
 $a->strings["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."] = "";
 $a->strings["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."] = "";
-$a->strings["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>Connect</em> dialog."] = "";
+$a->strings["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."] = "";
 $a->strings["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."] = "";
+$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "";
 $a->strings["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."] = "";
 $a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "";
 $a->strings["Item not available."] = "";
@@ -416,13 +518,13 @@ $a->strings["Unable to remove group."] = "";
 $a->strings["Click on a contact to add or remove."] = "";
 $a->strings["Group Editor"] = "";
 $a->strings["Members"] = "";
-$a->strings["All Contacts"] = "";
 $a->strings["Invalid profile identifier."] = "";
 $a->strings["Profile Visibility Editor"] = "";
+$a->strings["Profile"] = "";
 $a->strings["Visible To"] = "";
 $a->strings["All Contacts (with secure profile access)"] = "";
-$a->strings["View Contacts"] = "";
 $a->strings["No contacts."] = "";
+$a->strings["View Contacts"] = "";
 $a->strings["An invitation is required."] = "";
 $a->strings["Invitation could not be verified."] = "";
 $a->strings["Invalid OpenID url"] = "";
@@ -444,6 +546,7 @@ $a->strings["Failed to send email message. Here is the message that failed."] =
 $a->strings["Your registration can not be processed."] = "";
 $a->strings["Registration request at %s"] = "";
 $a->strings["Your registration is pending approval by the site owner."] = "";
+$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "";
 $a->strings["You may (optionally) fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "";
 $a->strings["If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items."] = "";
 $a->strings["Your OpenID (optional): "] = "";
@@ -456,34 +559,26 @@ $a->strings["Your Email Address: "] = "";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "";
 $a->strings["Choose a nickname: "] = "";
 $a->strings["Register"] = "";
+$a->strings["People Search"] = "";
 $a->strings["status"] = "";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "";
-$a->strings["This is Friendika version"] = "";
-$a->strings["running at web location"] = "";
-$a->strings["Shared content within the Friendika network is provided under the <a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>"] = "";
-$a->strings["Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</a> to learn more about the Friendika project."] = "";
-$a->strings["Bug reports and issues: please visit"] = "";
-$a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - dot com"] = "";
-$a->strings["Installed plugins/addons/apps"] = "";
-$a->strings["No installed plugins/addons/apps"] = "";
+$a->strings["Item not found."] = "";
+$a->strings["Access denied."] = "";
 $a->strings["Account approved."] = "";
 $a->strings["Registration revoked for %s"] = "";
 $a->strings["Please login."] = "";
 $a->strings["Unable to locate original post."] = "";
 $a->strings["Empty post discarded."] = "";
 $a->strings["Wall Photos"] = "";
-$a->strings["noreply"] = "";
-$a->strings["Administrator@"] = "";
-$a->strings["%s commented on an item at %s"] = "";
-$a->strings["%s posted to your profile wall at %s"] = "";
 $a->strings["System error. Post not saved."] = "";
-$a->strings["This message was sent to you by %s, a member of the Friendika social network."] = "";
+$a->strings["This message was sent to you by %s, a member of the Friendica social network."] = "";
 $a->strings["You may visit them online at %s"] = "";
 $a->strings["Please contact the sender by replying to this post if you do not wish to receive these messages."] = "";
 $a->strings["%s posted an update."] = "";
 $a->strings["Image uploaded but image cropping failed."] = "";
 $a->strings["Image size reduction [%s] failed."] = "";
+$a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "";
 $a->strings["Unable to process image"] = "";
 $a->strings["Image exceeds size limit of %d"] = "";
 $a->strings["Upload File:"] = "";
@@ -500,11 +595,10 @@ $a->strings["Remove My Account"] = "";
 $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "";
 $a->strings["Please enter your password for verification:"] = "";
 $a->strings["No recipient selected."] = "";
-$a->strings["[no subject]"] = "";
 $a->strings["Unable to locate contact information."] = "";
-$a->strings["Message sent."] = "";
 $a->strings["Message could not be sent."] = "";
-$a->strings["Messages"] = "";
+$a->strings["Message collection failure."] = "";
+$a->strings["Message sent."] = "";
 $a->strings["Inbox"] = "";
 $a->strings["Outbox"] = "";
 $a->strings["New Message"] = "";
@@ -521,13 +615,14 @@ $a->strings["D, d M Y - g:i A"] = "";
 $a->strings["Message not available."] = "";
 $a->strings["Delete message"] = "";
 $a->strings["Send Reply"] = "";
+$a->strings["Friends of %s"] = "";
+$a->strings["No friends to display."] = "";
 $a->strings["Site"] = "";
 $a->strings["Users"] = "";
 $a->strings["Plugins"] = "";
-$a->strings["Update"] = "";
+$a->strings["Themes"] = "";
 $a->strings["Logs"] = "";
 $a->strings["User registrations waiting for confirmation"] = "";
-$a->strings["Item not found."] = "";
 $a->strings["Administration"] = "";
 $a->strings["Summary"] = "";
 $a->strings["Registered users"] = "";
@@ -548,6 +643,8 @@ $a->strings["System theme"] = "";
 $a->strings["Maximum image size"] = "";
 $a->strings["Register policy"] = "";
 $a->strings["Register text"] = "";
+$a->strings["Accounts abandoned after x days"] = "";
+$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "";
 $a->strings["Allowed friend domains"] = "";
 $a->strings["Allowed email domains"] = "";
 $a->strings["Block public"] = "";
@@ -560,7 +657,8 @@ $a->strings["Fullname check"] = "";
 $a->strings["UTF-8 Regular expressions"] = "";
 $a->strings["Show Community Page"] = "";
 $a->strings["Enable OStatus support"] = "";
-$a->strings["Only allow Friendika contacts"] = "";
+$a->strings["Enable Diaspora support"] = "";
+$a->strings["Only allow Friendica contacts"] = "";
 $a->strings["Verify SSL"] = "";
 $a->strings["Proxy user"] = "";
 $a->strings["Proxy URL"] = "";
@@ -582,8 +680,6 @@ $a->strings["Request date"] = "";
 $a->strings["Email"] = "";
 $a->strings["No registrations."] = "";
 $a->strings["Deny"] = "";
-$a->strings["Block"] = "";
-$a->strings["Unblock"] = "";
 $a->strings["Register date"] = "";
 $a->strings["Last login"] = "";
 $a->strings["Last item"] = "";
@@ -596,23 +692,33 @@ $a->strings["Disable"] = "";
 $a->strings["Enable"] = "";
 $a->strings["Toggle"] = "";
 $a->strings["Settings"] = "";
+$a->strings["No themes found."] = "";
 $a->strings["Log settings updated."] = "";
 $a->strings["Clear"] = "";
 $a->strings["Debugging"] = "";
 $a->strings["Log file"] = "";
-$a->strings["Must be writable by web server. Relative to your Friendika index.php."] = "";
+$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "";
 $a->strings["Log level"] = "";
 $a->strings["Close"] = "";
 $a->strings["FTP Host"] = "";
 $a->strings["FTP Path"] = "";
 $a->strings["FTP User"] = "";
 $a->strings["FTP Password"] = "";
+$a->strings["Requested profile is not available."] = "";
 $a->strings["Access to this profile has been restricted."] = "";
 $a->strings["Tips for New Members"] = "";
+$a->strings["{0} wants to be your friend"] = "";
+$a->strings["{0} sent you a message"] = "";
+$a->strings["{0} requested registration"] = "";
+$a->strings["{0} commented %s's post"] = "";
+$a->strings["{0} liked %s's post"] = "";
+$a->strings["{0} disliked %s's post"] = "";
+$a->strings["{0} is now friends with %s"] = "";
+$a->strings["{0} posted"] = "";
+$a->strings["{0} tagged %s's post with #%s"] = "";
+$a->strings["{0} mentioned you in a post"] = "";
 $a->strings["Login failed."] = "";
-$a->strings["Welcome "] = "";
-$a->strings["Please upload a profile photo."] = "";
-$a->strings["Welcome back "] = "";
+$a->strings["Connect URL missing."] = "";
 $a->strings["This site is not configured to allow communications with other networks."] = "";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "";
 $a->strings["The profile address specified does not provide adequate information."] = "";
@@ -622,11 +728,12 @@ $a->strings["The profile address specified belongs to a network which has been d
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "";
 $a->strings["Unable to retrieve contact information."] = "";
 $a->strings["following"] = "";
+$a->strings["Common Friends"] = "";
+$a->strings["No friends in common."] = "";
 $a->strings["Item has been removed."] = "";
-$a->strings["New mail received at "] = "";
 $a->strings["Applications"] = "";
 $a->strings["No installed applications."] = "";
-$a->strings["Search"] = "";
+$a->strings["Search This Site"] = "";
 $a->strings["Profile not found."] = "";
 $a->strings["Profile Name is required."] = "";
 $a->strings["Profile updated."] = "";
@@ -674,15 +781,28 @@ $a->strings["Work/employment"] = "";
 $a->strings["School/education"] = "";
 $a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = "";
 $a->strings["Age: "] = "";
-$a->strings["Profiles"] = "";
+$a->strings["Edit/Manage Profiles"] = "";
 $a->strings["Change profile photo"] = "";
 $a->strings["Create New Profile"] = "";
 $a->strings["Profile Image"] = "";
 $a->strings["visible to everybody"] = "";
 $a->strings["Edit visibility"] = "";
+$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "";
+$a->strings["No potential page delegates located."] = "";
+$a->strings["Delegate Page Management"] = "";
+$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "";
+$a->strings["Existing Page Managers"] = "";
+$a->strings["Existing Page Delegates"] = "";
+$a->strings["Potential Delegates"] = "";
+$a->strings["Add"] = "";
+$a->strings["No entries."] = "";
+$a->strings["Friend Suggestions"] = "";
+$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "";
+$a->strings["Ignore/Hide"] = "";
 $a->strings["Global Directory"] = "";
 $a->strings["Normal site view"] = "";
-$a->strings["View all site entries"] = "";
+$a->strings["Admin - View all site entries"] = "";
+$a->strings["Find on this site"] = "";
 $a->strings["Site Directory"] = "";
 $a->strings["Gender: "] = "";
 $a->strings["No entries (some entries may be hidden)."] = "";
@@ -712,6 +832,7 @@ $a->strings["No user record found for '%s' "] = "";
 $a->strings["Our site encryption key is apparently messed up."] = "";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "";
 $a->strings["Contact record was not found for you on our site."] = "";
+$a->strings["Site public key not available in contact record for URL %s."] = "";
 $a->strings["The ID provided by your system is a duplicate on our system. It should work if you try again."] = "";
 $a->strings["Unable to set your contact credentials on our system."] = "";
 $a->strings["Unable to update your contact profile details on our system"] = "";
@@ -722,21 +843,60 @@ $a->strings["Facebook API key is missing."] = "";
 $a->strings["Facebook Connect"] = "";
 $a->strings["Install Facebook connector for this account."] = "";
 $a->strings["Remove Facebook connector"] = "";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "";
 $a->strings["Post to Facebook by default"] = "";
-$a->strings["Link all your Facebook friends and conversations"] = "";
-$a->strings["Warning: Your Facebook privacy settings can not be imported."] = "";
-$a->strings["Linked Facebook items <strong>may</strong> be publicly visible, depending on your privacy settings for this website/account."] = "";
+$a->strings["Link all your Facebook friends and conversations on this website"] = "";
+$a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "";
+$a->strings["On this website, your Facebook friend stream is only visible to you."] = "";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "";
+$a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "";
+$a->strings["Do not import your Facebook profile wall conversations"] = "";
+$a->strings["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."] = "";
+$a->strings["Comma separated applications to ignore"] = "";
 $a->strings["Facebook"] = "";
 $a->strings["Facebook Connector Settings"] = "";
 $a->strings["Post to Facebook"] = "";
 $a->strings["Post to Facebook cancelled because of multi-network access permission conflict."] = "";
 $a->strings["Image: "] = "";
-$a->strings["View on Friendika"] = "";
+$a->strings["View on Friendica"] = "";
 $a->strings["Facebook post failed. Queued for retry."] = "";
+$a->strings["link"] = "";
+$a->strings["%d person likes this"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["%d person doesn't like this"] = array(
+	0 => "",
+	1 => "",
+);
 $a->strings["Generate new key"] = "";
 $a->strings["Widgets key"] = "";
 $a->strings["Widgets available"] = "";
-$a->strings["Connect on Friendika!"] = "";
+$a->strings["Connect on Friendica!"] = "";
+$a->strings["YourLS Settings"] = "";
+$a->strings["URL: http://"] = "";
+$a->strings["Username:"] = "";
+$a->strings["Password:"] = "";
+$a->strings["Use SSL "] = "";
+$a->strings["yourls Settings saved."] = "";
+$a->strings["\"Not Safe For Work\" Settings"] = "";
+$a->strings["Enable NSFW filter"] = "";
+$a->strings["Comma separated words to treat as NSFW"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["NSFW Settings saved."] = "";
+$a->strings["%s - Click to open/close"] = "";
+$a->strings["Login"] = "";
+$a->strings["OpenID"] = "";
+$a->strings["Last users"] = "";
+$a->strings["Most active users"] = "";
+$a->strings["Last photos"] = "";
+$a->strings["Last likes"] = "";
+$a->strings["event"] = "";
+$a->strings["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>"] = "";
+$a->strings["Template URL (with {category})"] = "";
+$a->strings["OAuth end-point"] = "";
+$a->strings["Api"] = "";
+$a->strings["Member since:"] = "";
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "";
 $a->strings["3D Tic-Tac-Toe"] = "";
 $a->strings["New game"] = "";
@@ -751,6 +911,19 @@ $a->strings["\"Cat\" game!"] = "";
 $a->strings["I won!"] = "";
 $a->strings["Randplace Settings"] = "";
 $a->strings["Enable Randplace Plugin"] = "";
+$a->strings["Post to Drupal"] = "";
+$a->strings["Drupal Post Settings"] = "";
+$a->strings["Enable Drupal Post Plugin"] = "";
+$a->strings["Drupal username"] = "";
+$a->strings["Drupal password"] = "";
+$a->strings["Post Type - article,page,or blog"] = "";
+$a->strings["Drupal site URL"] = "";
+$a->strings["Drupal site uses clean URLS"] = "";
+$a->strings["Post to Drupal by default"] = "";
+$a->strings["Post from Friendica"] = "";
+$a->strings["Geonames settings updated."] = "";
+$a->strings["Geonames Settings"] = "";
+$a->strings["Enable Geonames Plugin"] = "";
 $a->strings["Upload a file"] = "";
 $a->strings["Drop files here to upload"] = "";
 $a->strings["Failed"] = "";
@@ -758,6 +931,9 @@ $a->strings["No files were uploaded."] = "";
 $a->strings["Uploaded file is empty"] = "";
 $a->strings["File has an invalid extension, it should be one of "] = "";
 $a->strings["Upload was cancelled, or server error encountered"] = "";
+$a->strings["OEmbed settings updated"] = "";
+$a->strings["Use OEmbed for YouTube videos"] = "";
+$a->strings["URL to embed:"] = "";
 $a->strings["Impressum"] = "";
 $a->strings["Site Owner"] = "";
 $a->strings["Email Address"] = "";
@@ -765,9 +941,30 @@ $a->strings["Postal Address"] = "";
 $a->strings["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."] = "";
 $a->strings["Site Owners Profile"] = "";
 $a->strings["Notes"] = "";
-$a->strings["OEmbed settings updated"] = "";
-$a->strings["Use OEmbed for YouTube videos"] = "";
-$a->strings["URL to embed:"] = "";
+$a->strings["Report Bug"] = "";
+$a->strings["\"Blockem\" Settings"] = "";
+$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["BLOCKEM Settings saved."] = "";
+$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["Unblock Author"] = "";
+$a->strings["Block Author"] = "";
+$a->strings["blockem settings updated"] = "";
+$a->strings[":-)"] = "";
+$a->strings[":-("] = "";
+$a->strings["lol"] = "";
+$a->strings["Quick Comment Settings"] = "";
+$a->strings["Enter quick comments, one per line"] = "";
+$a->strings["Quick Comment settings saved."] = "";
+$a->strings["Tile Server URL"] = "";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
+$a->strings["Default zoom"] = "";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "";
+$a->strings["Editplain settings updated."] = "";
+$a->strings["Editplain Settings"] = "";
+$a->strings["Disable richtext status editor"] = "";
+$a->strings["\"pageheader\" Settings"] = "";
+$a->strings["pageheader Settings saved."] = "";
+$a->strings["View Source"] = "";
 $a->strings["Post to StatusNet"] = "";
 $a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
 $a->strings["We could not contact the StatusNet API with the Path you entered."] = "";
@@ -776,7 +973,7 @@ $a->strings["StatusNet Posting Settings"] = "";
 $a->strings["Globally Available StatusNet OAuthKeys"] = "";
 $a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "";
 $a->strings["Provide your own OAuth Credentials"] = "";
-$a->strings["No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation."] = "";
+$a->strings["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."] = "";
 $a->strings["OAuth Consumer Key"] = "";
 $a->strings["OAuth Consumer Secret"] = "";
 $a->strings["Base API Path (remember the trailing /)"] = "";
@@ -788,34 +985,66 @@ $a->strings["Current StatusNet API is"] = "";
 $a->strings["Cancel StatusNet Connection"] = "";
 $a->strings["Currently connected to: "] = "";
 $a->strings["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."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to StatusNet"] = "";
 $a->strings["Send public postings to StatusNet by default"] = "";
 $a->strings["Clear OAuth configuration"] = "";
 $a->strings["API URL"] = "";
-$a->strings["Consumer Secret"] = "";
-$a->strings["Consumer Key"] = "";
+$a->strings["Post to Tumblr"] = "";
+$a->strings["Tumblr Post Settings"] = "";
+$a->strings["Enable Tumblr Post Plugin"] = "";
+$a->strings["Tumblr login"] = "";
+$a->strings["Tumblr password"] = "";
+$a->strings["Post to Tumblr by default"] = "";
+$a->strings["Numfriends settings updated."] = "";
+$a->strings["Numfriends Settings"] = "";
+$a->strings["How many contacts to display on profile sidebar"] = "";
+$a->strings["Post to Wordpress"] = "";
+$a->strings["WordPress Post Settings"] = "";
+$a->strings["Enable WordPress Post Plugin"] = "";
+$a->strings["WordPress username"] = "";
+$a->strings["WordPress password"] = "";
+$a->strings["WordPress API URL"] = "";
+$a->strings["Post to WordPress by default"] = "";
+$a->strings["\"Show more\" Settings"] = "";
+$a->strings["Enable Show More"] = "";
+$a->strings["Cutting posts after how much characters"] = "";
+$a->strings["Show More Settings saved."] = "";
+$a->strings["Show More"] = "";
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "";
+$a->strings["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)."] = "";
 $a->strings["Piwik Base URL"] = "";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
 $a->strings["Site ID"] = "";
 $a->strings["Show opt-out cookie link?"] = "";
+$a->strings["Asynchronous tracking"] = "";
 $a->strings["Post to Twitter"] = "";
 $a->strings["Twitter settings updated."] = "";
 $a->strings["Twitter Posting Settings"] = "";
 $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "";
-$a->strings["At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+$a->strings["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."] = "";
 $a->strings["Log in with Twitter"] = "";
 $a->strings["Copy the PIN from Twitter here"] = "";
 $a->strings["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."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
 $a->strings["Allow posting to Twitter"] = "";
 $a->strings["Send public postings to Twitter by default"] = "";
 $a->strings["Consumer key"] = "";
 $a->strings["Consumer secret"] = "";
+$a->strings["Post to Posterous"] = "";
+$a->strings["Posterous Post Settings"] = "";
+$a->strings["Enable Posterous Post Plugin"] = "";
+$a->strings["Posterous login"] = "";
+$a->strings["Posterous password"] = "";
+$a->strings["Post to Posterous by default"] = "";
 $a->strings["Gender:"] = "";
-$a->strings["Birthday:"] = "";
 $a->strings["j F, Y"] = "";
 $a->strings["j F"] = "";
+$a->strings["Birthday:"] = "";
 $a->strings["Age:"] = "";
-$a->strings["<span class=\"heart\">&hearts;</span> Status:"] = "";
+$a->strings["Status:"] = "";
 $a->strings["Homepage:"] = "";
+$a->strings["Tags:"] = "";
 $a->strings["Religion:"] = "";
 $a->strings["About:"] = "";
 $a->strings["Hobbies/Interests:"] = "";
@@ -839,6 +1068,12 @@ $a->strings["Twice daily"] = "";
 $a->strings["Daily"] = "";
 $a->strings["Weekly"] = "";
 $a->strings["Monthly"] = "";
+$a->strings["OStatus"] = "";
+$a->strings["RSS/Atom"] = "";
+$a->strings["Zot!"] = "";
+$a->strings["LinkedIn"] = "";
+$a->strings["XMPP/IM"] = "";
+$a->strings["MySpace"] = "";
 $a->strings["Male"] = "";
 $a->strings["Female"] = "";
 $a->strings["Currently Male"] = "";
@@ -892,9 +1127,10 @@ $a->strings["Uncertain"] = "";
 $a->strings["Complicated"] = "";
 $a->strings["Don't care"] = "";
 $a->strings["Ask me"] = "";
-$a->strings["l F d, Y \\@ g:i A"] = "";
 $a->strings["Starts:"] = "";
 $a->strings["Finishes:"] = "";
+$a->strings["(no subject)"] = "";
+$a->strings["noreply"] = "";
 $a->strings["prev"] = "";
 $a->strings["first"] = "";
 $a->strings["last"] = "";
@@ -904,6 +1140,7 @@ $a->strings["%d Contact"] = array(
 	0 => "",
 	1 => "",
 );
+$a->strings["Search"] = "";
 $a->strings["Monday"] = "";
 $a->strings["Tuesday"] = "";
 $a->strings["Wednesday"] = "";
@@ -925,15 +1162,29 @@ $a->strings["November"] = "";
 $a->strings["December"] = "";
 $a->strings["bytes"] = "";
 $a->strings["Select an alternate language"] = "";
+$a->strings["default"] = "";
 $a->strings["Sharing notification from Diaspora network"] = "";
+$a->strings["Attachments:"] = "";
+$a->strings["[Relayed] Comment authored by %s from network %s"] = "";
+$a->strings["Embedded content"] = "";
 $a->strings["Embedding disabled"] = "";
-$a->strings["Create a new group"] = "";
+$a->strings["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."] = "";
 $a->strings["Everybody"] = "";
+$a->strings["edit"] = "";
+$a->strings["Groups"] = "";
+$a->strings["Edit group"] = "";
+$a->strings["Create a new group"] = "";
 $a->strings["Logout"] = "";
 $a->strings["End this session"] = "";
-$a->strings["Login"] = "";
+$a->strings["Status"] = "";
+$a->strings["Your posts and conversations"] = "";
+$a->strings["Your profile page"] = "";
+$a->strings["Photos"] = "";
+$a->strings["Your photos"] = "";
+$a->strings["Your events"] = "";
+$a->strings["Personal notes"] = "";
+$a->strings["Your personal photos"] = "";
 $a->strings["Sign in"] = "";
-$a->strings["Home"] = "";
 $a->strings["Home Page"] = "";
 $a->strings["Create an account"] = "";
 $a->strings["Help and documentation"] = "";
@@ -943,18 +1194,34 @@ $a->strings["Search site content"] = "";
 $a->strings["Conversations on this site"] = "";
 $a->strings["Directory"] = "";
 $a->strings["People directory"] = "";
-$a->strings["Network"] = "";
 $a->strings["Conversations from your friends"] = "";
-$a->strings["Your posts and conversations"] = "";
-$a->strings["Notifications"] = "";
-$a->strings["Friend requests"] = "";
+$a->strings["Friend Requests"] = "";
+$a->strings["See all notifications"] = "";
+$a->strings["Mark all system notifications seen"] = "";
 $a->strings["Private mail"] = "";
 $a->strings["Manage"] = "";
 $a->strings["Manage other pages"] = "";
+$a->strings["Profiles"] = "";
 $a->strings["Manage/edit profiles"] = "";
 $a->strings["Manage/edit friends and contacts"] = "";
 $a->strings["Admin"] = "";
 $a->strings["Site setup and configuration"] = "";
+$a->strings["Nothing new here"] = "";
+$a->strings["Add New Contact"] = "";
+$a->strings["Enter address or web location"] = "";
+$a->strings["Example: bob@example.com, http://example.com/barbara"] = "";
+$a->strings["Invite Friends"] = "";
+$a->strings["%d invitation available"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["Find People"] = "";
+$a->strings["Enter name or interest"] = "";
+$a->strings["Connect/Follow"] = "";
+$a->strings["Examples: Robert Morgenstein, Fishing"] = "";
+$a->strings["Similar Interests"] = "";
+$a->strings["Networks"] = "";
+$a->strings["All Networks"] = "";
 $a->strings["Logged out."] = "";
 $a->strings["Miscellaneous"] = "";
 $a->strings["year"] = "";
@@ -973,32 +1240,86 @@ $a->strings["minute"] = "";
 $a->strings["minutes"] = "";
 $a->strings["second"] = "";
 $a->strings["seconds"] = "";
-$a->strings[" ago"] = "";
+$a->strings["%1\$d %2\$s ago"] = "";
 $a->strings["From: "] = "";
+$a->strings["$1 wrote:"] = "";
 $a->strings["Image/photo"] = "";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "";
+$a->strings["[no subject]"] = "";
 $a->strings["Visible to everybody"] = "";
 $a->strings["show"] = "";
 $a->strings["don't show"] = "";
-$a->strings["(no subject)"] = "";
+$a->strings["Friendica Notification"] = "";
+$a->strings["Thank You,"] = "";
+$a->strings["%s Administrator"] = "";
+$a->strings["New mail received at %s"] = "";
+$a->strings["%s sent you a new private message at %s."] = "";
+$a->strings["%s sent you %s."] = "";
+$a->strings["a private message"] = "";
+$a->strings["Please visit %s to view and/or reply to your private messages."] = "";
+$a->strings["%s commented on an item at %s"] = "";
+$a->strings["%s commented on an item/conversation you have been following."] = "";
+$a->strings["%s commented in %s."] = "";
+$a->strings["a watched conversation"] = "";
+$a->strings["Please visit %s to view and/or reply to the conversation."] = "";
+$a->strings["%s posted to your profile wall at %s"] = "";
+$a->strings["%s posted to %s"] = "";
+$a->strings["your profile wall."] = "";
+$a->strings["%s tagged you at %s"] = "";
+$a->strings["%s %s."] = "";
+$a->strings["tagged you"] = "";
+$a->strings["%s tagged your post at %s"] = "";
+$a->strings["%s tagged %s"] = "";
+$a->strings["your post"] = "";
+$a->strings["Introduction received at %s"] = "";
+$a->strings["You've received an introduction from '%s' at %s"] = "";
+$a->strings["You've received %s from %s."] = "";
+$a->strings["an introduction"] = "";
+$a->strings["You may visit their profile at %s"] = "";
+$a->strings["Please visit %s to approve or reject the introduction."] = "";
+$a->strings["Friend suggestion received at %s"] = "";
+$a->strings["You've received a friend suggestion from '%s' at %s"] = "";
+$a->strings["You've received %s for %s from %s."] = "";
+$a->strings["a friend suggestion"] = "";
+$a->strings["Name:"] = "";
+$a->strings["Photo:"] = "";
+$a->strings["Please visit %s to approve or reject the suggestion."] = "";
+$a->strings["A new person is sharing with you at "] = "";
 $a->strings["You have a new follower at "] = "";
-$a->strings["event"] = "";
-$a->strings["View %s's profile"] = "";
+$a->strings["view full size"] = "";
+$a->strings["image/photo"] = "";
+$a->strings["Welcome "] = "";
+$a->strings["Please upload a profile photo."] = "";
+$a->strings["Welcome back "] = "";
+$a->strings["View status"] = "";
+$a->strings["View profile"] = "";
+$a->strings["View photos"] = "";
+$a->strings["View recent"] = "";
+$a->strings["Send PM"] = "";
+$a->strings["post/item"] = "";
+$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "";
+$a->strings["Select"] = "";
+$a->strings["View %s's profile @ %s"] = "";
 $a->strings["%s from %s"] = "";
 $a->strings["View in context"] = "";
-$a->strings["See more posts like this"] = "";
-$a->strings["See all %d comments"] = "";
-$a->strings["Select"] = "";
+$a->strings["%d comment"] = array(
+	0 => "",
+	1 => "",
+);
+$a->strings["show more"] = "";
+$a->strings["like"] = "";
+$a->strings["dislike"] = "";
+$a->strings["Share this"] = "";
+$a->strings["share"] = "";
+$a->strings["add star"] = "";
+$a->strings["remove star"] = "";
 $a->strings["toggle star status"] = "";
+$a->strings["starred"] = "";
+$a->strings["add tag"] = "";
 $a->strings["to"] = "";
 $a->strings["Wall-to-Wall"] = "";
 $a->strings["via Wall-To-Wall:"] = "";
 $a->strings["Delete Selected Items"] = "";
-$a->strings["View status"] = "";
-$a->strings["View profile"] = "";
-$a->strings["View photos"] = "";
-$a->strings["View recent"] = "";
-$a->strings["Send PM"] = "";
 $a->strings["%s likes this."] = "";
 $a->strings["%s doesn't like this."] = "";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "";
@@ -1008,26 +1329,34 @@ $a->strings[", and %d other people"] = "";
 $a->strings["%s like this."] = "";
 $a->strings["%s don't like this."] = "";
 $a->strings["Visible to <strong>everybody</strong>"] = "";
-$a->strings["Please enter a YouTube link:"] = "";
-$a->strings["Please enter a video(.ogg) link/URL:"] = "";
-$a->strings["Please enter an audio(.ogg) link/URL:"] = "";
+$a->strings["Please enter a video link/URL:"] = "";
+$a->strings["Please enter an audio link/URL:"] = "";
+$a->strings["Tag term:"] = "";
 $a->strings["Where are you right now?"] = "";
 $a->strings["Enter a title for this item"] = "";
-$a->strings["Set title"] = "";
+$a->strings["upload photo"] = "";
+$a->strings["attach file"] = "";
+$a->strings["web link"] = "";
+$a->strings["Insert video link"] = "";
+$a->strings["video link"] = "";
+$a->strings["Insert audio link"] = "";
+$a->strings["audio link"] = "";
+$a->strings["set location"] = "";
+$a->strings["clear location"] = "";
+$a->strings["permissions"] = "";
 $a->strings["Delete this item?"] = "";
+$a->strings["show fewer"] = "";
 $a->strings["Create a New Account"] = "";
 $a->strings["Nickname or Email address: "] = "";
 $a->strings["Password: "] = "";
-$a->strings["Nickname/Email/OpenID: "] = "";
-$a->strings["Password (if not OpenID): "] = "";
+$a->strings["Or login using OpenID: "] = "";
 $a->strings["Forgot your password?"] = "";
-$a->strings["Connect"] = "";
-$a->strings[", "] = "";
-$a->strings["Status:"] = "";
+$a->strings["Edit profile"] = "";
 $a->strings["g A l F d"] = "";
+$a->strings["F d"] = "";
 $a->strings["Birthday Reminders"] = "";
 $a->strings["Birthdays this week:"] = "";
-$a->strings["(Adjusted for local time)"] = "";
 $a->strings["[today]"] = "";
-$a->strings["Not Found"] = "";
-$a->strings["Page not found."] = "";
+$a->strings["Event Reminders"] = "";
+$a->strings["Events this week:"] = "";
+$a->strings["[No description]"] = "";