Merge branch 'friendika-master'

1 files changed, 12 insertions, 0 deletions

diff --git a/util/strings.php b/util/strings.php
index 5233c5619..3b12c0e54 100644
--- a/util/strings.php
+++ b/util/strings.php
@@ -84,6 +84,7 @@ $a->strings['Delete contact'] = 'Delete contact';
 $a->strings['Last updated: '] = 'Last updated: ';
 $a->strings['Update public posts: '] = 'Update public posts: ';
 $a->strings['Never'] = 'Never';
+$a->strings['Update now'] = 'Update now';
 $a->strings['Unblock this contact'] = 'Unblock this contact';
 $a->strings['Block this contact'] = 'Block this contact';
 $a->strings['Unignore this contact'] = 'Unignore this contact';
@@ -219,6 +220,11 @@ $a->strings['Empty post discarded.'] = 'Empty post discarded.';
 $a->strings['Wall Photos'] = 'Wall Photos';
 $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['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['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['photo'] = 'photo';
 $a->strings['status'] = 'status';
 $a->strings['likes'] = 'likes';
@@ -251,6 +257,8 @@ $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['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: ';
@@ -411,6 +419,7 @@ $a->strings['Network'] = 'Network';
 $a->strings['Notifications'] = 'Notifications';
 $a->strings['Settings'] = 'Settings';
 $a->strings['Profiles'] = 'Profiles';
+$a->strings['Embedding disabled'] = 'Embedding disabled';
 $a->strings['Male'] = 'Male';
 $a->strings['Female'] = 'Female';
 $a->strings['Currently Male'] = 'Currently Male';
@@ -467,6 +476,9 @@ $a->strings['Ask me'] = 'Ask me';
 $a->strings['Facebook status update failed.'] = 'Facebook status update failed.';
 $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';
+$a->strings['Drop files here to upload'] = 'Drop files here to upload';
+$a->strings['Failed'] = 'Failed';
 $a->strings['No files were uploaded.'] = 'No files were uploaded.';
 $a->strings['Uploaded file is empty'] = 'Uploaded file is empty';
 $a->strings['Uploaded file is too large'] = 'Uploaded file is too large';