synchro improvements:

- able to sync metadata at the same time as the files/dirs
- by default empty metadata does not overwrite database infos (checkbox can switch to previous behaviour) (bug 132)
- the form is shown again even after a successfull non simulated run

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

5 files changed, 12 insertions, 9 deletions

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index e2f306529..f41f95ea6 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -446,7 +446,6 @@ $lang['update_sync_dirs'] = 'only directories';
 $lang['update_sync_files'] = 'synchronize files structure with database';
 $lang['update_sync_metadata'] = 'synchronize files metadata with database elements informations';
 $lang['update_sync_metadata_all'] = 'even already synchronized elements';
-$lang['update_sync_metadata_new'] = 'only never synchronized elements';
 $lang['update_used_metadata'] = 'Used metadata';
 $lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
 $lang['update_wrong_dirname_short'] = 'wrong filename';
@@ -660,4 +659,6 @@ $lang['Optimizations errors'] = 'Optimizations have been completed with some err
 $lang['delete this comment'] = 'delete this comment';
 $lang['link_info_image'] = 'Modify information';
 $lang['edit category informations'] = 'edit category informations';
+$lang['nothing'] = 'nothing';
+$lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
 ?>
\ No newline at end of file
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 968bac9f1..f1b12eeff 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -447,7 +447,6 @@ $lang['update_sync_dirs'] = 'repertorios únicamente';
 $lang['update_sync_files'] = 'sincronizar la estructura de los ficheros con la base de datos';
 $lang['update_sync_metadata'] = 'sincronizar las informaciones de los elementos en la base de datos a partir de los méta-datos de los ficheros';
 $lang['update_sync_metadata_all'] = 'hasta los elementos ya sincronizados';
-$lang['update_sync_metadata_new'] = 'unicamente los elementos jamás sincronizados';
 $lang['update_used_metadata'] = 'Méta-datos empleadas';
 $lang['update_wrong_dirname_info'] = 'El nombre de los repertorios y de los ficheros debe estar constituido sólo por letras, por cifras, de "-", "_" y "."';
 $lang['update_wrong_dirname_short'] = 'nombre de fichero erróneo';
@@ -666,4 +665,6 @@ $lang['You are running the latest version of Piwigo.'] = 'Usted utiliza la últi
 $lang['delete this comment'] = 'Borrar este comentario';
 $lang['link_info_image'] = 'Modificar las informaciones';
 $lang['edit category informations'] = 'editar las informaciones de esta categoría';
