merged multipart email changes

1 files changed, 340 insertions, 104 deletions

diff --git a/util/strings.php b/util/strings.php
index b010cb9fc..0000e30f6 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -1,8 +1,15 @@
 <?php
+
+function string_plural_select($n){
+	return ($n != 1);
+}
+
 $a->strings['Not Found'] = 'Not Found';
 $a->strings['Page not found.' ] = 'Page not found.' ;
 $a->strings['Permission denied'] = 'Permission denied';
 $a->strings['Permission denied.'] = 'Permission denied.';
+$a->strings['Delete this item?'] = 'Delete this item?';
+$a->strings['Comment'] = 'Comment';
 $a->strings['Create a New Account'] = 'Create a New Account';
 $a->strings['Register'] = 'Register';
 $a->strings['Nickname or Email address: '] = 'Nickname or Email address: ';
@@ -17,18 +24,7 @@ $a->strings['prev'] = 'prev';
 $a->strings['first'] = 'first';
 $a->strings['last'] = 'last';
 $a->strings['next'] = 'next';
-$a->strings[' likes this.'] = ' likes this.';
-$a->strings[' doesn\'t like this.'] = ' doesn\'t like this.';
-$a->strings['people'] = 'people';
-$a->strings['like this.'] = 'like this.';
-$a->strings['don\'t like this.'] = 'don\'t like this.';
-$a->strings['and'] = 'and';
-$a->strings[', and '] = ', and ';
-$a->strings[' other people'] = ' other people';
-$a->strings[' like this.'] = ' like this.';
-$a->strings[' don\'t like this.'] = ' don\'t like this.';
 $a->strings['No contacts'] = 'No contacts';
-$a->strings['Contacts'] = 'Contacts';
 $a->strings['View Contacts'] = 'View Contacts';
 $a->strings['Search'] = 'Search';
 $a->strings['No profile'] = 'No profile';
@@ -57,36 +53,19 @@ $a->strings['September'] = 'September';
 $a->strings['October'] = 'October';
 $a->strings['November'] = 'November';
 $a->strings['December'] = 'December';
+$a->strings['g A l F d'] = 'g A l F d';
+$a->strings['Birthday Reminders'] = 'Birthday Reminders';
 $a->strings['Birthdays this week:'] = 'Birthdays this week:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
 $a->strings['[today]'] = '[today]';
 $a->strings['link to source'] = 'link to source';
-$a->strings['No recipient selected.'] = 'No recipient selected.';
-$a->strings['[no subject]'] = '[no subject]';
-$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
-$a->strings['Wall Photos'] = 'Wall Photos';
-$a->strings['Message sent.'] = 'Message sent.';
-$a->strings['Message could not be sent.'] = 'Message could not be sent.';
-$a->strings['Messages'] = 'Messages';
-$a->strings['Inbox'] = 'Inbox';
-$a->strings['Outbox'] = 'Outbox';
-$a->strings['New Message'] = 'New Message';
-$a->strings['Message deleted.'] = 'Message deleted.';
-$a->strings['Conversation removed.'] = 'Conversation removed.';
-$a->strings['Send Private Message'] = 'Send Private Message';
-$a->strings['To:'] = 'To:';
-$a->strings['Subject:'] = 'Subject:';
-$a->strings['Your message:'] = 'Your message:';
-$a->strings['Upload photo'] = 'Upload photo';
-$a->strings['Insert web link'] = 'Insert web link';
-$a->strings['Please wait'] = 'Please wait';
-$a->strings['No messages.'] = 'No messages.';
-$a->strings['Delete conversation'] = 'Delete conversation';
-$a->strings['Message not available.'] = 'Message not available.';
-$a->strings['Delete message'] = 'Delete message';
-$a->strings['Send Reply'] = 'Send Reply';
+$a->strings['%d Contact'] = array(
+	0 => '%d Contact',
+	1 => '%d Contacts',
+);
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
+$a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
 $a->strings['Connect/Follow'] = 'Connect/Follow';
 $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Example: bob@example.com, http://example.com/barbara';
 $a->strings['Follow'] = 'Follow';
@@ -97,21 +76,36 @@ $a->strings['Failed to update contact record.'] = 'Failed to update contact reco
 $a->strings['Contact has been '] = 'Contact has been ';
 $a->strings['blocked'] = 'blocked';
 $a->strings['unblocked'] = 'unblocked';
-$a->strings['ignored'] = 'ignored';
-$a->strings['unignored'] = 'unignored';
+$a->strings['Contact has been blocked'] = 'Contact has been blocked';
+$a->strings['Contact has been unblocked'] = 'Contact has been unblocked';
+$a->strings['Contact has been ignored'] = 'Contact has been ignored';
+$a->strings['Contact has been unignored'] = 'Contact has been unignored';
 $a->strings['stopped following'] = 'stopped following';
 $a->strings['Contact has been removed.'] = 'Contact has been removed.';
 $a->strings['Contact not found.'] = 'Contact not found.';
 $a->strings['Mutual Friendship'] = 'Mutual Friendship';
 $a->strings['is a fan of yours'] = 'is a fan of yours';
 $a->strings['you are a fan of'] = 'you are a fan of';
+$a->strings['Privacy Unavailable'] = 'Privacy Unavailable';
+$a->strings['Private communications are not available for this contact.'] = 'Private communications are not available for this contact.';
 $a->strings['Never'] = 'Never';
 $a->strings["\x28Update was successful\x29"] = "\x28Update was successful\x29";
 $a->strings["\x28Update was not successful\x29"] = "\x28Update was not successful\x29";
 $a->strings['Contact Editor'] = 'Contact Editor';
