improvement: tags replace keywords. Better data model, less

limitations. Each image can be associated to as many tag as needed. Tags can
contain non ASCII characters. Oriented navigation with tags by association.


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

2 files changed, 80 insertions, 58 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 81b1aeb20..abfd89a85 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -40,6 +40,7 @@ $lang['%d waiting pictures rejected'] = '%d waiting pictures rejected';
 $lang['%d waiting pictures validated'] = '%d waiting pictures validated';
 $lang['A new version of PhpWebGallery is available.'] = 'A new version of PhpWebGallery is available.';
 $lang['Actions'] = 'Actions';
+$lang['Add a tag'] = 'Add a tag';
 $lang['Add a user'] = 'Add a user';
 $lang['Add group'] = 'Add group';
 $lang['Add selected elements to caddie'] = 'Add selected elements to caddie';
@@ -58,8 +59,10 @@ $lang['Check for upgrade'] = 'Check for upgrade';
 $lang['Comments for all'] = 'Comments for all';
 $lang['Controversy'] = 'Controversy';
 $lang['Creation date'] = 'Creation date';
+$lang['Current name'] = 'Current name';
 $lang['Database'] = 'Database';
 $lang['Delete Representant'] = 'Delete Representant';
+$lang['Delete selected tags'] = 'Delete selected tags';
 $lang['Delete selected users'] = 'Delete selected users';
 $lang['Deletions'] = 'Deletions';
 $lang['Deny selected groups'] = 'Deny selected groups';
@@ -69,6 +72,8 @@ $lang['Display options'] = 'Display options';
 $lang['Dissociated'] = 'Dissociated';
 $lang['Does not represent'] = 'Does not represent';
 $lang['Edit all picture informations'] = 'Edit all picture informations';
+$lang['Edit selected tags'] = 'Edit selected tags';
+$lang['Edit tags'] = 'Edit tags';
 $lang['Elements'] = 'Elements';
 $lang['Empty caddie'] = 'Empty caddie';
 $lang['Environment'] = 'Environment';
@@ -91,6 +96,7 @@ $lang['Maintenance'] = 'Maintenance';
 $lang['Manage permissions for a category'] = 'Manage permissions for a category';
 $lang['Manage permissions for group "%s"'] = 'Manage permissions for group "%s"';
 $lang['Manage permissions for user "%s"'] = 'Manage permissions for user "%s"';
+$lang['Manage tags'] = 'Manage tags';
 $lang['Maximum height of the pictures'] = 'Maximum height of the pictures';
 $lang['Maximum width of the pictures'] = 'Maximum width of the pictures';
 $lang['Members'] = 'Members';
@@ -98,7 +104,9 @@ $lang['Metadata synchronized from file'] = 'Metadata synchronized from file';
 $lang['Move categories'] = 'Move categories';
 $lang['Move'] = 'Move';
 $lang['Name'] = 'Name';
+$lang['New name'] = 'New name';
 $lang['New parent category'] = 'New parent category';
+$lang['New tag'] = 'New tag';
 $lang['No'] = 'No';
 $lang['Number of comments per page'] = 'Number of comments per page';
 $lang['Number of images per row'] = 'Number of images per row';
@@ -111,6 +119,7 @@ $lang['Options'] = 'Options';
 $lang['Order alphanumerically'] = 'Order alphanumerically';
 $lang['Order by'] = 'Order by';
 $lang['Other private categories'] = 'Other private categories';
+$lang['Page banner'] = 'Page banner';
 $lang['Parent category'] = 'Parent category';
 $lang['Path'] = 'Path';
 $lang['Permission denied'] = 'Permission denied';
@@ -118,7 +127,6 @@ $lang['Permission granted thanks to a group'] = 'Permission granted thanks to a
 $lang['Permission granted'] = 'Permission granted';
 $lang['PhpWebGallery Administration'] = 'PhpWebGallery Administration';
 $lang['PhpWebGallery version'] = 'PhpWebGallery version';
-$lang['Page banner'] = 'Page banner';
 $lang['Picture informations updated'] = 'Picture informations updated';
 $lang['Position'] = 'Position';
 $lang['Preferences'] = 'Preferences';
@@ -146,6 +154,7 @@ $lang['Status'] = 'Status';
 $lang['Storage category'] = 'Storage category';
 $lang['Submit'] = 'Submit';
 $lang['Sum of rates'] = 'Sum of rates';
