merge -c2844 from trunk to branch 2.0

git-svn-id: http://piwigo.org/svn/branches/2.0@2845 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 6 insertions, 6 deletions

diff --git a/language/es_ES/upgrade.lang.php b/language/es_ES/upgrade.lang.php
index dff3a074f..e74f5d047 100644
--- a/language/es_ES/upgrade.lang.php
+++ b/language/es_ES/upgrade.lang.php
@@ -33,12 +33,12 @@ $lang['Upgrade informations'] = 'Informaciones sobre la puesta al día';
 $lang['delete upgrade files'] = '[Seguridad] Borre los ficheros "upgrade.php", "upgrade_feed.php", "install.php" así como el expediente "install"';
 $lang['perform a maintenance check'] = 'Por favor, efectúes un mantenimiento en [Administración>Especiales>Mantenimiento] si usted encuentra problemas.';
 $lang['deactivated plugins'] = 'Por precaución, el plugins siguiente han sido desactivados. Verifique si existen unas posturas al día antes de reactivarlas:';
-/*TODO*/$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
-/*TODO*/$lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade';
+$lang['upgrade login message'] = 'Sólo un administrador puede lanzar la puesta al día: por favor, identifiqúese más abajo.';
+$lang['You do not have access rights to run upgrade'] = 'Usted no tiene los derechos necessaires para lanzar la puesta al día.';
 
 // Upgrade informations from upgrade_1.3.1.php
-/*TODO*/$lang['all sub-categories of private categories become private'] = 'All sub-categories of private categories become private';
-/*TODO*/$lang['user permissions and group permissions have been erased'] = 'User permissions and group permissions have been erased';
-/*TODO*/$lang['only thumbnails prefix and webmaster mail saved'] = 'Only thumbnails prefix and webmaster mail address have been saved from previous configuration';
+$lang['all sub-categories of private categories become private'] = 'Todas las subcategorías de categorías privadas se vuelven privadas';
+$lang['user permissions and group permissions have been erased'] = 'Los autorizaciones de los usuarios y de los grupos han sido borrados';
+$lang['only thumbnails prefix and webmaster mail saved'] = 'Sólo el prefijo de las miniaturas y el email electrónico del webmestre han sido salvaguardados por la configuración precedente';
 
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/upgrade.lang.php b/language/fr_FR/upgrade.lang.php
index 9ae5ef7e2..e0620b4e4 100644
--- a/language/fr_FR/upgrade.lang.php
+++ b/language/fr_FR/upgrade.lang.php
@@ -34,7 +34,7 @@ $lang['Upgrade informations'] = 'Informations sur la mise à jour';
 $lang['delete upgrade files'] = '[Sécurité] Effacez les fichiers "upgrade.php", "upgrade_feed.php", "install.php" ainsi que le dossier "install"';
 $lang['perform a maintenance check'] = 'Veuillez effectuer une maintenance dans [Administration>Spéciales>Maintenance] si vous rencontrez des problèmes.';
 $lang['deactivated plugins'] = 'Par précaution, les plugins suivants ont été désactivés. Vérifiez s\'il existe des mises à jour avant de les réactiver:';
-$lang['upgrade login message'] = 'Seul un adminitrateur peut lancer la mise à jour: veuillez vous identifier ci-dessous.';
+$lang['upgrade login message'] = 'Seul un administrateur peut lancer la mise à jour: veuillez vous identifier ci-dessous.';
 $lang['You do not have access rights to run upgrade'] = 'Vous n\'avez pas les droits necessaires pour lancer la mise à jour.';
 
 // Upgrade informations from upgrade_1.3.1.php