- Category upload admin control panel

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

2 files changed, 87 insertions, 87 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 534161f24..02dc4d9a0 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -39,6 +39,8 @@ $lang['permissions'] = 'Permissions';
 $lang['update'] = 'Synchronize';
 $lang['storage'] = 'Directory';
 $lang['edit'] = 'Edit';
+$lang['authorized'] = 'Authorized';
+$lang['forbidden'] = 'Forbidden';
 
 // Specific words
 $lang['phpinfos'] = 'PHP Information';
@@ -54,6 +56,14 @@ $lang['cat_virtual'] = 'Virtual category';
 $lang['cat_public'] = 'Public category';
 $lang['cat_private'] = 'Private category';
 $lang['cat_image_info'] = 'Images info';
+$lang['editcat_status'] = 'Status';
+$lang['editcat_confirm'] = 'Category informations updated successfully.';
+$lang['editcat_perm'] = 'To set permissions for this category, click';
+$lang['cat_upload'] = 'Select uploadable categories';
+$lang['cat_upload_info'] = 'Only non virtual categories are shown.';
+$lang['cat_lock'] = 'Lock';
+$lang['cat_lock_info'] = 'This category will temporary been disabled for maintenance.';
+$lang['cat_access_info'] = 'Permission management.';
 
 // Titles
 $lang['admin_panel'] = 'Administration Panel';
@@ -71,9 +81,6 @@ $lang['title_thumbnails_2'] = 'for';
 $lang['title_default'] = 'PhpWebGallery administration';
 $lang['title_waiting'] = 'Pictures waiting for validation';
 
-$lang['menu_add_user'] = 'add';
-$lang['menu_list_user'] = 'list';
-
 //Error messages
 $lang['conf_err_prefixe'] = 'thumbnail\'s prefix mustn\'t contain any accentued character';
 $lang['conf_err_mail'] = 'e-mail address refused, it must be like name@server.com';
@@ -82,6 +89,72 @@ $lang['conf_err_sid_time'] = 'the session time must be an integer value between
 $lang['conf_err_max_user_listbox'] = 'the max user listbox number must be an integer value between 0 and 255';
 $lang['cat_error_name'] = 'The name of a category mustn\'t be empty';
 