+$lang['Tag selection'] = 'Tag selection';
 $lang['Take selected elements out of caddie'] = 'Take selected elements out of caddie';
 $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Unable to check for upgrade since allow_url_fopen is disabled.';
 $lang['User comments validation'] = 'User comments validation';
@@ -162,12 +171,9 @@ $lang['You are running the latest version of PhpWebGallery.'] = 'You are running
 $lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category';
 $lang['You need to confirm deletion'] = 'You need to confirm deletion';
 $lang['actions'] = 'Actions';
-$lang['properties'] = 'Properties';
-$lang['is_high_enabled'] = 'High definition';
-$lang['is_high_disabled'] = '';
-$lang['enabled_high'] = 'High definition enabled';
-$lang['adviser'] = 'Adviser';
 $lang['add keywords'] = 'add keywords';
+$lang['add tags'] = 'add tags';
+$lang['adviser'] = 'Adviser';
 $lang['associate to category'] = 'associate to category';
 $lang['associate to group'] = 'associate to group';
 $lang['author'] = 'author';
@@ -208,6 +214,7 @@ $lang['editcat_uploadable'] = 'Authorize upload';
 $lang['elements per line'] = 'elements per line';
 $lang['elements per page'] = 'elements per page';
 $lang['elements'] = 'elements';
+$lang['enabled_high'] = 'High definition enabled';
 $lang['file'] = 'file';
 $lang['filesize'] = 'filesize';
 $lang['first element added on %s'] = 'first element added on %s';
@@ -224,6 +231,8 @@ $lang['group_id URL parameter is missing'] = 'group_id URL parameter is missing'
 $lang['groups'] = 'Groups';
 $lang['history'] = 'History';
 $lang['instructions'] = 'Instructions';
+$lang['is_high_disabled'] = '';
+$lang['is_high_enabled'] = 'High definition';
 $lang['jump to category'] = 'jump to category';
 $lang['jump to image'] = 'jump to image';
 $lang['jump to'] = 'jump to';
@@ -239,62 +248,62 @@ $lang['metadata_exif'] = 'EXIF';
 $lang['metadata_iptc'] = 'IPTC';
 $lang['name'] = 'name';
 $lang['nbm_break_list_user'] = 'List of users to send mail is limited to %d. Others users are not listed.';
-$lang['nbm_nbm_break_send_mail'] = 'Sent mail is limited to %d send by pass. Others mails are skipped.';
-$lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.';
-$lang['nbm_msg_n_mails_sent'] = '%d mails were sent.';
-$lang['nbm_msg_error_sending_email_to'] = 'Error when sending email to %s [%s].';
-$lang['nbm_msg_mail_sent_to'] = 'Mail sent to %s [%s].';
-$lang['nbm_object_news'] = 'New elements added';
-$lang['nbm_object_subcribe'] = 'Subcribe of notification by mail';
-$lang['nbm_object_unsubcribe'] = 'Unsubcribe of notification by mail';
+$lang['nbm_col_check_user_send_mail'] = 'To send ?';
+$lang['nbm_col_last_send'] = 'Last send';
+$lang['nbm_col_mail'] = 'email';
+$lang['nbm_col_user'] = 'User';
+$lang['nbm_complementary_mail_content'] = 'Complementary mail content';
+$lang['nbm_content_byebye'] = 'See you soon';
+$lang['nbm_content_goto'] = 'Go to %s %s.';
 $lang['nbm_content_hello'] = 'Hello %s';
-$lang['nbm_content_new_elements_between'] = 'New elements were added between %s and %s';
 $lang['nbm_content_new_elements'] = 'New elements were added on %s';
-$lang['nbm_content_goto'] = 'Go to %s %s.';
+$lang['nbm_content_new_elements_between'] = 'New elements were added between %s and %s';
 $lang['nbm_content_subscribe_by_admin'] = 'You are subcribed by webmaster for the notification by mail';
-$lang['nbm_content_unsubscribe_by_admin'] = 'You are unsubcribed by webmaster for the notification by mail';
 $lang['nbm_content_subscribe_by_himself'] = 'You are subcribed for the notification by mail';
-$lang['nbm_content_unsubscribe_by_himself'] = 'You are unsubcribed for the notification by mail';
-$lang['nbm_content_byebye'] = 'See you soon';
-$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe, click on %s .';
 $lang['nbm_content_subscribe_link'] = 'To subscribe, click on %s .';
 $lang['nbm_content_subscribe_unsubscribe_contact'] = 'On problems or questions, send a message to %s.';
