From 33037754d80dce07e6d806b6cee6df56311bb954 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 27 Jan 2011 18:45:19 -0800 Subject: removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. --- util/extract.php | 2 +- util/strings.php | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'util') diff --git a/util/extract.php b/util/extract.php index bb16a47da..92ec8501c 100644 --- a/util/extract.php +++ b/util/extract.php @@ -3,7 +3,7 @@ $arr = array(); $files = array('index.php','boot.php'); - $files = array_merge($files,glob('mod/*'),glob('include/*')); + $files = array_merge($files,glob('mod/*'),glob('include/*'),glob('addon/*/*')); foreach($files as $file) { diff --git a/util/strings.php b/util/strings.php index 8b58a6b7a..5233c5619 100644 --- a/util/strings.php +++ b/util/strings.php @@ -163,6 +163,7 @@ $a->strings['Private Message'] = 'Private Message'; $a->strings['This is you'] = 'This is you'; $a->strings['View $name\'s profile'] = 'View $name\'s profile'; $a->strings['Item has been removed.'] = 'Item has been removed.'; +$a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; $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.'; @@ -211,7 +212,6 @@ $a->strings['Send invitations'] = 'Send invitations'; $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:'; $a->strings['Your message:'] = 'Your message:'; $a->strings['Please join my social network on '] = 'Please join my social network on '; -$a->strings["\r\n"] = "\r\n"; $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['Unable to locate original post.'] = 'Unable to locate original post.'; @@ -287,9 +287,7 @@ $a->strings['No photos selected'] = 'No photos selected'; $a->strings['Upload Photos'] = 'Upload Photos'; $a->strings['New album name: '] = 'New album name: '; $a->strings['or existing album name: '] = 'or existing album name: '; -$a->strings['Select files to upload: '] = 'Select files to upload: '; $a->strings['Permissions'] = 'Permissions'; -$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['Edit Album'] = 'Edit Album'; $a->strings['View Photo'] = 'View Photo'; $a->strings['Photo not available'] = 'Photo not available'; @@ -340,7 +338,6 @@ $a->strings['Your registration is pending approval by the site owner.'] = 'Your $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.'; $a->strings["Your OpenID \x28optional\x29: "] = "Your OpenID \x28optional\x29: "; -$a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; $a->strings['Registration'] = 'Registration'; $a->strings['Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '] = 'Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '; $a->strings['Your Email Address: '] = 'Your Email Address: '; @@ -467,6 +464,16 @@ $a->strings['Uncertain'] = 'Uncertain'; $a->strings['Complicated'] = 'Complicated'; $a->strings['Don\'t care'] = 'Don\'t care'; $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['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'; +$a->strings['File has an invalid extension, it should be one of '] = 'File has an invalid extension, it should be one of '; +$a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered'; +$a->strings['Randplace Settings'] = 'Randplace Settings'; +$a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; $a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; $a->strings['Africa/Accra'] = 'Africa/Accra'; $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; -- cgit v1.2.3