+$a->strings['Submit'] = 'Submit';
+$a->strings['Profile Visibility'] = 'Profile Visibility';
+$a->strings['Please choose the profile you would like to display to %s when viewing your profile securely.'] = 'Please choose the profile you would like to display to %s when viewing your profile securely.';
+$a->strings['Contact Information / Notes'] = 'Contact Information / Notes';
+$a->strings['Online Reputation'] = 'Online Reputation';
+$a->strings['Occasionally your friends may wish to inquire about this person\'s online legitimacy.'] = 'Occasionally your friends may wish to inquire about this person\'s online legitimacy.';
+$a->strings['You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.'] = 'You may help them choose whether or not to interact with this person by providing a <em>reputation</em> to guide them.';
+$a->strings['Please take a moment to elaborate on this selection if you feel it could be helpful to others.'] = 'Please take a moment to elaborate on this selection if you feel it could be helpful to others.';
 $a->strings['Visit $name\'s profile'] = 'Visit $name\'s profile';
 $a->strings['Block/Unblock contact'] = 'Block/Unblock contact';
 $a->strings['Ignore contact'] = 'Ignore contact';
+$a->strings['Repair contact URL settings'] = 'Repair contact URL settings';
+$a->strings["Repair contact URL settings \x28WARNING: Advanced\x29"] = "Repair contact URL settings \x28WARNING: Advanced\x29";
+$a->strings['View conversations'] = 'View conversations';
 $a->strings['Delete contact'] = 'Delete contact';
 $a->strings['Last updated: '] = 'Last updated: ';
 $a->strings['Update public posts: '] = 'Update public posts: ';
@@ -122,13 +116,25 @@ $a->strings['Unignore this contact'] = 'Unignore this contact';
 $a->strings['Ignore this contact'] = 'Ignore this contact';
 $a->strings['Currently blocked'] = 'Currently blocked';
 $a->strings['Currently ignored'] = 'Currently ignored';
+$a->strings['Contacts'] = 'Contacts';
 $a->strings['Show Blocked Connections'] = 'Show Blocked Connections';
 $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections';
 $a->strings['Finding: '] = 'Finding: ';
 $a->strings['Find'] = 'Find';
-$a->strings['Visit '] = 'Visit ';
-$a->strings['\'s profile'] = '\'s profile';
+$a->strings['Visit $username\'s profile'] = 'Visit $username\'s profile';
 $a->strings['Edit contact'] = 'Edit contact';
+$a->strings['Contact settings applied.'] = 'Contact settings applied.';
+$a->strings['Contact update failed.'] = 'Contact update failed.';
+$a->strings['Repair Contact Settings'] = '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.'] = '<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact will stop working.';
+$a->strings['Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.'] = 'Please use your browser \'Back\' button <strong>now</strong> if you are uncertain what to do on this page.';
+$a->strings['Name'] = 'Name';
+$a->strings['Account Nickname'] = 'Account Nickname';
+$a->strings['Account URL'] = 'Account URL';
+$a->strings['Friend Request URL'] = 'Friend Request URL';
+$a->strings['Friend Confirm URL'] = 'Friend Confirm URL';
+$a->strings['Notification Endpoint URL'] = 'Notification Endpoint URL';
+$a->strings['Poll/Feed URL'] = 'Poll/Feed URL';
 $a->strings['Profile not found.'] = 'Profile not found.';
 $a->strings['Response from remote site was not understood.'] = 'Response from remote site was not understood.';
 $a->strings['Unexpected response from remote site: '] = 'Unexpected response from remote site: ';
@@ -137,95 +143,132 @@ $a->strings['Remote site reported: '] = 'Remote site reported: ';
 $a->strings["Temporary failure. Please wait and try again."] = "Temporary failure. Please wait and try again.";
 $a->strings["Introduction failed or was revoked."] = "Introduction failed or was revoked.";
 $a->strings['Unable to set contact photo.'] = 'Unable to set contact photo.';
-$a->strings['is now friends with'] = 'is now friends with';
-$a->strings['No user record found for '] = 'No user record found for ';
+$a->strings['%1$s is now friends with %2$s'] = '%1$s is now friends with %2$s';
 $a->strings['Our site encryption key is apparently messed up.'] = 'Our site encryption key is apparently messed up.';
 $a->strings['Empty site URL was provided or URL could not be decrypted by us.'] = 'Empty site URL was provided or URL could not be decrypted by us.';
 $a->strings['Contact record was not found for you on our site.'] = 'Contact record was not found for you on our site.';
 $a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
 $a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
 $a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
-$a->strings["Connection accepted at "] = "Connection accepted at ";
+$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
 $a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
-$a->strings[' commented on an item at '] = ' commented on an item at ';
-$a->strings[" commented on an item at "] = " commented on an item at ";
-$a->strings[' welcomes '] = ' welcomes ';
+$a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
 $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.';
 $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.';
 $a->strings['Warning: profile location has no profile photo.'] = 'Warning: profile location has no profile photo.';
-$a->strings[' required parameter'] = ' required parameter';
-$a->strings[" was "] = " was ";
-$a->strings["s were "] = "s were ";
-$a->strings["not found at the given location."] = "not found at the given location.";
 $a->strings["Introduction complete."] = "Introduction complete.";
 $a->strings['Unrecoverable protocol error.'] = 'Unrecoverable protocol error.';
 $a->strings['Profile unavailable.'] = 'Profile unavailable.';
-$a->strings[' has received too many connection requests today.'] = ' has received too many connection requests today.';
+$a->strings['%s has received too many connection requests today.'] = '%s has received too many connection requests today.';
 $a->strings['Spam protection measures have been invoked.'] = 'Spam protection measures have been invoked.';
 $a->strings['Friends are advised to please try again in 24 hours.'] = 'Friends are advised to please try again in 24 hours.';
 $a->strings["Invalid locator"] = "Invalid locator";
 $a->strings["Unable to resolve your name at the provided location."] = "Unable to resolve your name at the provided location.";
 $a->strings['You have already introduced yourself here.'] = 'You have already introduced yourself here.';