+$lang['nbm_content_unsubscribe_by_admin'] = 'You are unsubcribed by webmaster for the notification by mail';
+$lang['nbm_content_unsubscribe_by_himself'] = 'You are unsubcribed for the notification by mail';
+$lang['nbm_content_unsubscribe_link'] = 'To unsubscribe, click on %s .';
+$lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
+$lang['nbm_item_notification'] = 'Notification';
+$lang['nbm_msg_error_sending_email_to'] = 'Error when sending email to %s [%s].';
+$lang['nbm_msg_mail_sent_to'] = 'Mail sent to %s [%s].';
+$lang['nbm_msg_n_mails_sent'] = '%d mails were sent.';
+$lang['nbm_msg_no_mail_to_send'] = '%d mails were not sent.';
+$lang['nbm_nbm_break_send_mail'] = 'Sent mail is limited to %d send by pass. Others mails are skipped.';
 $lang['nbm_no_mail_to_send'] = 'No mail to send.';
+$lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
+$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if the are news elements to notify';
 $lang['nbm_no_user_to send_notifications_by_mail'] = 'No user to send notifications by mail.';
-$lang['nbm_send_mail_to_users'] = 'Send mail to users';
-$lang['nbm_user_x_added'] = 'User %s [%s] added.';
-$lang['nbm_item_notification'] = 'Notification';
+$lang['nbm_object_news'] = 'New elements added';
+$lang['nbm_object_subcribe'] = 'Subcribe of notification by mail';
+$lang['nbm_object_unsubcribe'] = 'Unsubcribe of notification by mail';
 $lang['nbm_param_mode'] = 'Parameter';
-$lang['nbm_subscribe_mode'] = 'Subscribe';
-$lang['nbm_send_mode'] = 'Send';
-$lang['nbm_title_param'] = 'Parameters';
-$lang['nbm_updated_param_count'] = '%d parameters are updated.';
-$lang['nbm_send_mail_as'] = 'Send mail as';
-$lang['nbm_info_send_mail_as'] = 'With blank value, gallery title will be used';
+$lang['nbm_send_check_all'] = 'Check All';
+$lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
 $lang['nbm_send_detailed_content'] = 'Send detailed content';
-$lang['nbm_complementary_mail_content'] = 'Complementary mail content';
-$lang['nbm_title_subscribe'] = 'Subscribe/unscribe users';
-$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning, subscribe or unscribe send mails to users';
-$lang['nbm_subscribe_col'] = 'Subscribed';
-$lang['nbm_unsubscribe_col'] = 'Unsubcribed';
-$lang['nbm_no_user_available_to_send_L1'] = 'No user are available in order to send mail.';
-$lang['nbm_no_user_available_to_send_L2'] = 'A user is available, if the are news elements to notify';
-$lang['nbm_title_send'] = 'Select sendings';
-$lang['nbm_col_user'] = 'User';
-$lang['nbm_col_mail'] = 'email';
-$lang['nbm_col_last_send'] = 'Last send';
-$lang['nbm_col_check_user_send_mail'] = 'To send ?';
+$lang['nbm_send_mail_as'] = 'Send mail as';
+$lang['nbm_send_mail_to_users'] = 'Send mail to users';
+$lang['nbm_send_mode'] = 'Send';
 $lang['nbm_send_options'] = 'Options';
-$lang['nbm_send_complementary_mail_content'] = 'Complementary mail content';
 $lang['nbm_send_submit'] = 'Send';
-$lang['nbm_send_check_all'] = 'Check All';
 $lang['nbm_send_uncheck_all'] = 'Uncheck All';
-$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to subscribe list.';
+$lang['nbm_subscribe_col'] = 'Subscribed';
+$lang['nbm_subscribe_mode'] = 'Subscribe';
+$lang['nbm_title_param'] = 'Parameters';
+$lang['nbm_title_send'] = 'Select sendings';
+$lang['nbm_title_subscribe'] = 'Subscribe/unscribe users';
+$lang['nbm_unsubscribe_col'] = 'Unsubcribed';
+$lang['nbm_updated_param_count'] = '%d parameters are updated.';
+$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user(s) are not updated.';
 $lang['nbm_user_change_enabled_false'] = 'User %s [%s] removed of subscribe list.';
