string update

1 files changed, 44 insertions, 32 deletions

diff --git a/util/strings.php b/util/strings.php
index 5a8c0f649..aa5f85653 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -63,37 +63,6 @@ $a->strings['%d Contact'] = array(
 	0 => '%d Contact',
 	1 => '%d Contacts',
 );
-$a->strings['Normal View'] = 'Normal View';
-$a->strings['New Item View'] = 'New Item View';
-$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.';
-$a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.';
-$a->strings['Please enter a link URL:'] = 'Please enter a link URL:';
-$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['Share'] = 'Share';
-$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['Set title'] = 'Set title';
-$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['No such group'] = 'No such group';
-$a->strings['Group is empty'] = 'Group is empty';
-$a->strings['Group: '] = 'Group: ';
-$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['%d member'] = array(
-	0 => '%d member',
-	1 => '%d members',
-);
 $a->strings['Applications'] = 'Applications';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
@@ -234,9 +203,22 @@ $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['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.';
@@ -319,7 +301,8 @@ $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['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['%s posted an update.'] = '%s posted an update.';
 $a->strings['photo'] = 'photo';
@@ -357,6 +340,7 @@ $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:';
@@ -366,6 +350,24 @@ $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['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['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['Share'] = 'Share';
+$a->strings['Set title'] = 'Set title';
+$a->strings['No such group'] = 'No such group';
+$a->strings['Group is empty'] = 'Group is empty';
+$a->strings['Group: '] = 'Group: ';
+$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';
@@ -582,6 +584,15 @@ $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['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
 $a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';
@@ -644,6 +655,7 @@ $a->strings['Directory'] = 'Directory';
 $a->strings['Network'] = 'Network';
 $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
+$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';