-$a->strings['Apparently you are already friends with .'] = 'Apparently you are already friends with .';
+$a->strings['Apparently you are already friends with %s.'] = 'Apparently you are already friends with %s.';
 $a->strings['Invalid profile URL.'] = 'Invalid profile URL.';
 $a->strings['Disallowed profile URL.'] = 'Disallowed profile URL.';
 $a->strings['Your introduction has been sent.'] = 'Your introduction has been sent.';
 $a->strings["Please login to confirm introduction."] = "Please login to confirm introduction.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Incorrect identity currently logged in. Please login to <strong>this</strong> profile.";
+$a->strings['Welcome home %s.'] = 'Welcome home %s.';
+$a->strings['Please confirm your introduction/connection request to %s.'] = 'Please confirm your introduction/connection request to %s.';
+$a->strings['Confirm'] = 'Confirm';
 $a->strings['[Name Withheld]'] = '[Name Withheld]';
+$a->strings["Introduction received at "] = "Introduction received at ";
+$a->strings['Public access denied.'] = 'Public access denied.';
 $a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
+$a->strings['Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca';
 $a->strings['Please answer the following:'] = 'Please answer the following:';
 $a->strings['Does $name know you?'] = 'Does $name know you?';
 $a->strings['Yes'] = 'Yes';
 $a->strings['No'] = 'No';
 $a->strings['Add a personal note:'] = 'Add a personal note:';
-$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Please enter your profile address from one of the following supported social networks:';
+$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Please enter your 'Identity Address' from one of the following supported social networks:";
 $a->strings['Friendika'] = 'Friendika';
 $a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
 $a->strings["Private \x28secure\x29 network"] = "Private \x28secure\x29 network";
 $a->strings["Public \x28insecure\x29 network"] = "Public \x28insecure\x29 network";
-$a->strings['Your profile address:'] = 'Your profile address:';
+$a->strings['Your Identity Address:'] = 'Your Identity Address:';
 $a->strings['Submit Request'] = 'Submit Request';
 $a->strings['Cancel'] = 'Cancel';
+$a->strings["%d required parameter was not found at the given location"] = array(
+	0 => "%d required parameter was not found at the given location",
+	1 => "%d required parameters were not found at the given location",
+);
 $a->strings['Global Directory'] = 'Global Directory';
+$a->strings['Site Directory'] = 'Site Directory';
+$a->strings['Age: '] = 'Age: ';
+$a->strings['Gender: '] = 'Gender: ';
+$a->strings["No entries \x28some entries may be hidden\x29."] = "No entries \x28some entries may be hidden\x29.";
 $a->strings['Item not found.'] = 'Item not found.';
-$a->strings['Private Message'] = 'Private Message';
-$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
-$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
-$a->strings['This is you'] = 'This is you';
-$a->strings['Delete'] = 'Delete';
-$a->strings['View $name\'s profile'] = 'View $name\'s profile';
-$a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile';
-$a->strings['to'] = 'to';
-$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
-$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
+$a->strings['Item not found'] = 'Item not found';
+$a->strings['Edit post'] = 'Edit post';
+$a->strings["Post to Email"] = "Post to Email";
+$a->strings['Edit'] = 'Edit';
+$a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Insert web link'] = 'Insert web link';
+$a->strings['Insert YouTube video'] = 'Insert YouTube video';
+$a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
+$a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio';
+$a->strings['Set your location'] = 'Set your location';
+$a->strings['Clear browser location'] = 'Clear browser location';
+$a->strings['Please wait'] = 'Please wait';
+$a->strings['Permission settings'] = 'Permission settings';
 $a->strings['CC: email addresses'] = 'CC: email addresses';
 $a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
 $a->strings['following'] = 'following';
+$a->strings['This is Friendika version'] = 'This is Friendika version';
+$a->strings['running at web location'] = 'running at web location';
+$a->strings['Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>'] = 'Shared content within the Friendika network is provided under the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 license</a>';
+$a->strings['Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.'] = 'Please visit <a href="http://project.friendika.com">Project.Friendika.com</a> to learn more about the Friendika project.';
+$a->strings['Bug reports and issues: please visit'] = 'Bug reports and issues: please visit';
+$a->strings['Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com'] = 'Suggestions, praise, donations, etc. - please email "Info" at Friendika - dot com';
+$a->strings['Installed plugins/addons/apps'] = 'Installed plugins/addons/apps';
+$a->strings['No installed plugins/addons/apps'] = 'No installed plugins/addons/apps';
 $a->strings['Group created.'] = 'Group created.';
 $a->strings['Could not create group.'] = 'Could not create group.';
 $a->strings['Group not found.'] = 'Group not found.';
 $a->strings['Group name changed.'] = 'Group name changed.';
-$a->strings['Membership list updated.'] = 'Membership list updated.';
+$a->strings['Create a group of contacts/friends.'] = 'Create a group of contacts/friends.';
+$a->strings['Group Name: '] = 'Group Name: ';
 $a->strings['Group removed.'] = 'Group removed.';
 $a->strings['Unable to remove group.'] = 'Unable to remove group.';
-$a->strings["Welcome to "] = "Welcome to ";
+$a->strings['Delete'] = 'Delete';
+$a->strings['Click on a contact to add or remove.'] = 'Click on a contact to add or remove.';
+$a->strings['Group Editor'] = 'Group Editor';
+$a->strings['Members'] = 'Members';
+$a->strings['All Contacts'] = 'All Contacts';
+$a->strings['Help:'] = 'Help:';
+$a->strings['Help'] = 'Help';
+$a->strings["Welcome to %s"] = "Welcome to %s";
 $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
 $a->strings['Connected to database.'] = 'Connected to database.';
-$a->strings['Database import succeeded.'] = 'Database import succeeded.';
+$a->strings['Proceed with Installation'] = 'Proceed with Installation';
+$a->strings['Your Friendika site database has been installed.'] = 'Your Friendika site database has been installed.';
 $a->strings['IMPORTANT: You will need to [manually] setup a scheduled task for the poller.'] = 'IMPORTANT: You will need to [manually] setup a scheduled task for the poller.';
 $a->strings['Please see the file "INSTALL.txt".'] = 'Please see the file "INSTALL.txt".';
+$a->strings['Proceed to registration'] = 'Proceed to registration';
 $a->strings['Database import failed.'] = 'Database import failed.';
 $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.';
 $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.';
-$a->strings['Submit'] = 'Submit';
+$a->strings['Friendika Social Network'] = 'Friendika Social Network';
+$a->strings['Installation'] = 'Installation';
+$a->strings['In order to install Friendika we need to know how to contact your database.'] = 'In order to install Friendika we need to know how to contact your database.';
+$a->strings['Please contact your hosting provider or site administrator if you have questions about these settings.'] = 'Please contact your hosting provider or site administrator if you have questions about these settings.';
+$a->strings['The database you specify below must already exist. If it does not, please create it before continuing.'] = 'The database you specify below must already exist. If it does not, please create it before continuing.';
+$a->strings['Database Server Name'] = 'Database Server Name';
+$a->strings['Database Login Name'] = 'Database Login Name';
+$a->strings['Database Login Password'] = 'Database Login Password';
+$a->strings['Database Name'] = 'Database Name';
+$a->strings['Please select a default timezone for your website'] = 'Please select a default timezone for your website';
 $a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.';
 $a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.';
 $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.';
@@ -243,52 +286,90 @@ $a->strings['Please check with your site documentation or support people to see
 $a->strings['If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.'] = 'If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.';
 $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.';
 $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
-$a->strings[' : '] = ' : ';
-$a->strings['Not a valid email address.'] = 'Not a valid email address.';
-$a->strings['Please join my network on '] = 'Please join my network on ';
-$a->strings['Message delivery failed.'] = 'Message delivery failed.';
-$a->strings[' messages sent.'] = ' messages sent.';
+$a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address.';
+$a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.';
 $a->strings['Send invitations'] = 'Send invitations';
 $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
-$a->strings['Please join my social network on '] = 'Please join my social network on ';
+$a->strings['Your message:'] = 'Your message:';
 $a->strings['To accept this invitation, please visit:'] = 'To accept this invitation, please visit:';
 $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Once you have registered, please connect with me via my profile page at:';
+$a->strings["%d message sent."] = array(
+	0 => "%d message sent.",
+	1 => "%d messages sent.",
+);
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
-$a->strings[" commented on your item at "] = " commented on your item at ";
-$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
+$a->strings['Wall Photos'] = 'Wall Photos';
+$a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
+$a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
-$a->strings['This message was sent to you by '] = 'This message was sent to you by ';
-$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
-$a->strings['You may visit them online at'] = 'You may visit them online at';
+$a->strings['This message was sent to you by %s, a member of the Friendika social network.'] = 'This message was sent to you by %s, a member of the Friendika social network.';
+$a->strings['You may visit them online at %s'] = 'You may visit them online at %s';
 $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
-$a->strings['posted an update.'] = 'posted an update.';
+$a->strings['%s posted an update.'] = '%s posted an update.';
 $a->strings['photo'] = 'photo';
 $a->strings['status'] = 'status';
-$a->strings['likes'] = 'likes';
-$a->strings['doesn\'t like'] = 'doesn\'t like';
-$a->strings['\'s'] = '\'s';
+$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s likes %2$s\'s %3$s';
+$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s doesn\'t like %2$s\'s %3$s';
 $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
 $a->strings['Visible to:'] = 'Visible to:';
-$a->strings['Password reset requested at '] = 'Password reset requested at ';
-$a->strings["Welcome back "] = "Welcome back ";
+$a->strings['Password reset request issued. Check your email.'] = 'Password reset request issued. Check your email.';
+$a->strings['Password reset requested at %s'] = 'Password reset requested at %s';
+$a->strings["Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."] = "Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.";
+$a->strings['Your password has been reset as requested.'] = 'Your password has been reset as requested.';
+$a->strings['Your new password is'] = 'Your new password is';
+$a->strings['Save or copy your new password - and then'] = 'Save or copy your new password - and then';
+$a->strings['click here to login'] = 'click here to login';
+$a->strings['Your password may be changed from the <em>Settings</em> page after successful login.'] = 'Your password may be changed from the <em>Settings</em> page after successful login.';
+$a->strings['Forgot your Password?'] = 'Forgot your Password?';
+$a->strings['Enter your email address and submit to have your password reset. Then check your email for further instructions.'] = 'Enter your email address and submit to have your password reset. Then check your email for further instructions.';
+$a->strings['Nickname or Email: '] = 'Nickname or Email: ';
+$a->strings['Reset'] = 'Reset';
+$a->strings["Welcome back %s"] = "Welcome back %s";
 $a->strings['Manage Identities and/or Pages'] = 'Manage Identities and/or Pages';
 $a->strings["\x28Toggle between different identities or community/group pages which share your account details.\x29"] = "\x28Toggle between different identities or community/group pages which share your account details.\x29";
 $a->strings['Select an identity to manage: '] = 'Select an identity to manage: ';
+$a->strings['Profile Match'] = 'Profile Match';
+$a->strings['No matches'] = 'No matches';
+$a->strings['No recipient selected.'] = 'No recipient selected.';
+$a->strings['[no subject]'] = '[no subject]';
+$a->strings['Unable to locate contact information.'] = 'Unable to locate contact information.';
+$a->strings['Message sent.'] = 'Message sent.';
+$a->strings['Message could not be sent.'] = 'Message could not be sent.';
+$a->strings['Messages'] = 'Messages';
+$a->strings['Inbox'] = 'Inbox';
+$a->strings['Outbox'] = 'Outbox';
+$a->strings['New Message'] = 'New Message';
+$a->strings['Message deleted.'] = 'Message deleted.';
+$a->strings['Conversation removed.'] = 'Conversation removed.';
+$a->strings['Please enter a link URL:'] = 'Please enter a link URL:';
+$a->strings['Send Private Message'] = 'Send Private Message';
+$a->strings['To:'] = 'To:';
+$a->strings['Subject:'] = 'Subject:';
+$a->strings['No messages.'] = 'No messages.';
+$a->strings['Delete conversation'] = 'Delete conversation';
+$a->strings['D, d M Y - g:i A'] = 'D, d M Y - g:i A';
+$a->strings['Message not available.'] = 'Message not available.';
+$a->strings['Delete message'] = 'Delete message';
+$a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Share'] = 'Share';
-$a->strings['Insert YouTube video'] = 'Insert YouTube video';
-$a->strings['Set your location'] = 'Set your location';
-$a->strings['Clear browser location'] = 'Clear browser location';
-$a->strings['Permission settings'] = 'Permission settings';
+$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.';
+$a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.';
 $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
-$a->strings['View in context'] = 'View in context';
+$a->strings['Contact: '] = 'Contact: ';
+$a->strings['Private messages to this person are at risk of public disclosure.'] = 'Private messages to this person are at risk of public disclosure.';
+$a->strings['Invalid contact.'] = 'Invalid contact.';
+$a->strings['%d member'] = array(
+	0 => '%d member',
+	1 => '%d members',
+);
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
+$a->strings['Pending Friend/Connect Notifications'] = 'Pending Friend/Connect Notifications';
 $a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
 $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
 $a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
@@ -302,8 +383,14 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $a->strings['New Follower'] = 'New Follower';
 $a->strings['Approve'] = 'Approve';
 $a->strings['No notifications.'] = 'No notifications.';
+$a->strings['User registrations waiting for confirm'] = 'User registrations waiting for confirm';
+$a->strings['Deny'] = 'Deny';
 $a->strings['No registrations.'] = 'No registrations.';
+$a->strings['Post successful.'] = 'Post successful.';
 $a->strings['Login failed.'] = 'Login failed.';
+$a->strings["Welcome "] = "Welcome ";
+$a->strings['Please upload a profile photo.'] = 'Please upload a profile photo.';
+$a->strings["Welcome back "] = "Welcome back ";
 $a->strings['Photo Albums'] = 'Photo Albums';
 $a->strings['Contact Photos'] = 'Contact Photos';
 $a->strings['Contact information unavailable'] = 'Contact information unavailable';
@@ -325,49 +412,109 @@ $a->strings['Edit Album'] = 'Edit Album';
 $a->strings['View Photo'] = 'View Photo';
 $a->strings['Photo not available'] = 'Photo not available';
 $a->strings['Edit photo'] = 'Edit photo';
+$a->strings['Private Message'] = 'Private Message';
+$a->strings['<< Prev'] = '<< Prev';
 $a->strings['View Full Size'] = 'View Full Size';
+$a->strings['Next >>'] = 'Next >>';
 $a->strings['Tags: '] = 'Tags: ';
 $a->strings['[Remove any tag]'] = '[Remove any tag]';
 $a->strings['New album name'] = 'New album name';
 $a->strings['Caption'] = 'Caption';
 $a->strings['Add a Tag'] = 'Add a Tag';
 $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
+$a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
+$a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
+$a->strings['Share'] = 'Share';
+$a->strings['This is you'] = 'This is you';
 $a->strings['Recent Photos'] = 'Recent Photos';
 $a->strings['Upload New Photos'] = 'Upload New Photos';
 $a->strings['View Album'] = 'View Album';
+$a->strings['Status'] = 'Status';
+$a->strings['Profile'] = 'Profile';
+$a->strings['Photos'] = 'Photos';
 $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
-$a->strings['Image size reduction [175] failed.'] = 'Image size reduction [175] failed.';
-$a->strings['Image size reduction [80] failed.'] = 'Image size reduction [80] failed.';
-$a->strings['Image size reduction [48] failed.'] = 'Image size reduction [48] failed.';
 $a->strings['Unable to process image'] = 'Unable to process image';
+$a->strings['Upload File:'] = 'Upload File:';
+$a->strings['Upload Profile Photo'] = 'Upload Profile Photo';
+$a->strings['Upload'] = 'Upload';
+$a->strings['or'] = 'or';
+$a->strings['skip this step'] = 'skip this step';
+$a->strings['select a photo from your photo albums'] = 'select a photo from your photo albums';
+$a->strings['Crop Image'] = 'Crop Image';
+$a->strings['Please adjust the image cropping for optimum viewing.'] = 'Please adjust the image cropping for optimum viewing.';
+$a->strings['Done Editing'] = 'Done Editing';
 $a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
-$a->strings['Image size reduction [640] failed.'] = 'Image size reduction [640] failed.';
 $a->strings['Profile Name is required.'] = 'Profile Name is required.';
 $a->strings['Profile updated.'] = 'Profile updated.';
 $a->strings['Profile deleted.'] = 'Profile deleted.';
 $a->strings['Profile-'] = 'Profile-';
 $a->strings['New profile created.'] = 'New profile created.';
 $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.';
+$a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?';
+$a->strings['Edit Profile Details'] = 'Edit Profile Details';
+$a->strings['View this profile'] = 'View this profile';
+$a->strings['Create a new profile using these settings'] = 'Create a new profile using these settings';
+$a->strings['Clone this profile'] = 'Clone this profile';
+$a->strings['Delete this profile'] = 'Delete this profile';
+$a->strings['Profile Name:'] = 'Profile Name:';
+$a->strings['Your Full Name:'] = 'Your Full Name:';
+$a->strings['Title/Description:'] = 'Title/Description:';
+$a->strings['Your Gender:'] = 'Your Gender:';
+$a->strings["Birthday \x28y/m/d\x29:"] = "Birthday \x28y/m/d\x29:";
+$a->strings['Street Address:'] = 'Street Address:';
+$a->strings['Locality/City:'] = 'Locality/City:';
+$a->strings['Postal/Zip Code:'] = 'Postal/Zip Code:';
+$a->strings['Country:'] = 'Country:';
+$a->strings['Region/State:'] = 'Region/State:';
+$a->strings['<span class="heart">&hearts;</span> Marital Status:'] = '<span class="heart">&hearts;</span> Marital Status:';
+$a->strings["Who: \x28if applicable\x29"] = "Who: \x28if applicable\x29";
+$a->strings['Examples: cathy123, Cathy Williams, cathy@example.com'] = 'Examples: cathy123, Cathy Williams, cathy@example.com';
+$a->strings['Sexual Preference:'] = 'Sexual Preference:';
+$a->strings['Homepage URL:'] = 'Homepage URL:';
+$a->strings['Political Views:'] = 'Political Views:';
+$a->strings['Religious Views:'] = 'Religious Views:';
+$a->strings['Public Keywords:'] = 'Public Keywords:';
+$a->strings['Private Keywords:'] = 'Private Keywords:';
+$a->strings['Example: fishing photography software'] = 'Example: fishing photography software';
+$a->strings["\x28Used for suggesting potential friends, can be seen by others\x29"] = "\x28Used for suggesting potential friends, can be seen by others\x29";
+$a->strings["\x28Used for searching profiles, never shown to others\x29"] = "\x28Used for searching profiles, never shown to others\x29";
+$a->strings['Tell us about yourself...'] = 'Tell us about yourself...';
+$a->strings['Hobbies/Interests'] = 'Hobbies/Interests';
+$a->strings['Contact information and Social Networks'] = 'Contact information and Social Networks';
+$a->strings['Musical interests'] = 'Musical interests';
+$a->strings['Books, literature'] = 'Books, literature';
+$a->strings['Television'] = 'Television';
+$a->strings['Film/dance/culture/entertainment'] = 'Film/dance/culture/entertainment';
+$a->strings['Love/romance'] = 'Love/romance';
+$a->strings['Work/employment'] = 'Work/employment';
+$a->strings['School/education'] = 'School/education';
 $a->strings['This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.'] = 'This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.';
-$a->strings['Age: '] = 'Age: ';
+$a->strings['Profiles'] = 'Profiles';
+$a->strings['Change profile photo'] = 'Change profile photo';
+$a->strings['Create New Profile'] = 'Create New Profile';
 $a->strings['Profile Image'] = 'Profile Image';
+$a->strings['Visible to everybody'] = 'Visible to everybody';
+$a->strings['Edit visibility'] = 'Edit visibility';
+$a->strings['Invalid profile identifier.'] = 'Invalid profile identifier.';
+$a->strings['Profile Visibility Editor'] = 'Profile Visibility Editor';
+$a->strings['Visible To'] = 'Visible To';
+$a->strings["All Contacts \x28with secure profile access\x29"] = "All Contacts \x28with secure profile access\x29";
 $a->strings['Invalid OpenID url'] = 'Invalid OpenID url';
 $a->strings['Please enter the required information.'] = 'Please enter the required information.';
 $a->strings['Please use a shorter name.'] = 'Please use a shorter name.';
 $a->strings['Name too short.'] = 'Name too short.';
-$a->strings["That doesn\'t appear to be your full \x28First Last\x29 name."] = "That doesn\'t appear to be your full \x28First Last\x29 name.";
+$a->strings["That doesn't appear to be your full \x28First Last\x29 name."] = "That doesn't appear to be your full \x28First Last\x29 name.";
 $a->strings['Your email domain is not among those allowed on this site.'] = 'Your email domain is not among those allowed on this site.';
+$a->strings['Not a valid email address.'] = 'Not a valid email address.';
 $a->strings['Cannot use that email.'] = 'Cannot use that email.';
 $a->strings['Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.'] = 'Your "nickname" can only contain "a-z", "0-9", "-", and "_", and must also begin with a letter.';
 $a->strings['Nickname is already registered. Please choose another.'] = 'Nickname is already registered. Please choose another.';
 $a->strings['SERIOUS ERROR: Generation of security keys failed.'] = 'SERIOUS ERROR: Generation of security keys failed.';
 $a->strings['An error occurred during registration. Please try again.'] = 'An error occurred during registration. Please try again.';
 $a->strings['An error occurred creating your default profile. Please try again.'] = 'An error occurred creating your default profile. Please try again.';
-$a->strings['Registration details for '] = 'Registration details for ';
 $a->strings['Registration successful. Please check your email for further instructions.'] = 'Registration successful. Please check your email for further instructions.';
 $a->strings['Failed to send email message. Here is the message that failed.'] = 'Failed to send email message. Here is the message that failed.';
 $a->strings['Your registration can not be processed.'] = 'Your registration can not be processed.';
-$a->strings['Registration request at '] = 'Registration request at ';
 $a->strings['Your registration is pending approval by the site owner.'] = 'Your registration is pending approval by the site owner.';
 $a->strings["You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."] = "You may \x28optionally\x29 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.'] = 'If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.';
@@ -380,11 +527,11 @@ $a->strings['Your Email Address: '] = '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>\'.'] = '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: '] = 'Choose a nickname: ';
 $a->strings['Please login.'] = 'Please login.';
