- dispatch of configuration

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

2 files changed, 90 insertions, 123 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index b5081e11b..3468be092 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -41,6 +41,9 @@ $lang['storage'] = 'Directory';
 $lang['edit'] = 'Edit';
 $lang['authorized'] = 'Authorized';
 $lang['forbidden'] = 'Forbidden';
+$lang['free'] = 'Free';
+$lang['restricted'] = 'Restricted';
+$lang['metadata']='Metadata';
 
 // Specific words
 $lang['phpinfos'] = 'PHP Information';
@@ -107,124 +110,86 @@ $lang['cat_error_name'] = 'The name of a category mustn\'t be empty';
 
 //Configuration
 $lang['conf_confirmation'] = 'Information data registered in database';
+$lang['conf_default'] = 'Default display';
+$lang['conf_cookie'] = 'Session & Cookie';
 
 // Configuration -> general
-$lang['conf_general_title'] = 'Main';
-
-$lang['conf_general_mail_webmaster'] = 'Webmaster mail adress';
-$lang['conf_general_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
-$lang['conf_general_mail_webmaster_error'] = 'e-mail address refused, it must be like name@server.com';
-
-$lang['conf_general_prefix_thumbnail'] = 'Thumbnail prefix';
-$lang['conf_general_prefix_thumbnail_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
-$lang['conf_general_prefix_thumbnail_error'] = 'thumbnail\'s prefix must only contain characters among : a to z (case insensitive), "-" or "_"';
-
-$lang['conf_general_access'] = 'Access type';
-$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_general_access_1'] = 'Free';
-$lang['conf_general_access_2'] = 'Restricted';
-
-$lang['conf_general_log'] = $lang['history'];
-$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_general_title'] = 'Main configuration';
+$lang['conf_mail_webmaster'] = 'Webmaster mail adress';
+$lang['conf_mail_webmaster_info'] = 'Visitors will be able to contact site administrator with this mail';
+$lang['conf_mail_webmaster_error'] = 'e-mail address refused, it must be like name@domain.com';
+$lang['conf_prefix'] = 'Thumbnail prefix';
+$lang['conf_prefix_info'] = 'Thumbnails use this prefix. Do not fill if your not sure.';
+$lang['conf_prefix_error'] = 'Thumbnail\'s prefix must only contain characters among : a to z (case insensitive), "-" or "_"';
+$lang['conf_access'] = 'Access type';
+$lang['conf_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_log_info'] = 'Keep an history of visits on your website ? Visits will be shown in the history section of the administration panel';
+$lang['conf_notification'] = 'Mail notification';
+$lang['conf_notification_info'] = 'Automated mail notification for adminsitrators (and only for them) when a user add a comment or upload a picture.';
 
 // Configuration -> comments
 $lang['conf_comments_title'] = 'Users comments';
-
-$lang['conf_comments_show_comments'] = 'Show users comments';
-$lang['conf_comments_show_comments_info'] = 'display the users comments under each picture ?';
-
-$lang['conf_comments_nb_comment_page'] = 'Number of comments per page';
-$lang['conf_comments_nb_comment_page_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_comments_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
-
-$lang['conf_comments_comments_validation'] = 'validation';
-$lang['conf_comments_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
-
-$lang['conf_comments_comments_forall'] = 'for all ?';
-$lang['conf_comments_comments_forall_info'] = 'Even guest not registered can post comments';
-
-// Configuration -> upload
-$lang['conf_upload_title'] = 'Users upload';
-
-$lang['conf_upload_upload_available'] = 'authorized the upload of pictures';
-$lang['conf_upload_upload_available_info'] = '';
-
-$lang['conf_upload_upload_maxfilesize'] = 'maximum filesize';
-$lang['conf_upload_upload_maxfilesize_info'] = 'Maximum filesize for the uploaded pictures. Must be a number between 10 and 1000 KB.';
-$lang['conf_upload_upload_maxfilesize_error'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
-
-$lang['conf_upload_upload_maxwidth'] = 'maximum width';
-$lang['conf_upload_upload_maxwidth_info'] = 'Maximum width authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxwidth_error'] = 'maximum width authorized for the uploaded images must be a number superior to 10 pixels.';
-
-$lang['conf_upload_upload_maxheight'] = 'maximum height';
-$lang['conf_upload_upload_maxheight_info'] = 'Maximum height authorized for the uploaded images. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxheight_error'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
-
-$lang['conf_upload_upload_maxwidth_thumbnail'] = 'thumbnails maximum width';
-$lang['conf_upload_upload_maxwidth_thumbnail_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxwidth_thumbnail_error'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
-
-$lang['conf_upload_upload_maxheight_thumbnail'] = 'thumbnails maximum height';
-$lang['conf_upload_upload_maxheight_thumbnail_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
-$lang['conf_upload_upload_maxheight_thumbnail_error'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
+$lang['conf_show_comments'] = 'Show users comments';
+$lang['conf_show_comments_info'] = 'Display the users comments under each picture ?';
+$lang['conf_comments_forall'] = 'Comments for all ?';
+$lang['conf_comments_forall_info'] = 'Even guest not registered can post comments';
+$lang['conf_nb_comment_page'] = 'Number of comments per page';
+$lang['conf_nb_comment_page_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_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';
+$lang['conf_comments_validation'] = 'Validation';
+$lang['conf_comments_validation_info'] = 'An administrator validate users posted comments before the becom visible on the site';
 
 // Configuration -> default
 $lang['conf_default_title'] = 'Default display';
+$lang['conf_default_language_info'] = 'Default language';
+$lang['conf_default_theme_info'] = 'Default theme';
+$lang['conf_nb_image_line_info'] = 'Number of pictures for each row by default';
+$lang['conf_nb_line_page_info'] = 'Number of rows by page by default';
+$lang['conf_recent_period_info'] = 'By days. Period within a picture is shown as new. Must be superior to 1 day.';
+$lang['conf_default_expand_info'] = 'Expand all categories by default in the menu ?';
+$lang['conf_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
 
-$lang['conf_default_default_language'] = $lang['customize_language'];
-$lang['conf_default_default_language_info'] = 'Default language';
-
-$lang['conf_default_default_template'] = $lang['customize_theme'];
-$lang['conf_default_default_template_info'] = 'Default theme';
-
-$lang['conf_default_nb_image_line'] = $lang['customize_nb_image_per_row'];
-$lang['conf_default_nb_image_line_info'] = 'number of pictures for each row by default';
-
-$lang['conf_default_nb_line_page'] = $lang['customize_nb_row_per_page'];
-$lang['conf_default_nb_line_page_info'] = 'number of rows by page by default';
-
-$lang['conf_default_recent_period'] = $lang['customize_recent_period'];
-$lang['conf_default_recent_period_info'] = 'By days. Period within a picture is shown as new. Must be superior to 1 day.';
-$lang['conf_default_recent_period_error'] = 'The recent period must be an integer value, superior to 1.';
-
-$lang['conf_default_auto_expand'] = $lang['customize_expand'];
-$lang['conf_default_auto_expand_info'] = 'expand all categories by default in the menu ?';
-
-$lang['conf_default_show_nb_comments'] = $lang['customize_show_nb_comments'];
-$lang['conf_default_show_nb_comments_info'] = 'show the number of comments for each picture on the thumbnails page';
+// Configuration -> upload
+$lang['conf_upload_title'] = 'Users upload';
+$lang['conf_authorize_upload'] = 'Authorize upload of pictures';
+$lang['conf_authorize_upload_info'] = '';
+$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_upload_maxfilesize_error'] = '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_upload_maxwidth_error'] = '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_upload_maxheight_error'] = 'maximum height authorized for the uploaded images must be a number superior to 10 pixels.';
+$lang['conf_upload_tn_maxwidth'] = 'thumbnails maximum width';
+$lang['conf_upload_tn_maxwidth_info'] = 'Maximum width authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
+$lang['conf_upload_maxwidth_thumbnail_error'] = 'Maximum width authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
+$lang['conf_upload_tn_maxheight'] = 'Thumbnails maximum height';
+$lang['conf_upload_tn_maxheight_info'] = 'Maximum height authorized for the uploaded thumbnails. Must be a number superior to 10 pixels';
+$lang['conf_upload_maxheight_thumbnail_error'] = 'Maximum height authorized for the uploaded thumbnails must be a number superior to 10 pixels.';
 
 // Configuration -> session
 $lang['conf_session_title'] = 'Sessions';
-
-$lang['conf_session_session_id_size'] = 'identifier size';
-$lang['conf_session_session_id_size_info'] = '- the longer your identifier is, the more secure your site is<br />- enter a number between 4 and 50';
-$lang['conf_session_session_id_size_error'] = 'the session identifier size must be an integer value between 4 and 50';
-
-$lang['conf_session_session_time'] = 'validity period';
-$lang['conf_session_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_session_time_error'] = 'the session time must be an integer value between 5 and 60';
-
-$lang['conf_session_authorize_cookies'] = 'Authorize cookies';
-$lang['conf_session_authorize_cookies_info'] = 'users won\'t have to log on each visit any more. Less secure.';
+$lang['conf_cookies'] = 'Authorize cookies';
+$lang['conf_cookies_info'] = 'Users won\'t have to log on each visit any more. Less secure.';
+$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_size_error'] = 'the session identifier size must be an integer value 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_time_error'] = 'the session time must be an integer value between 5 and 60';
 
 // Configuration -> metadata
 $lang['conf_metadata_title'] = 'Metadata';
-
-$lang['conf_metadata_use_exif'] = 'Use EXIF';
-$lang['conf_metadata_use_exif_info'] = 'Use EXIF data during metadata synchronization into PhpWebGallery database';
-
-$lang['conf_metadata_use_iptc'] = 'Use IPTC';
-$lang['conf_metadata_use_iptc_info'] = 'Use IPTC data during metadata synchronization into PhpWebGallery database';
-
-$lang['conf_metadata_show_exif'] = 'Show EXIF';
-$lang['conf_metadata_show_exif_info'] = 'Give the possibility to show EXIF metadata on visualisation page. See include/config.inc.php for available EXIF fields';
-
-$lang['conf_metadata_show_iptc'] = 'Show IPTC';
-$lang['conf_metadata_show_iptc_info'] = 'Give the possibility to show IPTC metadata on visualisation page. See include/config.inc.php for available IPTC fields';
+$lang['conf_use_exif'] = 'Use EXIF';
+$lang['conf_use_exif_info'] = 'Use EXIF data during metadata synchronization into PhpWebGallery database';
+$lang['conf_use_iptc'] = 'Use IPTC';
+$lang['conf_use_iptc_info'] = 'Use IPTC data during metadata synchronization into PhpWebGallery database';
+$lang['conf_show_exif'] = 'Show EXIF';
+$lang['conf_show_exif_info'] = 'Give the possibility to show EXIF metadata on visualisation page. See include/config.inc.php for available EXIF fields';
+$lang['conf_show_iptc'] = 'Show IPTC';
+$lang['conf_show_iptc_info'] = 'Give the possibility to show IPTC metadata on visualisation page. See include/config.inc.php for available IPTC fields';
 
 // Configuration -> remote
 $lang['conf_remote_site_delete_info'] = 'Deleting a remote server will delete all the image and the categories in relation with this server.';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index b4f0178b6..24e636d4f 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -55,6 +55,7 @@ $lang['keywords'] = 'Keywords';
 $lang['default'] = 'Default';
 $lang['send_mail'] = 'Contact';
 $lang['webmaster'] = 'Webmaster';
+$lang['language']='Language';
 
 //Properties
 $lang['registration_date'] = 'Registered on';
@@ -65,6 +66,9 @@ $lang['submit'] = 'Submit';
 $lang['delete'] = 'Delete';
 $lang['reset'] = 'Reset';
 
+// Navigation
+$lang['return_main_page'] = 'Back to the index page';
+
 // Identification
 $lang['login'] = 'Login';
 $lang['logout'] = 'Logout';
@@ -97,6 +101,23 @@ $lang['day'][4] = 'Thursday';
 $lang['day'][5] = 'Friday';
 $lang['day'][6] = 'Saturday';
 
+// Customization
+$lang['customize_page_title'] = 'Customization';
+$lang['customize_title'] = 'Customization';
+$lang['nb_image_per_row'] = 'Number of images per row';
+$lang['nb_row_per_page'] = 'Number of rows per page';
+$lang['maxwidth'] = 'Maximum width of the pictures';
+$lang['maxheight'] = 'Maximum height of the pictures';
+$lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
+$lang['maxheight_error'] = 'Maximum height must be a number superior to 50';
+$lang['theme'] = 'Interface theme';
+$lang['auto_expand'] = 'Expand all categories';
+$lang['show_nb_comments'] = 'Show number of comments';
+$lang['recent_period'] = 'Recent period';
+$lang['periods_error'] = 'Recent period must be a positive integer value';
+$lang['create_cookie'] = 'Create a cookie';
+
+
 // search
 $lang['search_title'] = 'Search';
 $lang['search_wrong_date'] = ' : this date is not valid';
@@ -169,15 +190,7 @@ $lang['ident_title'] = 'Identification';
 $lang['ident_register'] = 'Register';
 $lang['ident_forgotten_password'] = 'Forget your password ?';
 $lang['ident_guest_visit'] = 'Go through the gallery as a visitor';
-$lang['customize_page_title'] = 'Customization';
-$lang['customize_title'] = 'Customization';
-$lang['customize_nb_image_per_row'] = 'number of images per row';
-$lang['customize_nb_row_per_page'] = 'number of rows per page';
-$lang['customize_language'] = 'language';
-$lang['maxwidth'] = 'maximum width of the pictures';
-$lang['maxheight'] = 'maximum height of the pictures';
-$lang['err_maxwidth'] = 'maximum width must be a number superior to 50';
-$lang['err_maxheight'] = 'maximum height must be a number superior to 50';
+
 $lang['previous_image'] = 'Previous';
 $lang['next_image'] = 'Next';
 $lang['back'] = 'Click on the image to go back to the thumbnails page';
@@ -241,17 +254,6 @@ $lang['recent_cats_cat_hint'] = 'Displays recently updated categories';
 $lang['recent_cats_cat'] = 'Last categories';
 $lang['visited'] = 'visited';
 $lang['times'] = 'times';
-$lang['customize_theme'] = 'interface theme';
-$lang['customize_expand'] = 'expand all categories';
-$lang['customize_show_nb_comments'] = 'show number of comments';
-$lang['customize_recent_period'] = 'recent period';
-$lang['customize_template'] = 'template';
-$lang['err_periods'] = 'recent period must be a positive integer value';
-$lang['create_cookie'] = 'create a cookie';
-$lang['customize_day'] = 'day';
-$lang['customize_week'] = 'week';
-$lang['customize_month'] = 'month';
-$lang['customize_year'] = 'year';
 $lang['slideshow'] = 'slideshow';
 $lang['period_seconds'] = 'seconds per picture';
 $lang['slideshow_stop'] = 'stop the slideshow';