+//Configuration
+$lang['conf_confirmation'] = 'Information data registered in database';
+$lang['conf_general_title'] = 'Main configuration';
+$lang['conf_general_webmaster'] = 'Webmaster login';
+$lang['conf_general_webmaster_info'] = 'It will be shown to the visitors. It is necessary for website administration';
+$lang['conf_general_mail'] = 'Webmaster mail adress';
+$lang['conf_general_mail_info'] = 'Visitors will be able to contact by this mail';
+$lang['conf_general_prefix'] = 'Thumbnail prefix';
+$lang['conf_general_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
+$lang['conf_general_access'] = 'Access type';
+$lang['conf_general_access_1'] = 'Free';
+$lang['conf_general_access_2'] = 'Restricted';
+$lang['conf_general_access_info'] = '- free : anyone can enter the site, any visitor can create an account in order to customize the appareance of the website<br />- restricted : the webmaster create accounts. Only registered users can enter the site';
+$lang['conf_comments'] = 'Users comments';
+$lang['conf_comments_title'] = 'Configuration of users comments';
+$lang['conf_comments_show_comments'] = $lang['conf_comments'];
+$lang['conf_comments_show_comments_info'] = 'display the users comments under each picture ?';
+$lang['conf_comments_comments_number'] = 'Number of comments per page';
+$lang['conf_comments_comments_number_info'] = 'number of comments to display on each page. This number is unlimited for a picture. Enter a number between 5 and 50.';
+$lang['conf_err_comment_number'] = 'The number of comments a page must be between 5 and 50 included.';
+$lang['conf_remote_site_delete_info'] = 'Deleting a remote server will delete all the image and the categories in relation with this server.';
+$lang['conf_upload_title'] = 'Configuration of the users upload';
+$lang['conf_upload_available'] = 'authorized the upload of pictures';
+$lang['conf_upload_maxfilesize'] = 'maximum filesize';
+$lang['conf_upload_maxfilesize_info'] = 'Maximum filesize for the uploaded pictures. Must be a number between 10 and 1000 KB.';
+$lang['conf_err_upload_maxfilesize'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
+$lang['conf_upload_maxwidth'] = 'maximum width';
+$lang['conf_upload_maxwidth_info'] = 'Maximum width authorized for the uploaded images. Must be a number superior to 10 pixels';
+$lang['conf_err_upload_maxwidth'] = 'maximum width authorized for the uploaded images must be a number superior to 10 pixels.';
+$lang['conf_upload_maxheight'] = 'maximum height';
+$lang['conf_upload_maxheight_info'] = 'Maximum height authorized for the uploaded images. Must be a number superior to 10 pixels';
+$lang['conf_err_upload_maxwidth'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
+$lang['conf_upload_maxwidth_thumbnail'] = 'thumbnails maximum width';
+$lang['conf_upload_maxwidth_thumbnail_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
+$lang['conf_err_upload_maxwidth_thumbnail'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
+$lang['conf_upload_maxheight_thumbnail'] = 'thumbnails maximum height';
+$lang['conf_upload_maxheight_thumbnail_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
+$lang['conf_err_upload_maxheight_thumbnail'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
+$lang['conf_default_title'] = 'Default display properties for unregistered visitors and new accounts';
+$lang['conf_default_language_info'] = 'Default language';
+$lang['conf_default_theme_info'] = 'Default theme';
+$lang['conf_session_title'] = 'Sessions configuration';
+$lang['conf_session_size'] = 'identifier size';
+$lang['conf_session_size_info'] = '- the longer your identifier is, the more secure your site is<br />- enter a number between 4 and 50';
+$lang['conf_session_time'] = 'validity period';
+$lang['conf_session_time_info'] = '- the shorter the validity period is, the more secure your site is<br />- enter a number between 5 and 60, in minutes';
+$lang['conf_session_key'] = 'keyword';
+$lang['conf_session_key_info'] = '- the session keyword improve the encoding of the session identifier<br />- enter any sentence shorter than 255 caracters';
+$lang['conf_general_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
+$lang['conf_general_mail_notification'] = 'Mail notification';
+$lang['conf_general_mail_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
+$lang['conf_comments_validation'] = 'validation';
+$lang['conf_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
+$lang['conf_comments_forall'] = 'for all ?';
+$lang['conf_comments_forall_info'] = 'Even guest not registered can post comments';
+$lang['conf_default_nb_image_per_row_info'] = 'number of pictures for each row by default';
+$lang['conf_default_nb_row_per_page_info'] = 'number of rows by page by default';
+$lang['conf_default_short_period_info'] = 'By days. Period within a picture is shown with a red mark. The short period must be superior to 1 day.';
+$lang['conf_default_long_period_info'] = 'By days. Period within a picture is shown with a green mark. The long period must be superior to the short period.';
+$lang['conf_default_expand_info'] = 'expand all categories by default in the menu ?';
+$lang['conf_default_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
+$lang['conf_default_maxwidth_info'] = 'Maximum width for display pictures : picture will have a new width only for display, picture files won\'t be changed. Let empty if you don\'t wish to have a limit.';
+$lang['conf_default_maxheight_info'] = 'Just as the maximum width, but for the height';
+$lang['conf_session_cookie'] = 'Authorize cookies';
+$lang['conf_session_cookie_info'] = 'users won\'t have to log on each visit any more. Less secure.';
+
 //FAQ
 $lang['help_images_title'] = 'Adding pictures';
 $lang['help_images_intro'] = 'How to place pictures in your directories';
@@ -136,55 +209,8 @@ if (isset($conf))
 
 
 
-$lang['conf_confirmation'] = 'Information data registered in database';
-$lang['conf_general_title'] = 'Main configuration';
-$lang['conf_general_webmaster'] = 'Webmaster login';
-$lang['conf_general_webmaster_info'] = 'It will be shown to the visitors. It is necessary for website administration';
-$lang['conf_general_mail'] = 'Webmaster mail adress';
-$lang['conf_general_mail_info'] = 'Visitors will be able to contact by this mail';
-$lang['conf_general_prefix'] = 'Thumbnail prefix';
-$lang['conf_general_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
-$lang['conf_general_access'] = 'Access type';
-$lang['conf_general_access_1'] = 'Free';
-$lang['conf_general_access_2'] = 'Restricted';
-$lang['conf_general_access_info'] = '- free : anyone can enter the site, any visitor can create an account in order to customize the appareance of the website<br />- restricted : the webmaster create accounts. Only registered users can enter the site';
-$lang['conf_comments'] = 'Users comments';
-$lang['conf_comments_title'] = 'Configuration of users comments';
-$lang['conf_comments_show_comments'] = $lang['conf_comments'];
-$lang['conf_comments_show_comments_info'] = 'display the users comments under each picture ?';
-$lang['conf_comments_comments_number'] = 'Number of comments per page';
-$lang['conf_comments_comments_number_info'] = 'number of comments to display on each page. This number is unlimited for a picture. Enter a number between 5 and 50.';
-$lang['conf_err_comment_number'] = 'The number of comments a page must be between 5 and 50 included.';
-$lang['conf_remote_site_delete_info'] = 'Deleting a remote server will delete all the image and the categories in relation with this server.';
-$lang['conf_upload_title'] = 'Configuration of the users upload';
-$lang['conf_upload_available'] = 'authorized the upload of pictures';
-$lang['conf_upload_maxfilesize'] = 'maximum filesize';
-$lang['conf_upload_maxfilesize_info'] = 'Maximum filesize for the uploaded pictures. Must be a number between 10 and 1000 KB.';
-$lang['conf_err_upload_maxfilesize'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
-$lang['conf_upload_maxwidth'] = 'maximum width';
-$lang['conf_upload_maxwidth_info'] = 'Maximum width authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_err_upload_maxwidth'] = 'maximum width authorized for the uploaded images must be a number superior to 10 pixels.';
-$lang['conf_upload_maxheight'] = 'maximum height';
-$lang['conf_upload_maxheight_info'] = 'Maximum height authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_err_upload_maxwidth'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
-$lang['conf_upload_maxwidth_thumbnail'] = 'thumbnails maximum width';
-$lang['conf_upload_maxwidth_thumbnail_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_err_upload_maxwidth_thumbnail'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
-$lang['conf_upload_maxheight_thumbnail'] = 'thumbnails maximum height';
-$lang['conf_upload_maxheight_thumbnail_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_err_upload_maxheight_thumbnail'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
-$lang['conf_default_title'] = 'Default display properties for unregistered visitors and new accounts';
-$lang['conf_default_language_info'] = 'Default language';
-$lang['conf_default_theme_info'] = 'Default theme';
-$lang['conf_session_title'] = 'Sessions configuration';
-$lang['conf_session_size'] = 'identifier size';
-$lang['conf_session_size_info'] = '- the longer your identifier is, the more secure your site is<br />- enter a number between 4 and 50';
-$lang['conf_session_time'] = 'validity period';
-$lang['conf_session_time_info'] = '- the shorter the validity period is, the more secure your site is<br />- enter a number between 5 and 60, in minutes';
-$lang['conf_session_key'] = 'keyword';
-$lang['conf_session_key_info'] = '- the session keyword improve the encoding of the session identifier<br />- enter any sentence shorter than 255 caracters';
-$lang['conf_session_delete'] = 'delete out-of-date sessions';
-$lang['conf_session_delete_info'] = 'it is recommanded to empty the database table of session, because out-of-date sessions remains in the database (but it doesn\'t make any security trouble)';
+$lang['menu_add_user'] = 'add';
+$lang['menu_list_user'] = 'list';
 $lang['user_err_modify'] = 'This user can\'t be modified or deleted';
 $lang['user_err_unknown'] = 'This user doesn\'t exist in the database';
 $lang['adduser_info_message'] = 'Informations registered in the database for user ';
@@ -198,8 +224,7 @@ $lang['adduser_status_guest'] = 'guest';
 $lang['permuser_info_message'] = 'Permissions registered';
 $lang['permuser_title'] = 'Restrictions for user';
 $lang['permuser_warning'] = 'Warning : a "<span style="font-weight:bold;">forbidden access</span>" to the root of a category prevent from accessing the whole category';
-$lang['permuser_authorized'] = 'authorized';
-$lang['permuser_forbidden'] = 'forbidden';
+
 $lang['permuser_parent_forbidden'] = 'parent category forbidden';
 $lang['listuser_confirm'] = 'Do you really want to delete this user';
 $lang['listuser_info_deletion'] = 'was removed from database';
@@ -215,11 +240,8 @@ $lang['listuser_button_invert'] = 'invert';
 $lang['listuser_button_create_address'] = 'create mail address';
 
 
-$lang['editcat_confirm'] = 'Information registered in the database';
-$lang['editcat_title1'] = 'Options for the';
-$lang['editcat_name'] = 'Name';
-$lang['editcat_comment'] = 'Comment';
-$lang['editcat_status'] = 'Status';
+
+
 $lang['infoimage_general'] = 'General options for the category';
 $lang['infoimage_useforall'] = 'use for all pictures ?';
 $lang['infoimage_creation_date'] = 'creation date';
@@ -276,23 +298,6 @@ $lang['title_user_perm'] = 'Modify permission for user';
 $lang['title_cat_perm'] = 'Modify permissions for category';
 $lang['title_group_perm'] = 'Modify permissions for group';
 $lang['title_picmod'] = 'Modify informations about a picture';
-$lang['conf_general_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
-$lang['conf_general_mail_notification'] = 'Mail notification';
-$lang['conf_general_mail_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
-$lang['conf_comments_validation'] = 'validation';
-$lang['conf_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
-$lang['conf_comments_forall'] = 'for all ?';
-$lang['conf_comments_forall_info'] = 'Even guest not registered can post comments';
-$lang['conf_default_nb_image_per_row_info'] = 'number of pictures for each row by default';
-$lang['conf_default_nb_row_per_page_info'] = 'number of rows by page by default';
-$lang['conf_default_short_period_info'] = 'By days. Period within a picture is shown with a red mark. The short period must be superior to 1 day.';
-$lang['conf_default_long_period_info'] = 'By days. Period within a picture is shown with a green mark. The long period must be superior to the short period.';
-$lang['conf_default_expand_info'] = 'expand all categories by default in the menu ?';
-$lang['conf_default_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
-$lang['conf_default_maxwidth_info'] = 'Maximum width for display pictures : picture will have a new width only for display, picture files won\'t be changed. Let empty if you don\'t wish to have a limit.';
-$lang['conf_default_maxheight_info'] = 'Just as the maximum width, but for the height';
-$lang['conf_session_cookie'] = 'authorize cookies';
-$lang['conf_session_cookie_info'] = 'users won\'t have to log on each visit any more. Less secure.';
 $lang['adduser_associate'] = 'Associate to group';
 $lang['group_add'] = 'Add a group';
 $lang['group_add_error1'] = 'The name of a group must not contain " or \'';
@@ -300,11 +305,6 @@ $lang['group_add_error2'] = 'This name is already used by another group';
 $lang['group_confirm'] = 'Are you sure you want to remove this group ?';
 $lang['group_list_title'] = 'List of existing groups';
 $lang['group_err_unknown'] = 'This group doesn\'t exist in the database';
-$lang['cat_first'] = 'Move first';
-$lang['cat_last'] = 'Move last';
-$lang['editcat_visible_info'] = '(invisible but for administrators)';
-$lang['editcat_visible'] = 'Visible';
-$lang['editcat_uploadable'] = 'Upload available';
 $lang['infoimage_keyword_separation'] = '(separate with coma ",")';
 $lang['infoimage_addtoall'] = 'add to all';
 $lang['infoimage_removefromall'] = 'remove from all';
@@ -320,7 +320,6 @@ $lang['comments_non_validated_title'] = 'Comments waiting for validation';
 $lang['step1_err_copy'] = 'Copy the text between hyphens and paste it into the file "include/mysql.inc.php"(Warning : mysql.inc.php must only contain what is in blue, no line return or space character)';
 $lang['permuser_only_private'] = 'Only private categories are shown';
 $lang['waiting_update'] = 'Validated pictures will be displayed only once pictures database updated';
-$lang['conf_upload_available_info'] = 'Authorizing the upload of pictures by users on the categories of the website (not on a remote server). This is general parameter, it is needed to authorize upload category by category, by default, no category is "uploadable".';
 $lang['cat_unknown_id'] = 'This category is unknown in the database';
 $lang['install_warning'] = 'The file "install.php" is still present. Please remove it from your server. It is not secure to keep it.';
 
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 3c6b38042..95ea17b51 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -40,7 +40,6 @@ $lang['categories'] = 'Categories';
 $lang['thumbnail'] = 'Thumbnail';
 $lang['thumbnails'] = 'Thumbnails';
 $lang['search'] = 'Search';
-$lang['submit'] = 'Submit';
 $lang['comment'] = 'Comment';
 $lang['comments'] = 'Comments';
 $lang['picture'] = 'Picture';
@@ -48,6 +47,12 @@ $lang['pictures'] = 'Pictures';
 $lang['no'] = 'No';
 $lang['yes'] = 'Yes';
 $lang['date'] = 'Date';
+$lang['description'] = 'Description';
+
+// Form words 
+$lang['submit'] = 'Submit';
+$lang['delete'] = 'Delete';
+$lang['reset'] = 'Reset';
 
 // Identification
 $lang['login'] = 'Login';
@@ -55,7 +60,6 @@ $lang['logout'] = 'Logout';
 $lang['password'] = 'Password';
 $lang['customize'] = 'Customize';
 $lang['new'] = 'New';
-$lang['delete'] = 'Delete';
 $lang['identification'] = 'Identification';
 
 //Calendar
@@ -111,7 +115,6 @@ $lang['total'] = 'images';
 $lang['upload_picture'] = 'Upload a picture';
 $lang['registration_date'] = 'registered on';
 $lang['creation_date'] = 'created on';
-$lang['comment'] = 'comment';
 $lang['author'] = 'author';
 $lang['size'] = 'size';
 $lang['filesize'] = 'filesize';
@@ -185,8 +188,6 @@ $lang['upload_advise_filetype'] = 'the picture must be to the fileformat jpg, gi
 $lang['upload_err_username'] = 'the username must be given';
 $lang['upload_username'] = 'Username';
 $lang['upload_successful'] = 'Picture uploaded with success, an administrator will validate it as soon as possible';
-// new or modified in release 1.3
-$lang['charset'] = 'iso-8859-1';
 
 $lang['guest'] = 'guest';
 $lang['mail_address'] = 'mail address';