-$a->strings['Registration revoked for '] = 'Registration revoked for ';
 $a->strings['Account approved.'] = 'Account approved.';
 $a->strings['Remove My Account'] = 'Remove My Account';
 $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.';
 $a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:';
+$a->strings['No results.'] = 'No results.';
 $a->strings['Passwords do not match. Password unchanged.'] = 'Passwords do not match. Password unchanged.';
 $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Empty passwords are not allowed. Password unchanged.';
 $a->strings['Password changed.'] = 'Password changed.';
@@ -397,10 +544,58 @@ $a->strings['Settings updated.'] = 'Settings updated.';
 $a->strings['Plugin Settings'] = 'Plugin Settings';
 $a->strings['Account Settings'] = 'Account Settings';
 $a->strings['No Plugin settings configured'] = 'No Plugin settings configured';
+$a->strings['Normal Account'] = 'Normal Account';
+$a->strings['This account is a normal personal profile'] = 'This account is a normal personal profile';
+$a->strings['Soapbox Account'] = 'Soapbox Account';
+$a->strings['Automatically approve all connection/friend requests as read-only fans'] = 'Automatically approve all connection/friend requests as read-only fans';
+$a->strings['Community/Celebrity Account'] = 'Community/Celebrity Account';
+$a->strings['Automatically approve all connection/friend requests as read-write fans'] = 'Automatically approve all connection/friend requests as read-write fans';
+$a->strings['Automatic Friend Account'] = 'Automatic Friend Account';
+$a->strings['Automatically approve all connection/friend requests as friends'] = 'Automatically approve all connection/friend requests as friends';
 $a->strings['OpenID: '] = 'OpenID: ';
 $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
