feature deleted: code for categories link was too complicated for such a

simple fature. Replaced by static association. Links are not persistent
anymore.

modification removed: #image_category.is_storage replaced by
#images.storage_category_id as in branche 1.5..


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

2 files changed, 8 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 73cc386c2..47145569b 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -54,6 +54,7 @@ $lang['Caddie'] = 'Caddie';
 $lang['Categories authorized thanks to group associations'] = 'Categories authorized thanks to group associations';
 $lang['Categories manual order was saved'] = 'Categories manual order was saved';
 $lang['Categories ordered alphanumerically'] = 'Categories ordered alphanumerically';
+$lang['Category elements associated to the following categories: %s'] = 'Category elements associated to the following categories: %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'Check for upgrade failed for unknown reasons.';
 $lang['Check for upgrade'] = 'Check for upgrade';
 $lang['Comments for all'] = 'Comments for all';
@@ -90,6 +91,8 @@ $lang['History'] = 'History';
 $lang['Informations'] = 'Informations';
 $lang['Interface theme'] = 'Interface theme';
 $lang['Language'] = 'Language';
+$lang['Link all category elements to a new category'] = 'Link all category elements to a new category';
+$lang['Link all category elements to some existing categories'] = 'Link all category elements to some existing categories';
 $lang['Linked categories'] = 'Linked categories';
 $lang['Lock gallery'] = 'Lock gallery';
 $lang['Maintenance'] = 'Maintenance';
@@ -164,6 +167,7 @@ $lang['Validate'] = 'Validate';
 $lang['Validation'] = 'Validation';
 $lang['Virtual categories movement'] = 'Virtual categories movement';
 $lang['Virtual categories to move'] = 'Virtual categories to move';
+$lang['Virtual category name'] = 'Virtual category name';
 $lang['Webmaster cannot be deleted'] = 'Webmaster cannot be deleted';
 $lang['Yes'] = 'Yes';
 $lang['You are running on development sources, no check possible.'] = 'You are running on development sources, no check possible.';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 114f1b07f..3f32119ec 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -55,6 +55,7 @@ $lang['Caddie'] = 'Panier';
 $lang['Categories authorized thanks to group associations'] = 'Catégories accessibles grâce à l\'appartenance aux groupes';
 $lang['Categories manual order was saved'] = 'L\'ordre manuel des catégories a été sauvegardé';
 $lang['Categories ordered alphanumerically'] = 'Catégories ordonnées alphabético-numériquement';
+$lang['Category elements associated to the following categories: %s'] = 'Les éléments de la catégorie ont été associés aux catégories suivantes : %s';
 $lang['Check for upgrade failed for unknown reasons.'] = 'La vérification de la dernière version sur le serveur a échouée pour une raison inconnue.';
 $lang['Check for upgrade'] = 'Dernière version ?';
 $lang['Comments for all'] = 'Commentaires utilisateur pour tous';
@@ -91,6 +92,8 @@ $lang['History'] = 'Historique';
 $lang['Informations'] = 'Informations';
 $lang['Interface theme'] = 'Theme de l\'interface';
 $lang['Language'] = 'Langue';
+$lang['Link all category elements to a new category'] = 'Associer tous les éléments de la catégorie à une nouvelle catégorie';
+$lang['Link all category elements to some existing categories'] = 'Associer tous les éléments de la catégorie à des catégories existantes';
 $lang['Linked categories'] = 'Catégories associées';
 $lang['Lock gallery'] = 'Verrouiller la galerie';
 $lang['Maintenance'] = 'Maintenance';
@@ -165,6 +168,7 @@ $lang['Validate'] = 'Valider';
 $lang['Validation'] = 'Validation';
 $lang['Virtual categories movement'] = 'Déplacement de catégories virtuelles';
 $lang['Virtual categories to move'] = 'Catégories virtuelles à déplacer';
+$lang['Virtual category name'] = 'Nom de la catégorie virtuelle';
 $lang['Webmaster cannot be deleted'] = 'Le webmestre ne peut pas être supprimé';
 $lang['Yes'] = 'Oui';
 $lang['You are running on development sources, no check possible.'] = 'Vous travaillez avec les sources de développement, impossible de vérifier la dernière version.';