-$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to subscribe list.';
-$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed of subscribe list.';
+$lang['nbm_user_change_enabled_true'] = 'User %s [%s] added to subscribe list.';
 $lang['nbm_user_change_enabled_updated_data_count'] = '%d user(s) are updated.';
-$lang['nbm_user_change_enabled_error_on_updated_data_count'] = '%d user(s) are not updated.';
+$lang['nbm_user_not_change_enabled_false'] = 'User %s [%s] not removed of subscribe list.';
+$lang['nbm_user_not_change_enabled_true'] = 'User %s [%s] not added to subscribe list.';
+$lang['nbm_user_x_added'] = 'User %s [%s] added.';
+$lang['nbm_warning_subscribe_unsubcribe'] = 'Warning, subscribe or unscribe send mails to users';
 $lang['no_write_access'] = 'no write access';
 $lang['order_by'] = 'order by';
 $lang['path'] = 'path';
@@ -303,10 +312,10 @@ $lang['permuser_info'] = 'Only private categories are listed. Private/Public cat
 $lang['permuser_only_private'] = 'Only private categories are shown';
 $lang['pictures'] = 'pictures';
 $lang['private'] = 'private';
+$lang['properties'] = 'Properties';
 $lang['public'] = 'public';
 $lang['purge history'] = 'purge history';
 $lang['purge never used notification feeds'] = 'purge never used notification feeds';
-$lang['repair and optimize database'] = 'repair and optimize database';
 $lang['purge sessions'] = 'purge sessions';
 $lang['randomly represented'] = 'randomly represented';
 $lang['registration_date'] = 'registration date';
@@ -322,6 +331,8 @@ $lang['remote_site_test'] = 'test';
 $lang['remote_site_test_hint'] = 'test this remote site';
 $lang['remote_site_uncorrect_url'] = 'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"';
 $lang['remove keyword'] = 'remove keyword';
+$lang['remove tags'] = 'remove tags';
+$lang['repair and optimize database'] = 'repair and optimize database';
 $lang['selection'] = 'selection';
 $lang['set to'] = 'set to';
 $lang['singly represented'] = 'singly represented';
@@ -442,11 +453,11 @@ $lang['user_delete'] = 'Delete user';
 $lang['user_delete_hint'] = 'Click here to delete this user. Warning! This operation cannot be undone!';
 $lang['user_id URL parameter is missing'] = 'user_id URL parameter is missing';
 $lang['user_status'] = 'User status';
-$lang['user_status_webmaster'] = 'Webmaster';
 $lang['user_status_admin'] = 'Administrator';
-$lang['user_status_normal'] = 'User';
 $lang['user_status_generic'] = 'Generic';
 $lang['user_status_guest'] = 'Guest';
+$lang['user_status_normal'] = 'User';
+$lang['user_status_webmaster'] = 'Webmaster';
 $lang['username'] = 'username';
 $lang['users'] = 'Users';
 $lang['visitors'] = 'Visitors';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index abe3bc29b..5fffbff9a 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -39,9 +39,14 @@ $lang['%d comments to validate'] = '%d comments to validate';
 $lang['%d new comments'] = '%d new comments';
 $lang['%d new elements'] = '%d new elements';
 $lang['%d new users'] = '%d new users';
+$lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
 $lang['%d waiting elements'] = '%d waiting elements';
 $lang['About'] = 'About';
+$lang['All tags must match'] = 'All tags must match';
+$lang['All tags'] = 'All tags';
+$lang['Any tag'] = 'Any tag';
 $lang['At least one listed rule must be satisfied.'] = 'At least one listed rule must be satisfied.';
+$lang['At least one tag must match'] = 'At least one tag must match';
 $lang['Author'] = 'Author';
 $lang['Average rate'] = 'Average rate';
 $lang['Categories'] = 'Categories';
@@ -62,8 +67,8 @@ $lang['Email address is missing'] = 'Email address is missing';
 $lang['Email address'] = 'Email address';
 $lang['Enter your personnal informations'] = 'Enter your personnal informations';
 $lang['Error sending email'] = 'Error sending email';
-$lang['File'] = 'File';
 $lang['File name'] = 'File name';
+$lang['File'] = 'File';
 $lang['Filesize'] = 'Filesize';
 $lang['Filter and display'] = 'Filter and display';
 $lang['Filter'] = 'Filter';