+$a->strings['Publish your default profile in site directory?'] = 'Publish your default profile in site directory?';
+$a->strings['Publish your default profile in global social directory?'] = 'Publish your default profile in global social directory?';
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
+$a->strings['Your Identity Address is'] = 'Your Identity Address is';
+$a->strings['Export Personal Data'] = 'Export Personal Data';
+$a->strings['Basic Settings'] = 'Basic Settings';
+$a->strings['Full Name:'] = 'Full Name:';
+$a->strings['Email Address:'] = 'Email Address:';
+$a->strings['Your Timezone:'] = 'Your Timezone:';
+$a->strings['Default Post Location:'] = 'Default Post Location:';
+$a->strings['Use Browser Location:'] = 'Use Browser Location:';
+$a->strings['Display Theme:'] = 'Display Theme:';
+$a->strings['Security and Privacy Settings'] = 'Security and Privacy Settings';
+$a->strings['Maximum Friend Requests/Day:'] = 'Maximum Friend Requests/Day:';
+$a->strings["\x28to prevent spam abuse\x29"] = "\x28to prevent spam abuse\x29";
+$a->strings['Allow friends to post to your profile page:'] = 'Allow friends to post to your profile page:';
+$a->strings["Automatically expire \x28delete\x29 posts older than"] = "Automatically expire \x28delete\x29 posts older than";
+$a->strings['days'] = 'days';
+$a->strings['Notification Settings'] = 'Notification Settings';
+$a->strings['Send a notification email when:'] = 'Send a notification email when:';
+$a->strings['You receive an introduction'] = 'You receive an introduction';
+$a->strings['Your introductions are confirmed'] = 'Your introductions are confirmed';
+$a->strings['Someone writes on your profile wall'] = 'Someone writes on your profile wall';
+$a->strings['Someone writes a followup comment'] = 'Someone writes a followup comment';
+$a->strings['You receive a private message'] = 'You receive a private message';
+$a->strings['Password Settings'] = 'Password Settings';
+$a->strings['Leave password fields blank unless changing'] = 'Leave password fields blank unless changing';
+$a->strings['New Password:'] = 'New Password:';
+$a->strings['Confirm:'] = 'Confirm:';
+$a->strings['Advanced Page Settings'] = 'Advanced Page Settings';
 $a->strings['Default Post Permissions'] = 'Default Post Permissions';
