- bug 654: sql error on user comment (since my commit 1849)

- languages: english corrections + keep lang files sorted by key
- admin multi view correction: language was not always properly changed
- refactor function get_computed_categories (with rub's blessing)

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

1 files changed, 6 insertions, 7 deletions

diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 4b70ce8ca..dafd1c82d 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -489,12 +489,10 @@ $lang['maxheight'] = 'Maximum height of the pictures';
 $lang['maxheight_error'] = 'Maximum height must be a number superior to 50';
 $lang['maxwidth'] = 'Maximum width of the pictures';
 $lang['maxwidth_error'] = 'Maximum width must be a number superior to 50';
-$lang['flat_hint'] = 'flat display elements of categories and sub-categories';
-$lang['start_filter_hint'] = 'displays only recent elements';
-$lang['stop_filter_hint'] = 'return to display all elements';
 $lang['mode_created_hint'] = 'displays a calendar by creation date';
+$lang['mode_flat_hint'] = 'displays all elements in all sub-categories';
 $lang['mode_normal_hint'] = 'return to normal view mode';
-$lang['mode_posted_hint'] = 'displays a calendar by date posted';
+$lang['mode_posted_hint'] = 'displays a calendar by posted date';
 $lang['month'][10] = 'October';
 $lang['month'][11] = 'November';
 $lang['month'][12] = 'December';
@@ -520,6 +518,8 @@ $lang['next_page'] = 'Next';
 $lang['no'] = 'No';
 $lang['no_category'] = 'Home';
 $lang['no_rate'] = 'no rate';
+$lang['note_filter_day'] = 'Only displays elements posted within the last %s day.';
+$lang['note_filter_days'] = 'Only displays elements posted within the last %s days.';
 $lang['password updated'] = 'password updated';
 $lang['periods_error'] = 'Recent period must be a positive integer value';
 $lang['picture'] = 'picture';
@@ -579,6 +579,8 @@ $lang['slideshow'] = 'slideshow';
 $lang['slideshow_stop'] = 'stop the slideshow';
 $lang['special_categories'] = 'Specials';
 $lang['sql_queries_in'] = 'SQL queries in';
+$lang['start_filter_hint'] = 'displays only recently posted elements';
+$lang['stop_filter_hint'] = 'return to the display of all elements';
 $lang['submit'] = 'Submit';
 $lang['the beginning'] = 'the beginning';
 $lang['theme'] = 'Interface theme';
@@ -611,8 +613,5 @@ $lang['upload_username'] = 'Username';
 $lang['useful when password forgotten'] = 'useful when password forgotten';
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
-$lang['note_filter_day'] = 'The whole of the elements are filtered in order to diplay the recent elements of less %s day.';
-$lang['note_filter_days'] = 'The whole of the elements are filtered in order to diplay the recent elements of less %s days.';
 $lang['page_end'] = 'Page bottom';
-
 ?>