@@ -91,21 +96,26 @@ $lang['Post date'] = 'Post date';
 $lang['Posted on'] = 'Posted on';
 $lang['Profile'] = 'Profile';
 $lang['Quick connect'] = 'Quick connect';
-$lang['Rate'] = 'Rate';
 $lang['RSS feed'] = 'RSS feed';
+$lang['Rate'] = 'Rate';
 $lang['Register'] = 'Register';
 $lang['Registration'] = 'Registration';
+$lang['Related tags'] = 'Related tags';
 $lang['Reset'] = 'Reset';
 $lang['Retrieve password'] = 'Retrieve password';
 $lang['Search rules'] = 'Search rules';
+$lang['Search tags'] = 'Search tags';
 $lang['Search'] = 'Search';
+$lang['See available tags'] = 'See available tags';
+$lang['See pictures linked to this tag only'] = 'See pictures linked to this tag only';
 $lang['Send new password'] = 'Send new password';
 $lang['Since'] = 'Since';
 $lang['Sort by'] = 'Sort by';
 $lang['Sort order'] = 'Sort order';
+$lang['Tag'] = 'Tag';
+$lang['Tags'] = 'Tags';
 $lang['The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.'] = 'The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.';
 $lang['Unknown feed identifier'] = 'Unknown feed identifier';
-$lang['nbm_unknown_identifier'] = 'Unknown identifier';
 $lang['User comments'] = 'User comments';
 $lang['Username'] = 'Username';
 $lang['Visits'] = 'Visits';
@@ -117,6 +127,7 @@ $lang['add to caddie'] = 'add to caddie';
 $lang['add_favorites_alt'] = 'Add to favorites';
 $lang['add_favorites_hint'] = 'Add this picture to your favorites';
 $lang['admin'] = 'Administration';
+$lang['adviser_mode_enabled'] = 'Adviser mode enabled';
 $lang['all'] = 'all';
 $lang['all_categories'] = 'all categories';
 $lang['already_rated'] = 'You\'ve already rated this item';
@@ -135,8 +146,8 @@ $lang['calendar_any'] = 'All';
 $lang['calendar_hint'] = 'displays each day with pictures, month per month';
 $lang['calendar_picture_hint'] = 'displays pictures added on ';
 $lang['calendar_view'] = 'View';
-$lang['chronology_monthly_list'] = 'Monthly list';
 $lang['chronology_monthly_calendar'] = 'Monthly calendar';
+$lang['chronology_monthly_list'] = 'Monthly list';
 $lang['chronology_weekly_list'] = 'Weekly list';
 $lang['click_to_redirect'] = 'Click here if your browser does not automatically forward you';
 $lang['comment date'] = 'comment date';
@@ -211,8 +222,8 @@ $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['mode_normal_hint'] = 'return to normal view mode';
 $lang['mode_created_hint'] = 'displays a calendar by creation date';
+$lang['mode_normal_hint'] = 'return to normal view mode';
 $lang['mode_posted_hint'] = 'displays a calendar by date posted';
 $lang['month'][10] = 'October';
 $lang['month'][11] = 'November';
@@ -228,10 +239,11 @@ $lang['month'][8] = 'August';
 $lang['month'][9] = 'September';
 $lang['most_visited_cat'] = 'Most visited';
 $lang['most_visited_cat_hint'] = 'displays most visited pictures';
-$lang['nb_image_per_row'] = 'Number of images per row';
 $lang['nb_image_line_error'] = 'The number of images per row must be a not null scalar';
-$lang['nb_row_per_page'] = 'Number of rows per page';
+$lang['nb_image_per_row'] = 'Number of images per row';
 $lang['nb_line_page_error'] = 'The number of rows per page must be a not null scalar';
+$lang['nb_row_per_page'] = 'Number of rows per page';
+$lang['nbm_unknown_identifier'] = 'Unknown identifier';
 $lang['never_rated'] = 'You\'ve never rated this item';
 $lang['new_password'] = 'New password';
 $lang['new_password_hint'] = 'You only have to give a password if you wish to change it.';
@@ -332,5 +344,4 @@ $lang['upload_username'] = 'Username';
 $lang['useful when password forgotten'] = 'useful when password forgotten';
 $lang['w_month'] = 'Month';
 $lang['yes'] = 'Yes';
-$lang['adviser_mode_enabled'] = 'Adviser mode enabled';
 ?>