+$a->strings["\x28click to open/close\x29"] = "\x28click to open/close\x29";
+$a->strings['Email/Mailbox Setup'] = 'Email/Mailbox Setup';
+$a->strings["If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."] = "If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox.";
+$a->strings['IMAP server name:'] = 'IMAP server name:';
+$a->strings['IMAP port:'] = 'IMAP port:';
+$a->strings["Security \x28TLS or SSL\x29:"] = "Security \x28TLS or SSL\x29:";
+$a->strings['Email login name:'] = 'Email login name:';
+$a->strings['Email password:'] = 'Email password:';
+$a->strings["Reply-to address \x28Optional\x29:"] = "Reply-to address \x28Optional\x29:";
+$a->strings['Send public posts to all email contacts:'] = 'Send public posts to all email contacts:';
+$a->strings['Email access is disabled on this site.'] = 'Email access is disabled on this site.';
 $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
 $a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';
@@ -410,6 +605,7 @@ $a->strings['Visible To:'] = 'Visible To:';
 $a->strings['Groups'] = 'Groups';
 $a->strings['Except For:'] = 'Except For:';
 $a->strings['Logged out.'] = 'Logged out.';
+$a->strings['Image/photo'] = 'Image/photo';
 $a->strings['Unknown | Not categorised'] = 'Unknown | Not categorised';
 $a->strings['Block immediately'] = 'Block immediately';
 $a->strings['Shady, spammer, self-marketer'] = 'Shady, spammer, self-marketer';
