merge -c2836 from trunk to branch 2.0

- Webmaster or administrator can login to run upgrade.
- Inserting upgrade line in mysql.inc.php still work.
- Convert espagnol upgrade file to utf8.
- Minor changes in upgrade processus.
- Remove all comments in pclzip.lib.php.

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

6 files changed, 31 insertions, 22 deletions

diff --git a/language/de_DE/upgrade.lang.php b/language/de_DE/upgrade.lang.php
index 04ed605a7..0b3511a49 100644
--- a/language/de_DE/upgrade.lang.php
+++ b/language/de_DE/upgrade.lang.php
@@ -32,8 +32,9 @@ $lang['total SQL time'] = 'total SQL time';
 $lang['SQL queries'] = 'SQL queries';
 $lang['Upgrade informations'] = 'Upgrade informations';
 $lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
-$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
-$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.';
 $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
+$lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade';
 
 ?>
\ No newline at end of file
diff --git a/language/en_UK/upgrade.lang.php b/language/en_UK/upgrade.lang.php
index 8a65bf810..6bbc221c1 100644
--- a/language/en_UK/upgrade.lang.php
+++ b/language/en_UK/upgrade.lang.php
@@ -31,8 +31,9 @@ $lang['total SQL time'] = 'total SQL time';
 $lang['SQL queries'] = 'SQL queries';
 $lang['Upgrade informations'] = 'Upgrade informations';
 $lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
-$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
-$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.';
 $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
+$lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade';
 
 ?>
\ No newline at end of file
diff --git a/language/es_ES/upgrade.lang.php b/language/es_ES/upgrade.lang.php
index dfa3dddfa..b18741016 100644
--- a/language/es_ES/upgrade.lang.php
+++ b/language/es_ES/upgrade.lang.php
@@ -21,18 +21,19 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
 
-$lang['Upgrade'] = 'Puesta al día';
-$lang['introduction message'] = 'Esta página le propone poner al día la base de dato correspondiente a su antigua versión de piwigo hacia la nueva versión.
-El asistente de postura al día piensa en la versión actual es un <strong> versión %s </strong> (o equivalente). ';
-$lang['Upgrade from %s to %s'] = 'Puesta al día por la versión %s a %s';
-$lang['Statistics'] = 'Estadísticas';
-$lang['total upgrade time'] = 'tiempo total de la puesta al día';
+$lang['Upgrade'] = 'Puesta al día';
+$lang['introduction message'] = 'Esta página le propone poner al día la base de dato correspondiente a su antigua versión de piwigo hacia la nueva versión.
+El asistente de postura al día piensa en la versión actual es un <strong> versión %s </strong> (o equivalente). ';
+$lang['Upgrade from %s to %s'] = 'Puesta al día por la versión %s a %s';
+$lang['Statistics'] = 'Estadísticas';
+$lang['total upgrade time'] = 'tiempo total de la puesta al día';
 $lang['total SQL time'] = 'tiempo total de la demanda SQL';
-$lang['SQL queries'] = 'número de demanda SQL';
-$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['remove line from mysql.inc.php'] = 'En el fichero include/mysql.inc.php, borre la línea siguiente:';
-$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:';
+$lang['SQL queries'] = 'número de demanda SQL';
+$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';
 
 ?>
\ No newline at end of file
diff --git a/language/fr_FR/upgrade.lang.php b/language/fr_FR/upgrade.lang.php
index 41ec88d58..13d8d0bf2 100644
--- a/language/fr_FR/upgrade.lang.php
+++ b/language/fr_FR/upgrade.lang.php
@@ -23,7 +23,8 @@
 
 $lang['Upgrade'] = 'Mise à jour';
 $lang['introduction message'] = 'Cette page vous propose de mettre à jour la base de donnée correspondante à votre ancienne version de piwigo vers la nouvelle version.
-L\'assistant de mise à jour pense la version actuelle est une <strong>version %s</strong> (ou équivalente).';
+L\'assistant de mise à jour pense que la version actuelle est une <strong>version %s</strong> (ou équivalente).';
+$lang['upgrade login message'] = 'Seul un adminitrateur peut lancer la mise à jour: veuillez vous identifier ci-dessous.';
 $lang['Upgrade from %s to %s'] = 'Mise à jour de la version %s à %s';
 $lang['Statistics'] = 'Statistiques';
 $lang['total upgrade time'] = 'temps total de la mise à jour';
@@ -31,8 +32,9 @@ $lang['total SQL time'] = 'temps total des requêtes SQL';
 $lang['SQL queries'] = 'nombre de requêtes SQL';
 $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['remove line from mysql.inc.php'] = 'Dans le fichier include/mysql.inc.php, effacez la ligne suivante:';
 $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['You do not have access rights to run upgrade'] = 'Vous n\'avez pas les droits necessaires pour lancer la mise à jour.';
 
 ?>
\ No newline at end of file
diff --git a/language/it_IT/upgrade.lang.php b/language/it_IT/upgrade.lang.php
index 04ed605a7..fe4bd92dc 100644
--- a/language/it_IT/upgrade.lang.php
+++ b/language/it_IT/upgrade.lang.php
@@ -25,6 +25,7 @@
 $lang['Upgrade'] = 'Upgrade';
 $lang['introduction message'] = 'This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version.
 The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).';
+$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
 $lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
 $lang['Statistics'] = 'Statistics';
 $lang['total upgrade time'] = 'total upgrade time';
@@ -32,8 +33,9 @@ $lang['total SQL time'] = 'total SQL time';
 $lang['SQL queries'] = 'SQL queries';
 $lang['Upgrade informations'] = 'Upgrade informations';
 $lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
-$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
-$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.';
 $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
+$lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade';
 
 ?>
\ No newline at end of file
diff --git a/language/nl_NL/upgrade.lang.php b/language/nl_NL/upgrade.lang.php
index 04ed605a7..fe4bd92dc 100644
--- a/language/nl_NL/upgrade.lang.php
+++ b/language/nl_NL/upgrade.lang.php
@@ -25,6 +25,7 @@
 $lang['Upgrade'] = 'Upgrade';
 $lang['introduction message'] = 'This page proposes to upgrade your database corresponding to your old version of Piwigo to the current version.
 The upgrade assistant thinks you are currently running a <strong>release %s</strong> (or equivalent).';
+$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
 $lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
 $lang['Statistics'] = 'Statistics';
 $lang['total upgrade time'] = 'total upgrade time';
@@ -32,8 +33,9 @@ $lang['total SQL time'] = 'total SQL time';
 $lang['SQL queries'] = 'SQL queries';
 $lang['Upgrade informations'] = 'Upgrade informations';
 $lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
-$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
-$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.';
 $lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+$lang['upgrade login message'] = 'Only administrator can run upgrade: please sign in below.';
+$lang['You do not have access rights to run upgrade'] = 'You do not have access rights to run upgrade';
 
 ?>
\ No newline at end of file