feature 2108 added: user upload removed from core. It will come back as a

"new generation" user upload in the Community plugin.


git-svn-id: http://piwigo.org/svn/trunk@8651 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 0 insertions, 32 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 47bf089ee..bbcc73204 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -48,8 +48,6 @@ $lang['%d users deleted'] = "%d users deleted";
 $lang['%d user'] = "%d user";
 $lang['%d users'] = "%d users";
 $lang['%d waiting for validation'] = "%d waiting for validation";
-$lang['%d waiting pictures rejected'] = "%d waiting pictures rejected";
-$lang['%d waiting pictures validated'] = "%d waiting pictures validated";
 $lang['Actions'] = "Actions";
 $lang['Activate'] = "Activate";
 $lang['Add/delete a permalink'] = "Add/delete a permalink";
@@ -90,7 +88,6 @@ $lang['Elements'] = "Elements";
 $lang['Email admins when a new user registers'] = "Email admins when a new user registers";
 $lang['Email admins when a valid comment is entered'] = "Email admins when a valid comment is entered";
 $lang['Email admins when a comment requires validation'] = "Email admins when a comment requires validation";
-$lang['Email admins when a picture is uploaded'] = "Email admins when a picture is uploaded";
 $lang['Empty caddie'] = "Empty caddie";
 $lang['Environment'] = "Environment";
 $lang['Form'] = "Form";
@@ -149,7 +146,6 @@ $lang['Random picture'] = "Random picture";
 $lang['Rate date'] = "Rating date";
 $lang['Rating by guests'] = "Rating by guests";
 $lang['Rating'] = "Rating";
-$lang['Reject All'] = "Reject All";
 $lang['Reject'] = "Reject";
 $lang['Representant'] = "Representant";
 $lang['Representation of albums'] = "Representation of albums";
@@ -175,7 +171,6 @@ $lang['Uninstall'] = "Uninstall";
 $lang['Use the default image sort order (defined in the configuration file)'] = "Use default image sort order (defined in the configuration file)";
 $lang['User comments validation'] = "User comments validation";
 $lang['Users'] = "Users";
-$lang['Validate All'] = "Validate All";
 $lang['Validate'] = "Validate";
 $lang['Validation'] = "Validation";
 $lang['Version'] = "Version";
@@ -199,7 +194,6 @@ $lang['Public'] = "Public";
 $lang['Find a new representant by random'] = "Find a new random representant";
 $lang['Public / Private'] = "Public / Private";
 $lang['Manage authorizations for selected albums'] = "Manage authorizations for selected albums";
-$lang['Select uploadable albums'] = "Select uploadable albums";
 $lang['Virtual album added'] = "Virtual album added";
 $lang['Virtual album deleted'] = "Virtual album deleted";
 $lang['Access type'] = "Access type";
@@ -218,7 +212,6 @@ $lang['Dissociate from album'] = "Dissociate from album";
 $lang['dissociate from group'] = "dissociate from group";
 $lang['edit album permissions'] = "edit album permissions";
 $lang['Album updated successfully'] = "Album updated successfully";
-$lang['Authorize upload'] = "Authorize upload";
 $lang['elements per page'] = "elements per page";
 $lang['elements'] = "elements";
 $lang['High definition enabled'] = "High definition enabled";
@@ -366,7 +359,6 @@ $lang['User list'] = "Users list";
 $lang['Modify informations about a picture'] = "Modify picture information";
 $lang['Thumbnail creation'] = "Thumbnail creation";
 $lang['Database synchronization with files'] = "Database synchronization with files";
-$lang['Pictures waiting for validation'] = "Pictures awaiting validation";
 $lang['all'] = "all";
 $lang['pictures without thumbnail (jpeg and png only)'] = "pictures without thumbnail (jpeg and png only)";
 $lang['height must be a number superior to'] = "height must be a number greater than";
@@ -555,8 +547,6 @@ $lang['An error occured during extraction (%s).'] = "An error occured during the
 $lang['Please check "plugins" folder and sub-folders permissions (CHMOD).'] = "Please check \"plugins\" folder and sub-folders permissions (CHMOD).";
 $lang['Can\'t connect to server.'] = "Connection to server impossible.";
 $lang['Purge compiled templates'] = "Purge compiled templates";
-$lang['Show upload link every time'] = "Show upload link all the time";
-$lang['User access level to upload'] = "User access level for uploading";
 $lang['ACCESS_0'] = "Free access";
 $lang['ACCESS_1'] = "Access to all";
 $lang['ACCESS_2'] = "Access to registered users";
@@ -735,7 +725,6 @@ $lang['Add Photos'] = 'Add Photos';
 $lang['Download'] = 'Download';
 $lang['The following tag was deleted'] = 'The following tag was deleted';
 $lang['Miscellaneous'] = 'Miscellaneous';
-$lang['User Upload'] = 'User Upload';
 $lang['Virtual Links'] = 'Virtual Links';
 $lang['There is no other language available.'] = 'There is no other language available.';
 $lang['There is no other plugin available.'] = 'There is no other plugin available.';
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 3457ffa72..b5f6fbc7a 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -44,8 +44,6 @@ $lang['%d new image'] = "%d new image";
 $lang['%d new images'] = "%d new images";
 $lang['%d new user'] = "%d new user";
 $lang['%d new users'] = "%d new users";
-$lang['%d waiting element'] = "%d waiting element";
-$lang['%d waiting elements'] = "%d waiting elements";
 $lang['About'] = "About";
 $lang['All tags'] = "All tags";
 $lang['Any tag'] = "Any tag";
@@ -319,7 +317,6 @@ $lang['Registration of %s'] = "Registration of %s";
 $lang['Album: %s'] = "Album: %s";
 $lang['Picture name: %s'] = "Picture name: %s";
 $lang['Creation date: %s'] = "Creation date: %s";
-$lang['Waiting page: %s'] = "Awaiting page: %s";
 $lang['Picture uploaded by %s'] = "Picture uploaded by %s";
 $lang['Bad status for user "guest", using default status. Please notify the webmaster.'] = "Bad status for user \"guest\", default status will be used. Please notify the webmaster.";
 $lang['Administrator, webmaster and special user cannot use this method'] = "Administrator, webmaster and special user cannot use this method";
diff --git a/language/en_UK/help/help_user_upload.html b/language/en_UK/help/help_user_upload.html
deleted file mode 100644
index 46c99a83e..000000000
--- a/language/en_UK/help/help_user_upload.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<p>Users can upload their photos too.</p>
-
-<ol>
-
-  <li>Authorize upload on any physical category
-  (<span class="pwgScreen">Administration &raquo; Categories &raquo; Manage
-  &raquo; edit</span> or <span class="pwgScreen">Administration &raquo;
-  Categories &raquo; Properties &raquo; Upload</span>). Virtual categories
-  can't receive any upload.</li>
-
-  <li>Give write access on corresponding directories.</li>
-
-</ol>
-
-<p>Photos uploaded by users are not directly visible on the website. An
-administrator must validate uploaded photos
-in <span class="pwgScreen">Administration &raquo; Photos &raquo;
-Waiting</span> to accept or reject the proposed photos.</p>