@@ -422,6 +618,28 @@ $a->strings['Twice daily'] = 'Twice daily';
 $a->strings['Daily'] = 'Daily';
 $a->strings['Weekly'] = 'Weekly';
 $a->strings['Monthly'] = 'Monthly';
+$a->strings['View %s\'s profile'] = 'View %s\'s profile';
+$a->strings['View in context'] = 'View in context';
+$a->strings['See more posts like this'] = 'See more posts like this';
+$a->strings['See all %d comments'] = 'See all %d comments';
+$a->strings['to'] = 'to';
+$a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
+$a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
+$a->strings['%s likes this.'] = '%s likes this.';
+$a->strings['%s doesn\'t like this.'] = '%s doesn\'t like this.';
+$a->strings['<span  %1$s>%2$d people</span> like this.'] = '<span  %1$s>%2$d people</span> like this.';
+$a->strings['<span  %1$s>%2$d people</span> don\'t like this.'] = '<span  %1$s>%2$d people</span> don\'t like this.';
+$a->strings['and'] = 'and';
+$a->strings[', and %d other people'] = ', and %d other people';
+$a->strings['%s like this.'] = '%s like this.';
+$a->strings['%s don\'t like this.'] = '%s don\'t like this.';
+$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
+$a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
+$a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
+$a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
+$a->strings['Where are you right now?'] = 'Where are you right now?';
+$a->strings['Enter a title for this item'] = 'Enter a title for this item';
+$a->strings['Set title'] = 'Set title';
 $a->strings['Miscellaneous'] = 'Miscellaneous';
 $a->strings['less than a second ago'] = 'less than a second ago';
 $a->strings['year'] = 'year';
