diff options
author | patdenice <patdenice@piwigo.org> | 2011-04-07 09:47:01 +0000 |
---|---|---|
committer | patdenice <patdenice@piwigo.org> | 2011-04-07 09:47:01 +0000 |
commit | 4408b67309e968eae8e7cbe5363566a261e3ee4a (patch) | |
tree | dbbc6ee762a68375a685a53bde92985dacdb57ac /language | |
parent | c01742afbd511991a663f71ebb304d22ca66be6f (diff) |
merge r10098,r10100,r10101,r10113,r10128,r10129 from trunk to branch 2.2
feature:2250
Incompatible plugins and obsolete plugins may not be activated.
Deactivate and uninstall obsolete plugins.
Add warning icon and tiptip
Add languages keys.
Add expire parameter.
Clean code.
Remove useless query for delete.
git-svn-id: http://piwigo.org/svn/branches/2.2@10131 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | language/en_UK/admin.lang.php | 5 | ||||
-rw-r--r-- | language/fr_FR/admin.lang.php | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 1d86a5394..444c896f3 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -777,4 +777,9 @@ $lang['All languages are up to date.'] = 'All languages are up to date.'; $lang['Visit theme site'] = 'Visit theme site'; $lang['Visit language site'] = 'Visit language site'; $lang['New Version'] = 'New Version'; +$lang['Obsolete Plugins'] = 'Obsolete Plugins'; +$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'WARNING! This plugin does not seem to be compatible with this version of Piwigo.'; +$lang['Do you want to activate anyway?'] = 'Do you want to activate anyway?'; +$lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'THIS PLUGIN IS NOW PART OF PIWIGO CORE! UNINSTALL IT NOW!'; +$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'; ?>
\ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index bc7ab447a..e53cf21c9 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -788,4 +788,9 @@ $lang['All languages are up to date.'] = 'Toutes les langues sont à jour.'; $lang['Visit theme site'] = 'Visitez le site du thème'; $lang['Visit language site'] = 'Visitez le site de la langue'; $lang['New Version'] = 'Nouvelle version'; +$lang['Obsolete Plugins'] = 'Plugins obsolètes'; +$lang['WARNING! This plugin does not seem to be compatible with this version of Piwigo.'] = 'ATTENTION! Ce plugin n\'a pas l\'air d\'être compatible avec votre version de Piwigo.'; +$lang['Do you want to activate anyway?'] = 'Voulez-vous l\'activer quand même?'; +$lang['THIS PLUGIN IS NOW PART OF PIWIGO CORE! DELETE IT NOW.'] = 'CE PLUGIN FAIT DÉSORMAIS PARTIE DU CORE DE PIWIGO! SUPPRIMEZ-LE.'; +$lang['ERROR: THIS PLUGIN IS MISSING BUT IT IS INSTALLED! UNINSTALL IT NOW.'] = 'ERREUR: CE PLUGIN EST MANQUANT MAIS TOUJOURS INSTALLÉ! DÉSINSTALLEZ-LE.'; ?> |