feature 2548, multiple size:

* adapt the upload script

* remove the resize settings screen

* add a new screen [Administration > Configuration > Options > Photo Sizes]
  with the ability to resize original after upload


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

1 files changed, 6 insertions, 12 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 0412b5013..5cc716a32 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -388,7 +388,6 @@ $lang['Invert'] = 'Invert';
 $lang['IP'] = "IP";
 $lang['jump to album'] = "jump to album";
 $lang['jump to photo'] = "jump to photo";
-$lang['Keep high definition'] = 'Keep high definition';
 $lang['Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'] = "Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will be sent emails when a new release is available (sometimes including a security bug fix, it is important to know and upgrade) and when major events happen to the project. Only a few emails a year.";
 $lang['Language has been successfully installed'] = 'Language has been successfully installed';
 $lang['Languages which need upgrade'] = 'Languages which need upgrade';
@@ -701,17 +700,14 @@ $lang['The file or directory cannot be accessed (either it does not exist or the
 $lang['The following tag was deleted'] = 'The following tag was deleted';
 $lang['the forum'] = "the forum";
 $lang['The gallery URL is not valid.'] = "The gallery URL is not valid.";
-$lang['The high definition image quality must be a number between %d and %d'] = 'The high definition image quality must be a number between %d and %d';
-$lang['The high definition maximum height must be a number between %d and %d'] = 'The high definition maximum height must be a number between %d and %d';
-$lang['The high definition maximum width must be a number between %d and %d'] = 'The high definition maximum width must be a number between %d and %d';
+$lang['The original image quality must be a number between %d and %d'] = 'The original image quality must be a number between %d and %d';
+$lang['The original maximum height must be a number between %d and %d'] = 'The original maximum height must be a number between %d and %d';
+$lang['The original maximum width must be a number between %d and %d'] = 'The original maximum width must be a number between %d and %d';
 $lang['The name of a group must not contain " or \' or be empty.'] = "The name of a group must not contain \" or ' or be empty.";
 $lang['The name of an album must not be empty'] = "The name of an album must not be empty";
 $lang['The name of directories and files must be composed of letters, numbers, "-", "_" or "."'] = "The name of directories and files must comprise only letters, numbers, \"-\", \"_\" or \".\"";
 $lang['The number of comments a page must be between 5 and 50 included.'] = "The number of comments on a page must be between 5 and 50 included.";
 $lang['The permalink name must be composed of a-z, A-Z, 0-9, "-", "_" or "/". It must not be numeric or start with number followed by "-"'] = "The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or begin with a number followed by \"-\"";
-$lang['The thumbnail image quality must be a number between %d and %d'] = 'The thumbnail image quality must be a number between %d and %d';
-$lang['The thumbnail maximum height must be a number between %d and %d'] = 'The thumbnail maximum height must be a number between %d and %d';
-$lang['The thumbnail maximum width must be a number between %d and %d'] = 'The thumbnail maximum width must be a number between %d and %d';
 $lang['The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'] = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form';
 $lang['The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB'] = 'The uploaded file exceeds the upload_max_filesize directive in php.ini: %sB';
 $lang['The uploaded file was only partially uploaded'] = 'The uploaded file was only partially uploaded';
@@ -719,9 +715,6 @@ $lang['The uploaded files exceed the post_max_size directive in php.ini: %sB'] =
 $lang['The version of %s [%s] installed is not compatible with the version required [%s]'] = "The version of %s [%s] installed is not compatible with the version required [%s]";
 $lang['The webmaster has subscribed you to receiving notifications by mail.'] = "The webmaster has subscribed you to be notified by mail.";
 $lang['The webmaster has unsubscribed you from receiving notifications by mail.'] = "The webmaster has unsubscribed you from receiving notifications by mail.";
-$lang['The websize image quality must be a number between %d and %d'] = 'The websize image quality must be a number between %d and %d';
-$lang['The websize maximum height must be a number between %d and %d'] = 'The websize maximum height must be a number between %d and %d';
-$lang['The websize maximum width must be a number between %d and %d'] = 'The websize maximum width must be a number between %d and %d';
 $lang['The whole page'] = 'The whole page';
 $lang['The whole set'] = 'The whole set';
 $lang['the wiki'] = "the wiki";
@@ -814,7 +807,6 @@ $lang['Visit theme site'] = 'Visit theme site';
 $lang['Waiting'] = "Pending";
 $lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'WARNING! This plugin does not seem to be compatible with this version of Piwigo.';
 $lang['Warning: subscribing or unsubscribing will send mails to users'] = "Warning: subscribing or unsubscribing will send mails to users";
-$lang['Web size photo'] = 'Web size photo';
 $lang['Webmaster cannot be deleted'] = "Webmaster cannot be deleted";
 $lang['Webmaster status is required.'] = 'Webmaster status is required.';
 $lang['Week starts on'] = 'Week starts on';
@@ -847,5 +839,7 @@ $lang['Your configuration settings are saved'] = 'Your configuration settings ar
 $lang['Zoom'] = 'Zoom';
 $lang['[%s] Visit album %s'] = "[%s] Visit album %s";
 $lang['[NBM] Problems or questions'] = "[NBM] Problems or questions";
-
+$lang['Resize after upload'] = 'Resize after upload';
+$lang['Photo Sizes'] = 'Photo Sizes';
+$lang['Original Size'] = 'Original Size';
 ?>
\ No newline at end of file