@@ -431,7 +649,6 @@ $a->strings['months'] = 'months';
 $a->strings['week'] = 'week';
 $a->strings['weeks'] = 'weeks';
 $a->strings['day'] = 'day';
-$a->strings['days'] = 'days';
 $a->strings['hour'] = 'hour';
 $a->strings['hours'] = 'hours';
 $a->strings['minute'] = 'minute';
@@ -439,6 +656,7 @@ $a->strings['minutes'] = 'minutes';
 $a->strings['second'] = 'second';
 $a->strings['seconds'] = 'seconds';
 $a->strings[' ago'] = ' ago';
+$a->strings['Cannot locate DNS info for database server \'%s\''] = 'Cannot locate DNS info for database server \'%s\'';
 $a->strings['Create a new group'] = 'Create a new group';
 $a->strings['Everybody'] = 'Everybody';
 $a->strings['Birthday:'] = 'Birthday:';
@@ -446,11 +664,25 @@ $a->strings['Home'] = 'Home';
 $a->strings['Apps'] = 'Apps';
 $a->strings['Directory'] = 'Directory';
 $a->strings['Network'] = 'Network';
-$a->strings['Notifications'] = 'Notifications';
 $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
-$a->strings['Profiles'] = 'Profiles';
+$a->strings["\x28no subject\x29"] = "\x28no subject\x29";
 $a->strings['Embedding disabled'] = 'Embedding disabled';
+$a->strings['j F, Y'] = 'j F, Y';
+$a->strings['j F'] = 'j F';
+$a->strings['Age:'] = 'Age:';
+$a->strings['<span class="heart">&hearts;</span> Status:'] = '<span class="heart">&hearts;</span> Status:';
+$a->strings['Religion:'] = 'Religion:';
+$a->strings['About:'] = 'About:';
+$a->strings['Hobbies/Interests:'] = 'Hobbies/Interests:';
+$a->strings['Contact information and Social Networks:'] = 'Contact information and Social Networks:';
+$a->strings['Musical interests:'] = 'Musical interests:';
+$a->strings['Books, literature:'] = 'Books, literature:';
+$a->strings['Television:'] = 'Television:';
+$a->strings['Film/dance/culture/entertainment:'] = 'Film/dance/culture/entertainment:';
+$a->strings['Love/Romance:'] = 'Love/Romance:';
+$a->strings['Work/employment:'] = 'Work/employment:';
+$a->strings['School/education:'] = 'School/education:';
 $a->strings['Male'] = 'Male';
 $a->strings['Female'] = 'Female';
 $a->strings['Currently Male'] = 'Currently Male';
@@ -505,14 +737,18 @@ $a->strings['Complicated'] = 'Complicated';
 $a->strings['Don\'t care'] = 'Don\'t care';
 $a->strings['Ask me'] = 'Ask me';
 $a->strings['Facebook disabled'] = 'Facebook disabled';
+$a->strings['Updating contacts'] = 'Updating contacts';
 $a->strings['Facebook API key is missing.'] = 'Facebook API key is missing.';
 $a->strings['Facebook Connect'] = 'Facebook Connect';
-$a->strings['Install Facebook post connector'] = 'Install Facebook post connector';
-$a->strings['Remove Facebook post connector'] = 'Remove Facebook post connector';
+$a->strings['Install Facebook connector for this account.'] = 'Install Facebook connector for this account.';
+$a->strings['Remove Facebook connector'] = 'Remove Facebook connector';
+$a->strings['Post to Facebook by default'] = 'Post to Facebook by default';
 $a->strings['Facebook'] = 'Facebook';
 $a->strings['Facebook Connector Settings'] = 'Facebook Connector Settings';
 $a->strings['Post to Facebook'] = 'Post to Facebook';
+$a->strings['Post to Facebook cancelled because of multi-network access permission conflict.'] = 'Post to Facebook cancelled because of multi-network access permission conflict.';
 $a->strings['Image: '] = 'Image: ';
+$a->strings['View on Friendika'] = 'View on Friendika';
 $a->strings['Select files to upload: '] = 'Select files to upload: ';
 $a->strings['Use the following controls only if the Java uploader [above] fails to launch.'] = 'Use the following controls only if the Java uploader [above] fails to launch.';
 $a->strings['Upload a file'] = 'Upload a file';