merge -c2829 from trunk to branch 2.0

The exact copy of commit log in 2829.

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

5 files changed, 5 insertions, 10 deletions

diff --git a/plugins/c13y_upgrade/language/de_DE/plugin.lang.php b/plugins/c13y_upgrade/language/de_DE/plugin.lang.php
index c2e35f13f..36dd642aa 100644
--- a/plugins/c13y_upgrade/language/de_DE/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/de_DE/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Keine Unregelmäßigkeiten festgestellt nach der Aktualisierung der Anwendung';
-$lang['c13y_upgrade_deactivate'] = 'Sie können desactivate "Check-Upgrades"-Plugin';
+$lang['c13y_upgrade_no_anomaly'] = 'Keine Unregelmäßigkeiten festgestellt nach der Aktualisierung der Anwendung'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Benutzer mit gleichen E-Mail-Adresse';
 $lang['c13y_correction_dbl_email_user'] = 'Löschen doppeltes Benutzer';
 $lang['c13y_obsolete_plugin'] = 'Veraltete Plugin';
diff --git a/plugins/c13y_upgrade/language/en_UK/plugin.lang.php b/plugins/c13y_upgrade/language/en_UK/plugin.lang.php
index b4fd37004..114272e12 100644
--- a/plugins/c13y_upgrade/language/en_UK/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/en_UK/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade';
-$lang['c13y_upgrade_deactivate'] = 'You can deactivate "Check upgrades" plugin';
+$lang['c13y_upgrade_no_anomaly'] = 'No anomaly detected after application upgrade, "Check upgrades" plugin was deactivated.';
 $lang['c13y_dbl_email_user'] = 'Users with same email address';
 $lang['c13y_correction_dbl_email_user'] = 'Delete duplicate users';
 $lang['c13y_obsolete_plugin'] = 'Obsolete plugin';
diff --git a/plugins/c13y_upgrade/language/es_ES/plugin.lang.php b/plugins/c13y_upgrade/language/es_ES/plugin.lang.php
index 226e33bd1..1cec68d8c 100644
--- a/plugins/c13y_upgrade/language/es_ES/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/es_ES/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación';
-$lang['c13y_upgrade_deactivate'] = 'Usted puede desactivar el plugin Check upgrades';
+$lang['c13y_upgrade_no_anomaly'] = 'Ninguna anomalía detectada después de la puesta al día de la aplicación'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Utilizadores con la misma dirección e-mail';
 $lang['c13y_correction_dbl_email_user'] = 'Suprima a los utilizadores en duplicado';
 $lang['c13y_obsolete_plugin'] = 'Plugin obsoleto';
diff --git a/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php b/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php
index bd903f213..758cda9ca 100644
--- a/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/fr_FR/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application';
-$lang['c13y_upgrade_deactivate'] = 'Vous pouvez désactiver le plugin "Check upgrades"';
+$lang['c13y_upgrade_no_anomaly'] = 'Pas d\'anomalie détectée après la mise à jour de l\'application, le plugin "Check upgrades" a été désactivé.';
 $lang['c13y_dbl_email_user'] = 'Utilisateurs avec la même adresse email';
 $lang['c13y_correction_dbl_email_user'] = 'Supprimez les utilisateurs en double';
 $lang['c13y_obsolete_plugin'] = 'Plugin obsolète';
diff --git a/plugins/c13y_upgrade/language/it_IT/plugin.lang.php b/plugins/c13y_upgrade/language/it_IT/plugin.lang.php
index 8c2bd75b4..c4a2a9aeb 100644
--- a/plugins/c13y_upgrade/language/it_IT/plugin.lang.php
+++ b/plugins/c13y_upgrade/language/it_IT/plugin.lang.php
@@ -22,8 +22,7 @@
 // +-----------------------------------------------------------------------+
 
 // --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
-$lang['c13y_upgrade_no_anomaly'] = 'Nessun\' anomalia individuata dopo l\'aggiornamento dell\'applicatione';
-$lang['c13y_upgrade_deactivate'] = 'Potete disattivare il plugin "Check upgrades"';
+$lang['c13y_upgrade_no_anomaly'] = 'Nessun\' anomalia individuata dopo l\'aggiornamento dell\'applicatione'; /* TODO , "Check upgrades" plugin was deactivated.'*/
 $lang['c13y_dbl_email_user'] = 'Utenti con lo stesso indirizzo email';
 $lang['c13y_correction_dbl_email_user'] = 'Cancellare i doppioni';
 $lang['c13y_obsolete_plugin'] = 'Plugin obsoleto';