+$lang['nothing'] = 'nada';
+/* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 3ade9d3e0..a38fbe321 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -446,7 +446,6 @@ $lang['update_sync_dirs'] = 'répertoires uniquement';
 $lang['update_sync_files'] = 'synchroniser la structure des fichiers avec la base de données';
 $lang['update_sync_metadata'] = 'synchroniser les informations des éléments dans la base de données à partir des méta-données des fichiers';
 $lang['update_sync_metadata_all'] = 'même les éléments déjà synchronisés';
-$lang['update_sync_metadata_new'] = 'uniquement les éléments jamais synchronisés';
 $lang['update_used_metadata'] = 'Méta-données employées';
 $lang['update_wrong_dirname_info'] = 'Le nom des répertoires et des fichiers ne doit être constitué que de lettres, de chiffres, de "-", "_" et "."';
 $lang['update_wrong_dirname_short'] = 'nom de fichier erroné';
@@ -649,8 +648,7 @@ $lang['Hits'] = 'Utilisations';
 $lang['GD library is missing'] = 'la bibliothèque GD est manquante';
 $lang['conf_extents'] = 'Templates (modèles)';
 $lang['extend_for_templates'] = 'Etendre les templates';
-$lang['Replacement of original templates'] =
- 'Remplacement des templates d\'origine par vos templates adaptés du dossier template-extension';
+$lang['Replacement of original templates'] = 'Remplacement des templates d\'origine par vos templates adaptés du dossier template-extension';
 $lang['Replacers'] = 'Remplaçants (templates modifiés)';
 $lang['Original templates'] = 'Templates d\'origine';
 $lang['Optional URL keyword'] = 'Paramètre facultatif de l\'URL';
@@ -660,4 +658,6 @@ $lang['Optimizations errors'] = 'Certaines optimisations se sont terminées avec
 $lang['delete this comment'] = 'supprimer ce commentaire';
 $lang['link_info_image'] = 'Modifier les informations';
 $lang['edit category informations'] = 'éditer les informations de cette catégorie';
+$lang['nothing'] = 'rien';
+/* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
 ?>
\ No newline at end of file
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index 75380021d..071359ef4 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -446,7 +446,6 @@ $lang['update_sync_dirs'] = 'solo directory';
 $lang['update_sync_files'] = 'sincronizzare la struttura dei files con la base dati';

 $lang['update_sync_metadata'] = 'sincronizzare gli elementi della base dati con le informazioni presenti nei metadati dei files';

 $lang['update_sync_metadata_all'] = 'anche gli elementi già sincronizzati';

-$lang['update_sync_metadata_new'] = 'solo gli elementi mai sincronizzati';

 $lang['update_used_metadata'] = 'Metadati usati';

 $lang['update_wrong_dirname_info'] = 'Il nome delle directory e dei files deve essere composto da lettere, numeri, "-", "_" o "."';

 $lang['update_wrong_dirname_short'] = 'Nome file errato';

@@ -649,8 +648,7 @@ $lang['Hits'] = 'Uso';
 $lang['GD library is missing'] = 'la biblioteca GD è manquante';

 $lang['conf_extents'] = 'Templates (modelli)';

 $lang['extend_for_templates'] = 'Estendere i templates';

-$lang['Replacement of original templates'] =

- 'Sostitizione dei templates d\'origine con i vostri templates personalizzati dalla sotto directory template-extension';

+$lang['Replacement of original templates'] = 'Sostitizione dei templates d\'origine con i vostri templates personalizzati dalla sotto directory template-extension';

 $lang['Replacers'] = 'Sostituzione (templates personalizzati)';

 $lang['Original templates'] = 'Templates d\'origine';

 $lang['Optional URL keyword'] = 'Parametro facultativo del\'URL';

@@ -660,4 +658,6 @@ $lang['Optimizations errors'] = 'Ottimizzazioni concluse con errori.';
 $lang['delete this comment'] = 'cancellare commenti';

 $lang['link_info_image'] = 'Modifica le informazioni';

 $lang['edit category informations'] = 'Modificare le informazioni della categoria';

+/* TODO */ $lang['nothing'] = 'nothing';

+/* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';

 ?>
\ No newline at end of file
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index adf7e22e0..f276ee170 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -447,7 +447,6 @@ $lang['update_sync_dirs'] = 'alleen mappen';
 $lang['update_sync_files'] = 'synchronizeer bestanden met de database';
 $lang['update_sync_metadata'] = 'synchronizeer bestands metadata met de database element informatie';
 $lang['update_sync_metadata_all'] = 'ook reeds synchronizeerde elementen';
-$lang['update_sync_metadata_new'] = 'alleen nooit gesynchronizeerde elementen';
 $lang['update_used_metadata'] = 'Gebruikte metadata';
 $lang['update_wrong_dirname_info'] = 'De naam van de mappen en bestanden moeten bestaan uit letters, "-", "_" of "."';
 $lang['update_wrong_dirname_short'] = 'verkeerde bestandsnaam';
@@ -666,4 +665,6 @@ $lang['You are running the latest version of Piwigo.'] = 'Je hebt de laatste ver
 $lang['delete this comment'] = 'verwijder dit commentaar';
 $lang['link_info_image'] = 'Aanpassen informatie';
 $lang['edit category informations'] = 'bewerk categorie informatie';
+/* TODO */ $lang['nothing'] = 'nothing';
+/* TODO */ $lang['overrides existing values with empty ones'] = 'overrides existing values with empty ones';
 ?>
\ No newline at end of file