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

1 files changed, 17 insertions, 1 deletions

diff --git a/util/strings.php b/util/strings.php
index 62211918e..39d66a3a9 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -117,6 +117,20 @@ $a->strings['Your introduction has been sent.'] = 'Your introduction has been se
 $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['[Name Withheld]'] = '[Name Withheld]';
+$a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
+$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['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['Submit Request'] = 'Submit Request';
+$a->strings['Cancel'] = 'Cancel';
 $a->strings['Global Directory'] = 'Global Directory';
 $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
@@ -176,6 +190,7 @@ $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['Facebook status update failed.'] = 'Facebook status update failed.';
 $a->strings['photo'] = 'photo';
 $a->strings['status'] = 'status';
 $a->strings['likes'] = 'likes';
@@ -311,7 +326,6 @@ $a->strings['OpenID: '] = 'OpenID: ';
 $a->strings["&nbsp;\x28Optional\x29 Allow this OpenID to login to this account."] = "&nbsp;\x28Optional\x29 Allow this OpenID to login to this account.";
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
 $a->strings['Default Post Permissions'] = 'Default Post Permissions';
-$a->strings['Cancel'] = 'Cancel';
 $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: ';
@@ -376,6 +390,8 @@ $a->strings['Other'] = 'Other';
 $a->strings['Undecided'] = 'Undecided';
 $a->strings['Males'] = 'Males';
 $a->strings['Females'] = 'Females';
+$a->strings['Gay'] = 'Gay';
+$a->strings['Lesbian'] = 'Lesbian';
 $a->strings['No Preference'] = 'No Preference';
 $a->strings['Bisexual'] = 'Bisexual';
 $a->strings['Autosexual'] = 'Autosexual';