replacement of short_period and long_period by recent_period

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

2 files changed, 4 insertions, 6 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 02dc4d9a0..e1de65703 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -112,6 +112,7 @@ $lang['conf_err_comment_number'] = 'The number of comments a page must be betwee
 $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_available_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_err_upload_maxfilesize'] = 'Maximum filesize for the uploaded pictures must be a number between 10 and 1000 KB.';
@@ -146,8 +147,7 @@ $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_recent_period_info'] = 'By days. Period within a picture is shown as new. The short period must be superior to 1 day.';
 $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.';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 3effbc01f..06e9d0a37 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -219,11 +219,9 @@ $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_short_period'] = 'short period';
-$lang['customize_long_period'] = 'long period';
+$lang['customize_recent_period'] = 'recent period';
 $lang['customize_template'] = 'template';
-$lang['err_periods'] = 'periods must be integer values';
-$lang['err_periods_2'] = 'periods must be superior to 0. The long period must be grater than the short period.';
+$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';