- admin/update : filesystem synchronization process completely

  rewritten. How to speed up sync ? by avoiding recursivity !

- admin/update : option to display verbose information details

- admin/update : option to simulate only. No database insert, delete or
  update will be made

- bug fixed : in admin/cat_list, if you delete a virtual category, you may
  create a gap in the rank list. This gap will generate errors when trying
  to move a category on this gap. Fixed by calling ordering and
  update_global_rank at category deletion.

- admin/cat_list, only one query to insert a new virtual category (no need
  of a second query to update uppercats and global_rank)

- for a given category, even if empty, the representing element must not be
  the one of a forbidden category for the current user

- generation time optionnaly displayed on the bottom of each page becomes
  more price : number of SQL queries and SQL time added.


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

2 files changed, 13 insertions, 0 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index c8ddc487e..165cae61b 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -264,11 +264,14 @@ $lang['tn_dirs_alone'] = 'pictures without thumbnail';
 
 // Update
 $lang['update_missing_tn'] = 'the thumbnail is missing for';
+$lang['update_missing_tn_short'] = 'missing thumbnail';
+$lang['update_missing_tn_info'] = 'a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory "thumbnail" of the category directory. The thumbnail filename must start with "'.$conf['prefix_thumbnail'].'" and the extension must be among the following list :';
 $lang['update_disappeared_tn'] = 'the thumbnail disapeared';
 $lang['update_disappeared'] = 'doesn\'t exist';
 $lang['update_part_deletion'] = 'Deletion of images that have no thumbnail or that doesn\'t exist';
 $lang['update_part_research'] = 'Search for new images in the directories';
 $lang['update_research_added'] = 'added';
+$lang['update_research_deleted'] = 'deleted';
 $lang['update_research_tn_ext'] = 'thumbnail in';
 $lang['update_nb_new_elements'] = 'elements added in the database';
 $lang['update_nb_del_elements'] = 'elements deleted in the database';
@@ -282,6 +285,13 @@ $lang['update_sync_metadata'] = 'synchronize files metadata with database elemen
 $lang['update_sync_metadata_new'] = 'only never synchronized elements';
 $lang['update_sync_metadata_all'] = 'even already synchronized elements';
 $lang['update_cats_subset'] = 'reduce to single existing categories';
+$lang['update_nb_errors'] = 'errors during synchronization';
+$lang['update_error_list_title'] = 'Error list';
+$lang['update_errors_caption'] = 'Errors caption';
+$lang['update_display_info'] = 'display maximum informations (added categories and elements, deleted categories and elements)';
+$lang['update_simulate'] = 'only perform a simulation (no change in database will be made)';
+$lang['update_infos_title'] = 'Detailed informations';
+$lang['update_simulation_title'] = '[Simulation]';
 
 // History
 $lang['stats_title'] = 'Last year statistics';
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 45383d7ce..e81165688 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -300,6 +300,8 @@ $lang['stats_last_days'] = 'last days';
 $lang['hint_comments'] = 'See last users comments';
 $lang['menu_login'] = 'login';
 $lang['update_wrong_dirname'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
+$lang['update_wrong_dirname_short'] = 'wrong filename';
+$lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
 $lang['hello'] = 'Hello';
 
 $lang['picture_show_metadata'] = 'Show file metadata ?';
@@ -317,4 +319,5 @@ $lang['random_cat_hint'] = 'Displays a set of random pictures';
 $lang['picture_high'] = 'Click on the picture to see it in high definition';
 
 $lang['gallery_locked_message'] = 'The gallery is locked for maintenance. Please, come back later or loggin as an administrator to enter the gallery : <a href="'.PHPWG_ROOT_PATH.'identification.php">Identification</a>';
+$lang['sql_queries_in'] = ' SQL queries in';
 ?>
\ No newline at end of file