remake of Remote sites and synchronize: final integration and old code cleanup

fix: xml getAttribute always decodes html entities and added encodeAttribute
function

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

1 files changed, 23 insertions, 17 deletions

diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index c7b0db36a..e0238b1dc 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -135,6 +135,7 @@ $lang['Save order'] = 'Save order';
 $lang['Select at least one category'] = 'Select at least one category';
 $lang['Select at least one picture'] = 'Select at least one picture';
 $lang['Select at least one user'] = 'Select at least one user';
+$lang['Site manager'] = 'Site manager';
 $lang['Show info'] = 'Show info';
 $lang['Show number of comments'] = 'Show number of comments';
 $lang['Status'] = 'Status';
@@ -191,7 +192,6 @@ $lang['delete category'] = 'delete category';
 $lang['description'] = 'description';
 $lang['dissociate from category'] = 'dissociate from category';
 $lang['dissociate from group'] = 'dissociate from group';
-$lang['down'] = 'Move down';
 $lang['edit category permissions'] = 'edit category permissions';
 $lang['edit'] = 'Edit';
 $lang['editcat_confirm'] = 'Category informations updated successfully.';
@@ -244,32 +244,31 @@ $lang['purge sessions'] = 'purge sessions';
 $lang['randomly represented'] = 'randomly represented';
 $lang['registration_date'] = 'registration date';
 $lang['remote_site'] = 'Remote site';
-$lang['remote_site_already_exists'] = 'This site already exists';
 $lang['remote_site_clean'] = 'clean';
 $lang['remote_site_clean_hint'] = 'remove remote listing.xml file';
-$lang['remote_site_create'] = 'Create a new site : (give its URL to create_listing_file.php)';
-$lang['remote_site_created'] = 'created';
-$lang['remote_site_delete'] = 'delete';
-$lang['remote_site_delete_hint'] = 'delete this site and all its attached elements';
-$lang['remote_site_deleted'] = 'deleted';
-$lang['remote_site_error'] = 'an error happened';
-$lang['remote_site_file_not_found'] = 'file create_listing_file.php on remote site was not found';
 $lang['remote_site_generate'] = 'generate listing';
 $lang['remote_site_generate_hint'] = 'generate file listing.xml on remote site';
-$lang['remote_site_listing_not_found'] = 'listing.xml file was not found';
 $lang['remote_site_local_found'] = 'A local listing.xml file has been found for ';
-$lang['remote_site_local_new'] = '(new site)';
 $lang['remote_site_local_update'] = 'read local listing.xml and update';
-$lang['remote_site_removed'] = 'was removed on remote site';
-$lang['remote_site_removed_title'] = 'Removed elements';
+$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['remote_site_update'] = 'update';
-$lang['remote_site_update_hint'] = 'read remote listing.xml and updates database';
-$lang['remote_sites'] = 'Remote sites';
 $lang['remove keyword'] = 'remove keyword';
 $lang['selection'] = 'selection';
 $lang['set to'] = 'set to';
 $lang['singly represented'] = 'singly represented';
+$lang['site_already_exists'] = 'This site already exists';
+$lang['site_create'] = 'Create a new site : (give its URL to create_listing_file.php)';
+$lang['site_created'] = 'created';
+$lang['site_delete'] = 'delete';
+$lang['site_delete_hint'] = 'delete this site and all its attached elements';
+$lang['site_deleted'] = 'deleted';
+$lang['site_err'] = 'an error happened';
+$lang['site_err_remote_file_not_found'] = 'file create_listing_file.php on remote site was not found';
+$lang['site_local'] = 'Local';
+$lang['site_remote'] = 'Remote';
+$lang['site_synchronize'] = 'synchronize';
+$lang['site_synchronize_hint'] = 'update the database from files';
 $lang['stats_addr'] = 'IP Address';
 $lang['stats_category'] = 'Category';
 $lang['stats_daily_graph_title'] = 'Pages seen by hour';
@@ -336,7 +335,12 @@ $lang['update'] = 'Synchronize';
 $lang['update_cats_subset'] = 'reduce to single existing categories';
 $lang['update_default_title'] = 'Choose an option';
 $lang['update_display_info'] = 'display maximum informations (added categories and elements, deleted categories and elements)';
-$lang['update_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
+$lang['update_missing_file_or_dir'] = 'File/directory read error';
+$lang['update_missing_file_or_dir_info'] = 'The file or directory cannot be accessed (either it does not exist or the access is denied)';
+$lang['update_err_pwg_version_differs'] = 'PhpWebGallery version differs on the remote site';
+$lang['update_err_pwg_version_differs_info'] = 'Version of create_listing_file.php on the remote site and PhpWebGallery must be the same';
+$lang['update_err_remote_listing_not_found'] = 'listing.xml file was not found';
+$lang['update_err_remote_listing_not_found_info'] = 'listing.xml file was not found on the remote site. This file is generated by choosing the "generate listing" command in the Site manager';
 $lang['update_error_list_title'] = 'Error list';
 $lang['update_errors_caption'] = 'Errors caption';
 $lang['update_infos_title'] = 'Detailed informations';
@@ -344,6 +348,8 @@ $lang['update_missing_tn_info'] = 'a picture filetype requires a thumbnail. The
 $lang['update_missing_tn_short'] = 'missing thumbnail';
 $lang['update_nb_del_categories'] = 'categories deleted in the database';
 $lang['update_nb_del_elements'] = 'elements deleted in the database';
+$lang['update_nb_elements_metadata_available'] = 'images candidates for metadata synchronization';
+$lang['update_nb_elements_metadata_sync'] = 'elements informations synchronized with files metadata';
 $lang['update_nb_errors'] = 'errors during synchronization';
 $lang['update_nb_new_categories'] = 'categories added in the database';
 $lang['update_nb_new_elements'] = 'elements added in the database';